Commit fae7f464 authored by 喻春霖's avatar 喻春霖

fixed

parent b48b5ebd
......@@ -147,21 +147,18 @@ public class AuthController {
String loginType = request.getParameter("login_type");
OauthType oauthType = OauthType.getValue(loginType);
if(StringUtils.isNotEmpty(loginType) && oauthType !=null) {
OauthConfigItem oauthConfigItem = oauthConfig.getItems().get(oauthType.getCode());
authLog.setFowardUrl(oauthConfigItem.getOauthUrl());
authLog.setOauthType(oauthType.getCode());
if (StringUtils.isNotEmpty(returnUrl) && returnUrl.contains("readinglab")){
// 阅览室日志分离
ClientItem item = clientItemMap.get("readingroomClientId");
authLog.setAuthSource(item.getClientName());
}
authLogService.save(authLog);
//response.sendRedirect(generateLoginUrl(returnUrl, oauthType.getCode(), authLog.getId()));
//return null;
modelAndView.addObject("loginType",loginType);
} else {
}else {
loginType = "";
}
authLogService.save(authLog);
String url1 = generateLoginUrl(returnUrl, OauthType.dianjiaoguan.getCode(), authLog.getId());
modelAndView.addObject("loginUrl1", url1);
String url2 = generateLoginUrl(returnUrl, OauthType.edenoperation.getCode(), authLog.getId());
......@@ -171,7 +168,6 @@ public class AuthController {
modelAndView.addObject("logId", authLog.getId());
modelAndView.addObject("loginType","");
}
} catch (Exception e) {
e.printStackTrace();
modelAndView.setViewName("error");
......
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