From d6cb67f60cbaa86fd5dc29d8c254e3172f9e34bc Mon Sep 17 00:00:00 2001
From: wenlukang1 <wenlukang@x-ri.com>
Date: Mon, 30 Jun 2025 17:04:28 +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=8D6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shkd/sys/sys/eoss/SSOPluginLogin.java     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 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 117456f..fa96f17 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
@@ -58,15 +58,6 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
         try {
             //非待办登录到首页
             if (!queryUrl.contains("yzjShareOpen.do")) {
-                //重定向的统一认证的地址 获取授权码
-                ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
-                        ip, client, s);
-            } else {
-                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;
-                logger.info("callTrdSSOLogin→skip：" + redirect);
                 //认证中心的登录地址
                 logger.info(String.format("eoss_ip:%s,client_id:%s,client_secret:%s,重定向地址：%s", ip, client, secret, s));
                 if (httpServletRequest.getRequestURI().contains("/auth/logout.do")) {
@@ -77,11 +68,19 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
                     if (sessionId != null) {
                         AuthService.logout(ip, sessionId);
                     }
-                } else {
-                    //重定向的统一认证的地址 获取授权码
-                    ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
-                            ip, client, redirect);
                 }
+                //重定向的统一认证的地址 获取授权码
+                ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
+                        ip, client, s);
+            } else {
+                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;
+                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",
+                        ip, client, redirect);
             }
             logger.info(String.format("callTrdSSOLogin→→sendRedirect：%s", ssourl));
             httpServletResponse.sendRedirect(ssourl);