From 06502dbbc027d4c31d115a01d716cb985af401f6 Mon Sep 17 00:00:00 2001
From: wenlukang1 <wenlukang@x-ri.com>
Date: Fri, 4 Jul 2025 14:08:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E5=A5=97=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95+=E4=B8=A4=E5=A5=97=E7=B3=BB=E7=BB=9F=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E8=B7=B3=E8=BD=ACbug=E4=BF=AE=E5=A4=8D7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/shkd/sys/sys/eoss/SSOPluginLogin.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 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 d1fdfc9..e1a8451 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
@@ -43,7 +43,14 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
         String secret;
         String queryUrlOld = httpServletRequest.getQueryString();
         //有code无需再次获取code，直接结束
-        if (queryUrlOld.contains("code")) {
+        if (queryUrlOld.contains("code") && queryUrlOld.contains("sessionId") ) {
+            String replace = queryUrlOld.replace("sessionId", "eossSessionId");
+            try {
+                httpServletResponse.sendRedirect(httpServletRequest.getRequestURI()+"?"+replace);
+                logger.info(String.format("callTrdSSOLogin→sendRedirect：%s", httpServletRequest.getRequestURI()+"?"+replace));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
             return;
         }
         String redirect;
@@ -63,9 +70,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
         }
         logger.info(String.format("eoss_ip:%s,client_id:%s,client_secret:%s,重定向地址：%s", ip, client, secret, s));
         logger.info(String.format("callTrdSSOLogin→redirect：%s", redirect));
-
         String ssoUrl;
-
         try {
             //退出系统
             if (httpServletRequest.getRequestURI().contains("/auth/logout.do")) {
@@ -83,9 +88,10 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
                 ssoUrl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
                         ip, client, redirect);
             }
-            logger.info(String.format("callTrdSSOLogin→→sendRedirect：%s", ssoUrl));
             httpServletResponse.sendRedirect(ssoUrl);
+            logger.info(String.format("callTrdSSOLogin→sendRedirect：%s", ssoUrl));
         } catch (IOException e) {
+            logger.info(String.format("callTrdSSOLogin→sendRedirect异常：%s", e));
             throw new RuntimeException(e);
         }
     }