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 | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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 3bff1f2..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,15 +3,13 @@
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;
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,9 @@
@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 TENANT_KEY = "tenantId";
+ public static final String USER_KEY = "userId";
/**
* 鐧诲綍绯荤粺
@@ -41,8 +40,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,9 +51,14 @@
*/
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));
+ SaLoginModel model = new SaLoginModel();
+ if (ObjectUtil.isNotNull(deviceType)) {
+ model.setDevice(deviceType.getDevice());
+ }
+ StpUtil.login(loginUser.getLoginId(),
+ model.setExtra(TENANT_KEY, loginUser.getTenantId())
+ .setExtra(USER_KEY, loginUser.getUserId()));
+ StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
/**
@@ -66,45 +69,42 @@
if (loginUser != null) {
return loginUser;
}
- loginUser = ((JSONObject) StpUtil.getExtra(LOGIN_USER_KEY)).toBean(LoginUser.class);
+ loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
return loginUser;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍩轰簬token
+ */
+ public static LoginUser getLoginUser(String token) {
+ return (LoginUser) StpUtil.getTokenSessionByToken(token).get(LOGIN_USER_KEY);
}
/**
* 鑾峰彇鐢ㄦ埛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);
+ Long userId;
+ try {
+ 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