Commit cc800603 authored by 常学朋's avatar 常学朋

Merge branch 'feature-202509241012-stms-token-' into 'master'

还原原先的stms token

See merge request !128
parents 375534f4 02375485
......@@ -54,7 +54,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
throw new BizException(BizExceptionEnum.UN_EXIT_STMS_TOKEN);
}
SessionStruct sessionStruct = XyqbSessionContextHolder.getStmsXSessionFromRedis(stmsToken, Integer.valueOf(tenantId), StringUtils.isEmpty(registeredFrom) ? null:Long.valueOf(registeredFrom));
SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(stmsToken, Integer.valueOf(tenantId), StringUtils.isEmpty(registeredFrom) ? null:Long.valueOf(registeredFrom));
log.info("stms权限 从redis获取sessionStruct结果:{}",JSONObject.toJSONString(sessionStruct));
if (sessionStruct == null) {
OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken);
......@@ -63,13 +63,13 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
String userId = String.valueOf(linkedHashMap.get("id"));
String userName = String.valueOf(linkedHashMap.get("name"));
sessionStruct = XyqbSessionContextHolder.initSTMSSession(stmsToken, userId, userName);
sessionService.persistStmsSession(sessionStruct.getSid(), sessionStruct.getValues(), Constants.StmsSession.STMS_SESSION_VALID_TIME,sessionStruct.getTenantId());
sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(),sessionStruct.getTenantId());
} else {
throw new BizException(BizExceptionEnum.UN_PERMISSION_STMS);
}
} else {
//stms session续期
sessionService.persistStmsSession(sessionStruct.getSid(), sessionStruct.getValues(), Constants.StmsSession.STMS_SESSION_VALID_TIME,sessionStruct.getTenantId());
sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(),sessionStruct.getTenantId());
log.info("stms权限 sessionStruct续期完成:{}",JSONObject.toJSONString(sessionStruct));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment