From 4593cbc0913ad2b6ee850e1ca598e6b723e5cbf4 Mon Sep 17 00:00:00 2001
From: wenlukang1 <wenlukang@x-ri.com>
Date: Tue, 1 Jul 2025 10:37:44 +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=8D10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shkd/sys/sys/eoss/SSOPluginLogin.java     | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 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 fc645cc..5d44622 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
@@ -122,39 +122,37 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
 
         String param = httpServletRequest.getParameter("param");
         //解码
-        if (param != null) {
-            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));
-                //二次重定向到待办页面，并且不携带EOSS返回的sessionId
-                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);
+        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));
+            //二次重定向到待办页面，并且修改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);
             }
+        } catch (IOException e) {
+            logger.error("二次重定向到待办页面异常！" + e.getMessage());
+            throw new RuntimeException(e);
         }
         return result;
     }