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 749b06d..07e13c7 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 @@ -55,15 +55,16 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { } logger.info(String.format("callTrdSSOLogin→queryUrl:%s", queryUrl)); logger.info(String.format("eoss_ip:%s,client_id:%s,client_secret:%s,重定向地址:%s", ip, client, secret, s)); - + queryUrl = Base64.getEncoder().encodeToString(queryUrl.getBytes(StandardCharsets.UTF_8)); + String redirect = skIP + "/index.html?param=" + queryUrl; String ssourl; try { logger.info(String.format("callTrdSSOLogin→true/false:%s", queryUrl.contains("wf_approvalpage"))); //非待办登录到首页 if (!queryUrl.contains("wf_approvalpage")) { //认证中心的登录地址 - String redirect = skIP + "/index.html?"+queryUrl; - //重定向的统一认证的地址 获取授权码 + + //重定向到eoss统一认证的地址 获取授权码code ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s", ip, client, redirect); if (httpServletRequest.getRequestURI().contains("/auth/logout.do")) { @@ -74,13 +75,11 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { if (sessionId != null) { AuthService.logout(ip, sessionId); } + //退出系统跳转到eoss登录页 ssourl = ip + "/service/SGE-project-sctz-master/pc/dist/login.html"; } } 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",