From c4c41d0c1e3b01cc3b34b38e7deaf1024a23e95e Mon Sep 17 00:00:00 2001 From: wenlukang1 Date: Wed, 18 Jun 2025 11:33:03 +0800 Subject: [PATCH] =?UTF-8?q?EOSS=E5=8C=BA=E5=88=86=E4=B8=A4=E5=A5=97?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8D=95=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/eoss/SSOPluginLogin.java | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 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 7be7fda..e854449 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 @@ -29,30 +29,46 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { private final String CLIENT_SECRET = System.getProperty("clientSecret-scict"); private final String EOSS_IP = System.getProperty("ip-port"); + private final String CLIENT_ID2 = System.getProperty("scnyfz-clientKey"); + private final String CLIENT_SECRET2 = System.getProperty("scnyfz-scict"); + private final String EOSS_IP2 = System.getProperty("scnyfz-ip"); + /** * 方法实现用户没有登录的时候跳转认证中心的登录地址 */ @Override public void callTrdSSOLogin(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, String s) { + String ip; + String client; + String secret; + if (httpServletRequest.getRequestURI().contains("scnyfz")) { + ip = EOSS_IP2; + client = CLIENT_ID2; + secret = CLIENT_SECRET2; + } else { + ip = EOSS_IP; + client = CLIENT_ID; + secret = CLIENT_SECRET; + } //认证中心的登录地址 - logger.info(String.format("eoss_ip:%s,client_id:%s,client_secret:%s,重定向地址:%s", EOSS_IP, CLIENT_ID, CLIENT_SECRET, s)); + logger.info(String.format("eoss_ip:%s,client_id:%s,client_secret:%s,重定向地址:%s", ip, client, secret, s)); try { - String ssourl = EOSS_IP + "/service/SGE-project-sctz-master/pc/dist/login.html"; + String ssourl = ip + "/service/SGE-project-sctz-master/pc/dist/login.html"; if (httpServletRequest.getRequestURI().contains("/auth/logout.do")) { String userName = UserServiceHelper.getCurrentUser("name").getString("name"); DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion"); String userKey = "user_sessionId_" + userName; // 构造一个唯一的键 String sessionId = cache.get(userKey); if (sessionId != null) { - AuthService.logout(EOSS_IP, sessionId); + AuthService.logout(ip, sessionId); } } else { /* *重定向的统一认证的地址 获取授权码 */ ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&authType=0&redirect_uri=%s", - EOSS_IP, CLIENT_ID, s); + ip, client, s); logger.info(String.format("重定向地址→sendRedirect:%s", ssourl)); } httpServletResponse.sendRedirect(ssourl); @@ -67,6 +83,18 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { @Override public UserAuthResult getTrdSSOAuth(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { logger.info(String.format("getTrdSSOAuth→httpServletRequest:%s", httpServletRequest)); + String ip; + String client; + String secret; + if (httpServletRequest.getRequestURI().contains("scnyfz")) { + ip = EOSS_IP2; + client = CLIENT_ID2; + secret = CLIENT_SECRET2; + } else { + ip = EOSS_IP; + client = CLIENT_ID; + secret = CLIENT_SECRET; + } //返回的认证结果 UserAuthResult result = new UserAuthResult(); //获取返回的授权码 @@ -89,11 +117,11 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { } else if (StringUtils.isNotEmpty(code)) { try { //TODO:调用accessToken方法 - String access_token = AuthService.accessToken(code, EOSS_IP, CLIENT_ID, CLIENT_SECRET); + String access_token = AuthService.accessToken(code, ip, client, secret); logger.info(String.format("accessToken返回数据:%s", access_token)); //TODO:调用getUserInfo方法 - String user = AuthService.getUserInfo(access_token, EOSS_IP, CLIENT_ID, CLIENT_SECRET); + String user = AuthService.getUserInfo(access_token, ip, client, secret); logger.info(String.format("getUserInfo返回数据:%s", user)); if (user != null) {