From f6c96bd24669b94fdec2f26998c72f9e43004adf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 三月 2023 23:33:41 +0800
Subject: [PATCH] fix 修复 在线用户无法查询问题
---
ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 526b81f..93a614d 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
@@ -1,6 +1,7 @@
package com.ruoyi.common.satoken.utils;
import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaStorage;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
@@ -50,7 +51,10 @@
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
- SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+ SaStorage storage = SaHolder.getStorage();
+ storage.set(LOGIN_USER_KEY, loginUser);
+ storage.set(TENANT_KEY, loginUser.getTenantId());
+ storage.set(USER_KEY, loginUser.getUserId());
SaLoginModel model = new SaLoginModel();
if (ObjectUtil.isNotNull(deviceType)) {
model.setDevice(deviceType.getDevice());
@@ -87,7 +91,11 @@
public static Long getUserId() {
Long userId;
try {
- userId = Convert.toLong(StpUtil.getExtra(USER_KEY));
+ userId = Convert.toLong(SaHolder.getStorage().get(USER_KEY));
+ if (ObjectUtil.isNull(userId)) {
+ userId = Convert.toLong(StpUtil.getExtra(USER_KEY));
+ SaHolder.getStorage().set(USER_KEY, userId);
+ }
} catch (Exception e) {
return null;
}
@@ -100,7 +108,11 @@
public static String getTenantId() {
String tenantId;
try {
- tenantId = (String) StpUtil.getExtra(TENANT_KEY);
+ tenantId =(String) SaHolder.getStorage().get(TENANT_KEY);
+ if (ObjectUtil.isNull(tenantId)) {
+ tenantId = (String) StpUtil.getExtra(TENANT_KEY);
+ SaHolder.getStorage().set(TENANT_KEY, tenantId);
+ }
} catch (Exception e) {
return null;
}
--
Gitblit v1.9.3