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);