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

新oa待办跳转到待办页面bug修复9

This commit is contained in:
wenlukang1 2025-06-30 22:26:13 +08:00
parent 42d561d6fa
commit a28e17e5fc
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
queryUrl = Base64.getEncoder().encodeToString(queryUrl.getBytes(StandardCharsets.UTF_8)); queryUrl = Base64.getEncoder().encodeToString(queryUrl.getBytes(StandardCharsets.UTF_8));
String skUrl = RevProxyUtil.getURLContextPath(httpServletRequest); String skUrl = RevProxyUtil.getURLContextPath(httpServletRequest);
logger.info("callTrdSSOLogin→getURLContextPath：" + skUrl); logger.info("callTrdSSOLogin→getURLContextPath：" + skUrl);
String redirect = skIP + "/index.html?param=" + queryUrl; String redirect = "http://127.0.0.1:8881/ierp" + "/index.html?param=" + queryUrl;
logger.info("callTrdSSOLogin→skip：" + redirect); 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", ssourl = String.format("%s/sso2/authCenter/authorize?client_id=%s&response_type=code&sessionKeep=true&authType=0&redirect_uri=%s",
@ -119,12 +119,7 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
result.setSucess(false); result.setSucess(false);
return result; return result;
} }
//调用EOSS获取token接口
String access_token = AuthService.accessToken(code, ip, client, secret);
logger.info(String.format("getTrdSSOAuth→accessToken返回数据：%s", access_token));
//调用EOSS获取用户信息接口
String user = AuthService.getUserInfo(access_token, ip, client, secret);
logger.info(String.format("getTrdSSOAuth→getUserInfo返回数据：%s", user));
String param = httpServletRequest.getParameter("param"); String param = httpServletRequest.getParameter("param");
//解码 //解码
if (param != null) { if (param != null) {
@ -134,27 +129,32 @@ public class SSOPluginLogin implements ThirdSSOAuthHandler {
//获取返回的 sessionId //获取返回的 sessionId
String sessionId = httpServletRequest.getParameter("sessionId"); String sessionId = httpServletRequest.getParameter("sessionId");
logger.info(String.format("getTrdSSOAuth→sessionId：%s", sessionId)); logger.info(String.format("getTrdSSOAuth→sessionId：%s", sessionId));
//二次重定向到待办页面，并且不携带EOSS返回的sessionId
httpServletResponse.sendRedirect(httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code+"&eossSessionId="+sessionId);
//二次重定向进入
if (StringUtils.isNotEmpty(code) && sessionId == null) {
//调用EOSS获取token接口
String access_token = AuthService.accessToken(code, ip, client, secret);
logger.info(String.format("getTrdSSOAuth→accessToken返回数据：%s", access_token));
//调用EOSS获取用户信息接口
String user = AuthService.getUserInfo(access_token, ip, client, secret);
logger.info(String.format("getTrdSSOAuth→getUserInfo返回数据：%s", user));
String userKey = "user_sessionId_" + user; String userKey = "user_sessionId_" + user;
//存储sessionId用于退出系统 //存储sessionId用于退出系统
DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion"); DistributeSessionlessCache cache = CacheFactory.getCommonCacheFactory().getDistributeSessionlessCache("customRegion");
cache.put(userKey, sessionId); cache.put(userKey, httpServletRequest.getParameter("eossSessionId"));
//二次重定向到待办页面，并且不携带EOSS返回的sessionId
httpServletResponse.sendRedirect(httpServletRequest.getRequestURI() + "?" + paramString + "&code=" + code);
} catch (IOException e) {
logger.error("二次重定向到待办页面异常！" + e.getMessage());
throw new RuntimeException(e);
}
result.setSucess(false);
return result;
}
//二次重定向进入
result.setUserType(UserProperType.UserName);
if (StringUtils.isNotEmpty(code) && user != null) {
//当前返回类型手机，用户名，email，工号 //当前返回类型手机，用户名，email，工号
result.setUserType(UserProperType.UserName); result.setUserType(UserProperType.UserName);
result.setUser(user); result.setUser(user);
result.setSucess(true); result.setSucess(true);
logger.info("SSO用户登录成功，进入苍穹系统"); logger.info("SSO用户登录成功，进入苍穹系统");
}else{
result.setSucess(false);
}
} catch (IOException e) {
logger.error("二次重定向到待办页面异常！" + e.getMessage());
throw new RuntimeException(e);
}
} }
return result; return result;
} }