zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9 from Bull-BCLS/dev

Browse Source 
refactor: 优化登录Helper
This commit is contained in:
Charles7c 2023-08-16 23:31:52 +08:00 committed by GitHub
commit 6fc6b36d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java
View File

@ -24,6 +24,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
@ -68,8 +69,9 @@ public class LoginHelper {
// 登录保存用户信息 // 登录保存用户信息
StpUtil.login(loginUser.getId()); StpUtil.login(loginUser.getId());
SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser);
loginUser.setToken(StpUtil.getTokenValue()); loginUser.setToken(StpUtil.getTokenValue());
StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_KEY, loginUser); StpUtil.getSession().set(CacheConsts.LOGIN_USER_KEY, loginUser);
} }
/** /**
@ -82,7 +84,11 @@ public class LoginHelper {
if (null != loginUser) { if (null != loginUser) {
return loginUser; return loginUser;
} }
loginUser = (LoginUser)StpUtil.getTokenSession().get(CacheConsts.LOGIN_USER_KEY); SaSession session = StpUtil.getSession();
if (null == session) {
return null;
}
loginUser = (LoginUser)session.get(CacheConsts.LOGIN_USER_KEY);
SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser); SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser);
return loginUser; return loginUser;
} }
@ -95,18 +101,12 @@ public class LoginHelper {
* @return 登录用户信息 * @return 登录用户信息
*/ */
public static LoginUser getLoginUser(String token) { public static LoginUser getLoginUser(String token) {
return StpUtil.getTokenSessionByToken(token).get(CacheConsts.LOGIN_USER_KEY, new LoginUser()); Object loginId = StpUtil.getLoginIdByToken(token);
} SaSession session = StpUtil.getSessionByLoginId(loginId);
if (null == session) {
/** return null;
* 更新登录用户信息 }
* return (LoginUser)session.get(CacheConsts.LOGIN_USER_KEY);
* @param loginUser
* 登录用户信息
*/
public static void updateLoginUser(LoginUser loginUser) {
SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser);
StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_KEY, loginUser);
} }
/** /**