|
@@ -68,16 +68,16 @@ public class CommonServiceImpl implements CommonService {
|
|
@Override
|
|
@Override
|
|
public RedirectParam authentication(String schoolCode) {
|
|
public RedirectParam authentication(String schoolCode) {
|
|
HttpServletRequest request = ServletUtil.getRequest();
|
|
HttpServletRequest request = ServletUtil.getRequest();
|
|
- String authserver = environment.getProperty("cas.authserver." + schoolCode.toLowerCase());
|
|
|
|
|
|
+ String authserver = environment.getProperty("examcloud.cas.authserver." + schoolCode.toLowerCase());
|
|
if (StringUtils.isBlank(authserver)) {
|
|
if (StringUtils.isBlank(authserver)) {
|
|
throw new StatusException(schoolCode + "未配置cas.authserver");
|
|
throw new StatusException(schoolCode + "未配置cas.authserver");
|
|
}
|
|
}
|
|
- String authlogin = environment.getProperty("cas.authlogin." + schoolCode.toLowerCase());
|
|
|
|
|
|
+ String authlogin = environment.getProperty("examcloud.cas.authlogin." + schoolCode.toLowerCase());
|
|
if (StringUtils.isBlank(authserver)) {
|
|
if (StringUtils.isBlank(authserver)) {
|
|
throw new StatusException(schoolCode + "未配置cas.authlogin");
|
|
throw new StatusException(schoolCode + "未配置cas.authlogin");
|
|
}
|
|
}
|
|
|
|
|
|
- String authlogout = environment.getProperty("cas.authlogout." + schoolCode.toLowerCase());
|
|
|
|
|
|
+ String authlogout = environment.getProperty("examcloud.cas.authlogout." + schoolCode.toLowerCase());
|
|
if (StringUtils.isBlank(authlogout)) {
|
|
if (StringUtils.isBlank(authlogout)) {
|
|
throw new StatusException(schoolCode + "未配置cas.authlogout");
|
|
throw new StatusException(schoolCode + "未配置cas.authlogout");
|
|
}
|
|
}
|
|
@@ -162,14 +162,14 @@ public class CommonServiceImpl implements CommonService {
|
|
}
|
|
}
|
|
|
|
|
|
private String getLogoutUrl(String schoolCode) {
|
|
private String getLogoutUrl(String schoolCode) {
|
|
- String authlogout = environment.getProperty("cas.authlogout." + schoolCode.toLowerCase());
|
|
|
|
|
|
+ String authlogout = environment.getProperty("examcloud.cas.authlogout." + schoolCode.toLowerCase());
|
|
if (StringUtils.isBlank(authlogout)) {
|
|
if (StringUtils.isBlank(authlogout)) {
|
|
throw new StatusException(schoolCode + "未配置cas.authlogout");
|
|
throw new StatusException(schoolCode + "未配置cas.authlogout");
|
|
}
|
|
}
|
|
|
|
|
|
- String host = environment.getProperty("ac.host");
|
|
|
|
|
|
+ String host = environment.getProperty("examcloud.auth.center.host");
|
|
if (StringUtils.isBlank(host)) {
|
|
if (StringUtils.isBlank(host)) {
|
|
- throw new StatusException("未配置ac.host");
|
|
|
|
|
|
+ throw new StatusException("未配置examcloud.auth.center.host");
|
|
}
|
|
}
|
|
|
|
|
|
try {
|
|
try {
|