diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/LoginHelper.java index 51b750a..f8e06f3 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/LoginHelper.java @@ -66,17 +66,6 @@ public class LoginHelper { * 获取用户(多级缓存) */ public static LoginUser getLoginUser() { -// LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY); -// if (loginUser != null) { -// return loginUser; -// } -// SaSession session = StpUtil.getSession(); -// if (ObjectUtil.isNull(session)) { -// return null; -// } -// loginUser = (LoginUser) session.get(LOGIN_USER_KEY); -// SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser); -// return loginUser; return (LoginUser) getStorageIfAbsentSet(LOGIN_USER_KEY, () -> { SaSession session = StpUtil.getTokenSession(); if (ObjectUtil.isNull(session)) { @@ -90,12 +79,6 @@ public class LoginHelper { * 获取用户基于token */ public static LoginUser getLoginUser(String token) { -// Object loginId = StpUtil.getLoginIdByToken(token); -// SaSession session = StpUtil.getSessionByLoginId(loginId); -// if (ObjectUtil.isNull(session)) { -// return null; -// } -// return (LoginUser) session.get(LOGIN_USER_KEY); SaSession session = StpUtil.getTokenSessionByToken(token); if (ObjectUtil.isNull(session)) { return null; @@ -125,17 +108,6 @@ public class LoginHelper { } private static Object getExtra(String key) { -// Object obj; -// try { -// obj = SaHolder.getStorage().get(key); -// if (ObjectUtil.isNull(obj)) { -// obj = StpUtil.getExtra(key); -// SaHolder.getStorage().set(key, obj); -// } -// } catch (Exception e) { -// return null; -// } -// return obj; return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key)); }