From a28e17e5fc91539248d6307605ddab16755423f3 Mon Sep 17 00:00:00 2001 From: wenlukang1 Date: Mon, 30 Jun 2025 22:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0oa=E5=BE=85=E5=8A=9E=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E5=BE=85=E5=8A=9E=E9=A1=B5=E9=9D=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/eoss/SSOPluginLogin.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) 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 0d2f222..e9a5f37 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 @@ -79,7 +79,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { queryUrl = Base64.getEncoder().encodeToString(queryUrl.getBytes(StandardCharsets.UTF_8)); String skUrl = RevProxyUtil.getURLContextPath(httpServletRequest); logger.info("callTrdSSOLogin→getURLContextPath：" + skUrl); - String redirect = skIP + "/index.html?param=" + queryUrl; + String redirect = "http://127.0.0.1:8881/ierp" + "/index.html?param=" + queryUrl; logger.info("callTrdSSOLogin→skip：" + redirect); //重定向的统一认证的地址 获取授权码 ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s", @@ -119,12 +119,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { result.setSucess(false); return result; } - //调用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 param = httpServletRequest.getParameter("param"); //解码 if (param != null) { @@ -134,27 +129,32 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { //获取返回的 sessionId String sessionId = httpServletRequest.getParameter("sessionId"); logger.info(String.format("getTrdSSOAuth→sessionId：%s", sessionId)); - String userKey = "user_sessionId_" + user; - //存储sessionId用于退出系统 - DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion"); - cache.put(userKey, sessionId); //二次重定向到待办页面，并且不携带EOSS返回的sessionId - httpServletResponse.sendRedirect(httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code); + 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); + } } catch (IOException e) { logger.error("二次重定向到待办页面异常！" + e.getMessage()); throw new RuntimeException(e); } - result.setSucess(false); - return result; - } - //二次重定向进入 - result.setUserType(UserProperType.UserName); - if (StringUtils.isNotEmpty(code) && user != null) { - //当前返回类型手机，用户名，email，工号 - result.setUserType(UserProperType.UserName); - result.setUser(user); - result.setSucess(true); - logger.info("SSO用户登录成功，进入苍穹系统"); } return result; }