wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

两套单点登录+两套系统待办跳转bug修复1

This commit is contained in:
wenlukang1 2025-07-03 16:34:09 +08:00
parent 49631a9b9b
commit b68df42ec9
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/eoss/SSOPluginLogin.java
View File

@ -43,8 +43,8 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
String client; String client;
String secret; String secret;
String queryUrl = httpServletRequest.getQueryString(); String queryUrlOld = httpServletRequest.getQueryString();
if (queryUrl.contains("isNew")) { if (queryUrlOld.contains("isNew")) {
ip = EOSS_IP2; ip = EOSS_IP2;
client = CLIENT_ID2; client = CLIENT_ID2;
secret = CLIENT_SECRET2; secret = CLIENT_SECRET2;
@ -53,17 +53,24 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
client = CLIENT_ID; client = CLIENT_ID;
secret = CLIENT_SECRET; 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)); 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 queryUrlNew = Base64.getEncoder().encodeToString(queryUrlOld.getBytes(StandardCharsets.UTF_8));
String redirect = skIP + "/index.html?param=" + queryUrl; // String redirect = skIP + "/index.html?param=" + queryUrl;
String ssourl; String redirect = "http://127.0.0.1:8881/ierp" + "/index.html?param=" + queryUrlNew;
try {
logger.info(String.format("callTrdSSOLogin→true/false：%s", queryUrl.contains("wf_approvalpage")));
//非待办登录到首页
if (!queryUrl.contains("wf_approvalpage")) {
//认证中心的登录地址
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 //重定向到eoss统一认证的地址 获取授权码code
ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s", ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
ip, client, redirect); ip, client, redirect);
@ -78,12 +85,6 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
//退出系统跳转到eoss登录页 //退出系统跳转到eoss登录页
ssourl = ip + "/service/SGE-project-sctz-master/pc/dist/login.html"; 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)); logger.info(String.format("callTrdSSOLogin→→sendRedirect：%s", ssourl));
httpServletResponse.sendRedirect(ssourl); httpServletResponse.sendRedirect(ssourl);