|
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.jasig.cas.client.validation.Assertion;
|
|
|
import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;
|
|
|
-import org.jasig.cas.client.validation.TicketValidationException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -121,6 +120,8 @@ public class CommonServiceImpl implements CommonService {
|
|
|
}
|
|
|
String loginUrl = authlogin + SystemConstant.GET_UNKNOWN + SystemConstant.SERVICE_KEY + SystemConstant.GET_EQUAL
|
|
|
+ encodeLoginUrlRoot;
|
|
|
+
|
|
|
+ String errUrlRoot = "/api/auth/error?rurl=" + loginUrl;
|
|
|
if (Objects.isNull(tkt) || tkt.length() == 0) {
|
|
|
rp.setTicketValid(false);
|
|
|
rp.setReturnUrl(loginUrl);
|
|
@@ -138,11 +139,9 @@ public class CommonServiceImpl implements CommonService {
|
|
|
rp.setLoginName(username);
|
|
|
rp.setReturnUrl(ecLogin);
|
|
|
|
|
|
- } catch (TicketValidationException e) {
|
|
|
- rp.setTicketValid(false);
|
|
|
- rp.setReturnUrl(loginUrl);
|
|
|
} catch (Exception e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
+ rp.setTicketValid(false);
|
|
|
+ rp.setReturnUrl(errUrlRoot);
|
|
|
}
|
|
|
|
|
|
}
|