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 07e13c7..96d4aa8 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,8 +43,8 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { String client; String secret; - String queryUrl = httpServletRequest.getQueryString(); - if (queryUrl.contains("isNew")) { + String queryUrlOld = httpServletRequest.getQueryString(); + if (queryUrlOld.contains("isNew")) { ip = EOSS_IP2; client = CLIENT_ID2; secret = CLIENT_SECRET2; @@ -53,17 +53,24 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { client = CLIENT_ID; secret = CLIENT_SECRET; } - logger.info(String.format("callTrdSSOLogin→queryUrl:%s", queryUrl)); + logger.info(String.format("callTrdSSOLogin→queryUrl:%s", queryUrlOld)); 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 queryUrlNew = Base64.getEncoder().encodeToString(queryUrlOld.getBytes(StandardCharsets.UTF_8)); +// String redirect = skIP + "/index.html?param=" + queryUrl; + String redirect = "http://127.0.0.1:8881/ierp" + "/index.html?param=" + queryUrlNew; + String ssourl; + + try { + logger.info(String.format("callTrdSSOLogin→true/false:%s", queryUrlOld.contains("wf_approvalpage"))); + //非待办登录到首页 + if (queryUrlOld.contains("wf_approvalpage")) { + //待办跳转相关逻辑处理 + 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); + } else { //重定向到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); @@ -78,12 +85,6 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler { //退出系统跳转到eoss登录页 ssourl = ip + "/service/SGE-project-sctz-master/pc/dist/login.html"; } - } else { - //待办跳转相关逻辑处理 - 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);