From d957914c30a70b1b2b9f021945126762fd61470a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 20 二月 2023 20:45:45 +0800
Subject: [PATCH] fix 修复 LoginHelper 获取 LoginUser 缺失子类扩展数据问题
---
ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java | 39 +++++++++++++++------------------------
1 files changed, 15 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 b8f35b2..526b81f 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
@@ -3,8 +3,8 @@
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONObject;
import com.ruoyi.common.core.constant.TenantConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -31,7 +31,8 @@
public class LoginHelper {
public static final String LOGIN_USER_KEY = "loginUser";
- public static final String MENU_PERMISSION = "menuPermission";
+ public static final String TENANT_KEY = "tenantId";
+ public static final String USER_KEY = "userId";
/**
* 鐧诲綍绯荤粺
@@ -50,30 +51,25 @@
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
SaHolder.getStorage().set(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);
+ StpUtil.login(loginUser.getLoginId(),
+ model.setExtra(TENANT_KEY, loginUser.getTenantId())
+ .setExtra(USER_KEY, loginUser.getUserId()));
+ StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
/**
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
- @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);
+ loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
return loginUser;
}
@@ -81,39 +77,34 @@
/**
* 鑾峰彇鐢ㄦ埛鍩轰簬token
*/
- @SuppressWarnings("unchecked cast")
public static LoginUser getLoginUser(String token) {
- 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;
+ return (LoginUser) StpUtil.getTokenSessionByToken(token).get(LOGIN_USER_KEY);
}
/**
* 鑾峰彇鐢ㄦ埛id
*/
public static Long getUserId() {
- LoginUser loginUser;
+ Long userId;
try {
- loginUser = getLoginUser();
+ userId = Convert.toLong(StpUtil.getExtra(USER_KEY));
} catch (Exception e) {
return null;
}
- return loginUser.getUserId();
+ return userId;
}
/**
* 鑾峰彇绉熸埛ID
*/
public static String getTenantId() {
- LoginUser loginUser;
+ String tenantId;
try {
- loginUser = getLoginUser();
+ tenantId = (String) StpUtil.getExtra(TENANT_KEY);
} catch (Exception e) {
return null;
}
- return loginUser.getTenantId();
+ return tenantId;
}
/**
--
Gitblit v1.9.3