diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java index 5d44622..50e44a1 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java @@ -119,40 +119,41 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { result.setSucess(false); return result; } - String param = httpServletRequest.getParameter("param"); + //获取返回的 sessionId + String sessionId = httpServletRequest.getParameter("sessionId"); + logger.info(String.format("getTrdSSOAuth→sessionId:%s", sessionId)); //解码 - byte[] decodedBytes = Base64.getDecoder().decode(param); - String paramString = new String(decodedBytes, StandardCharsets.UTF_8); - try { - //获取返回的 sessionId - String sessionId = httpServletRequest.getParameter("sessionId"); - logger.info(String.format("getTrdSSOAuth→sessionId:%s", sessionId)); + if(StringUtils.isNotEmpty(param) ){ + byte[] decodedBytes = Base64.getDecoder().decode(param); + String paramString = new String(decodedBytes, StandardCharsets.UTF_8); //二次重定向到待办页面,并且修改EOSS返回的sessionId的key值 - httpServletResponse.sendRedirect(httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code+"&eossSessionId="+sessionId); - //二次重定向进入解 - if (StringUtils.isNotEmpty(code) && sessionId == null) { - //调用EOSS获取token接口 - String access_token = AuthService.accessToken(code, ip, client, secret); - logger.info(String.format("getTrdSSOAuth→accessToken返回数据:%s", access_token)); - //调用EOSS获取用户信息接口 - String user = AuthService.getUserInfo(access_token, ip, client, secret); - logger.info(String.format("getTrdSSOAuth→getUserInfo返回数据:%s", user)); - String userKey = "user_sessionId_" + user; - //存储sessionId用于退出系统 - DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion"); - cache.put(userKey, httpServletRequest.getParameter("eossSessionId")); - //当前返回类型手机,用户名,email,工号 - result.setUserType(UserProperType.UserName); - result.setUser(user); - result.setSucess(true); - logger.info("SSO用户登录成功,进入苍穹系统"); - }else{ - result.setSucess(false); + try { + httpServletResponse.sendRedirect(httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code+"&eossSessionId="+sessionId); + } catch (IOException e) { + logger.info(String.format("getTrdSSOAuth→sendRedirect异常:%s", httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code+"&eossSessionId="+sessionId)); + throw new RuntimeException(e); } - } catch (IOException e) { - logger.error("二次重定向到待办页面异常!" + e.getMessage()); - throw new RuntimeException(e); + } + //二次重定向进入解 + if (StringUtils.isNotEmpty(code) && StringUtils.isNotEmpty(sessionId) ) { + //调用EOSS获取token接口 + String access_token = AuthService.accessToken(code, ip, client, secret); + logger.info(String.format("getTrdSSOAuth→accessToken返回数据:%s", access_token)); + //调用EOSS获取用户信息接口 + String user = AuthService.getUserInfo(access_token, ip, client, secret); + logger.info(String.format("getTrdSSOAuth→getUserInfo返回数据:%s", user)); + String userKey = "user_sessionId_" + user; + //存储sessionId用于退出系统 + DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion"); + cache.put(userKey, httpServletRequest.getParameter("eossSessionId")); + //当前返回类型手机,用户名,email,工号 + result.setUserType(UserProperType.UserName); + result.setUser(user); + result.setSucess(true); + logger.info("SSO用户登录成功,进入苍穹系统"); + }else{ + result.setSucess(false); } return result; }