Merge pull request #50 from winkeylucky/winkey-0502

解决登录异常_和公共资源例外 0502
This commit is contained in:
ageerle
2025-04-07 14:02:35 +08:00
committed by GitHub
4 changed files with 27 additions and 4 deletions

View File

@@ -2,6 +2,7 @@ package org.ruoyi.common.satoken.utils;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.context.model.SaStorage;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
@@ -73,8 +74,11 @@ public class LoginHelper {
if (loginUser != null) {
return loginUser;
}
loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
SaSession tokenSession = StpUtil.getTokenSession();
if (tokenSession != null) {
loginUser = (LoginUser) tokenSession.get(LOGIN_USER_KEY);
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
};
return loginUser;
}