From 380cb2db29b6918f7c37394de09c88ed6910b9e8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 二月 2023 22:45:59 +0800
Subject: [PATCH] fix 修复 因菜单权限过多 导致 token 臃肿过长问题
---
ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java
index 1bc4197..b8f35b2 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java
@@ -10,8 +10,6 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.enums.DeviceType;
import com.ruoyi.common.core.enums.UserType;
-import com.ruoyi.common.core.exception.UtilException;
-import com.ruoyi.common.core.utils.StringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -32,8 +30,8 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginHelper {
- public static final String JOIN_CODE = ":";
public static final String LOGIN_USER_KEY = "loginUser";
+ public static final String MENU_PERMISSION = "menuPermission";
/**
* 鐧诲綍绯荤粺
@@ -41,8 +39,7 @@
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void login(LoginUser loginUser) {
- SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
- StpUtil.login(loginUser.getLoginId(), new SaLoginModel().setExtra(LOGIN_USER_KEY, loginUser));
+ loginByDevice(loginUser, null);
}
/**
@@ -53,20 +50,30 @@
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
- StpUtil.login(loginUser.getLoginId(), new SaLoginModel()
- .setDevice(deviceType.getDevice())
- .setExtra(LOGIN_USER_KEY, loginUser));
+ Set<String> menuPermission = loginUser.getMenuPermission();
+ loginUser.setMenuPermission(null);
+ SaLoginModel model = new SaLoginModel();
+ if (ObjectUtil.isNotNull(deviceType)) {
+ model.setDevice(deviceType.getDevice());
+ }
+ StpUtil.login(loginUser.getLoginId(), model.setExtra(LOGIN_USER_KEY, loginUser));
+ // 瑙ｅ喅鑿滃崟鏉冮檺杩囧害 token 鑷冭偪杩囬暱闂
+ StpUtil.getTokenSession().set(MENU_PERMISSION, menuPermission);
}
/**
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
+ @SuppressWarnings("unchecked cast")
public static LoginUser getLoginUser() {
LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY);
if (loginUser != null) {
return loginUser;
}
loginUser = ((JSONObject) StpUtil.getExtra(LOGIN_USER_KEY)).toBean(LoginUser.class);
+ // 瑙ｅ喅鑿滃崟鏉冮檺杩囧害 token 鑷冭偪杩囬暱闂
+ Set<String> menuPermission = (Set<String>) StpUtil.getTokenSession().get(MENU_PERMISSION);
+ loginUser.setMenuPermission(menuPermission);
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
return loginUser;
}
@@ -74,29 +81,24 @@
/**
* 鑾峰彇鐢ㄦ埛鍩轰簬token
*/
+ @SuppressWarnings("unchecked cast")
public static LoginUser getLoginUser(String token) {
- return ((JSONObject) StpUtil.getExtra(token, LOGIN_USER_KEY)).toBean(LoginUser.class);
+ LoginUser loginUser = ((JSONObject) StpUtil.getExtra(token, LOGIN_USER_KEY)).toBean(LoginUser.class);
+ // 瑙ｅ喅鑿滃崟鏉冮檺杩囧害 token 鑷冭偪杩囬暱闂
+ Set<String> menuPermission = (Set<String>) StpUtil.getTokenSessionByToken(token).get(MENU_PERMISSION);
+ loginUser.setMenuPermission(menuPermission);
+ return loginUser;
}
/**
* 鑾峰彇鐢ㄦ埛id
*/
public static Long getUserId() {
- LoginUser loginUser = getLoginUser();
- if (ObjectUtil.isNull(loginUser)) {
- String loginId = StpUtil.getLoginIdAsString();
- String userId = null;
- for (UserType value : UserType.values()) {
- if (StringUtils.contains(loginId, value.getUserType())) {
- String[] strs = StringUtils.split(loginId, JOIN_CODE);
- // 鐢ㄦ埛id鍦ㄦ�绘槸鍦ㄦ渶鍚�
- userId = strs[strs.length - 1];
- }
- }
- if (StringUtils.isBlank(userId)) {
- throw new UtilException("鐧诲綍鐢ㄦ埛: LoginId寮傚父 => " + loginId);
- }
- return Long.parseLong(userId);
+ LoginUser loginUser;
+ try {
+ loginUser = getLoginUser();
+ } catch (Exception e) {
+ return null;
}
return loginUser.getUserId();
}
--
Gitblit v1.9.3