Commit 32902eb3 authored by 喻春霖's avatar 喻春霖

fixed

parents e65d9958 d7d41238
...@@ -89,15 +89,20 @@ public class AuthController { ...@@ -89,15 +89,20 @@ public class AuthController {
return modelAndView; return modelAndView;
} }
String loginType = request.getParameter("login_type"); String loginType = request.getParameter("login_type");
OauthType oauthType = OauthType.getValue(loginType); if(StringUtils.isNotEmpty(loginType)) {
if(StringUtils.isNotEmpty(loginType) && oauthType !=null) {
if (StringUtils.isNotEmpty(returnUrl) && (returnUrl.contains("readinglab") || returnUrl.contains("read.etextbook.cn"))){ if (StringUtils.isNotEmpty(returnUrl) && (returnUrl.contains("readinglab") || returnUrl.contains("read.etextbook.cn"))){
// 阅览室日志分离 // 阅览室日志分离
ClientItem item = clientItemMap.get("readingroomClientId"); ClientItem item = clientItemMap.get("readingroomClientId");
item.setClientId("readingroomClientId"); authLog.setClientId("readingroomClientId");
authLog.setAuthSource(item.getClientName()); authLog.setAuthSource(item.getClientName());
} }
modelAndView.addObject("loginType",loginType);
OauthType oauthType = OauthType.getValue(loginType);
if (oauthType != null){
modelAndView.addObject("loginType",loginType);
}else {
modelAndView.addObject("loginType","");
}
}else { }else {
modelAndView.addObject("loginType",""); modelAndView.addObject("loginType","");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment