From b4cbefd2b8abebd1c51b7a724e6a9b2a58b19e62 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 10 八月 2023 12:58:46 +0800
Subject: [PATCH] update 优化 登录用户缓存 去除冗余统一存储
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index 99bd6b5..2bbcd0d 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -7,13 +7,12 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.enums.DeviceType;
import org.dromara.common.core.enums.UserType;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
import java.util.Set;
@@ -35,44 +34,25 @@
public static final String LOGIN_USER_KEY = "loginUser";
public static final String TENANT_KEY = "tenantId";
public static final String USER_KEY = "userId";
-
- /**
- * 鐧诲綍绯荤粺
- *
- * @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
- */
- public static void login(LoginUser loginUser) {
- loginByDevice(loginUser, null);
- }
+ public static final String CLIENT_KEY = "clientid";
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
* 閽堝鐩稿悓鐢ㄦ埛浣撶郴涓嶅悓璁惧
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
+ * @param model 閰嶇疆鍙傛暟
*/
- public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
+ public static void login(LoginUser loginUser, SaLoginModel model) {
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());
- }
- // 鑷畾涔夊垎閰� 涓嶅悓鐢ㄦ埛浣撶郴 涓嶅悓 token 鎺堟潈鏃堕棿 涓嶈缃粯璁よ蛋鍏ㄥ眬 yml 閰嶇疆
- // 渚嬪: 鍚庡彴鐢ㄦ埛30鍒嗛挓杩囨湡 app鐢ㄦ埛1澶╄繃鏈�
-// UserType userType = UserType.getUserType(loginUser.getUserType());
-// if (userType == UserType.SYS_USER) {
-// model.setTimeout(86400).setActiveTimeout(1800);
-// } else if (userType == UserType.APP_USER) {
-// model.setTimeout(86400).setActiveTimeout(1800);
-// }
- StpUtil.stpLogic.setLoginType(loginUser.getUserType())
- .login(loginUser.getLoginId(),
- model.setExtra(TENANT_KEY, loginUser.getTenantId())
- .setExtra(USER_KEY, loginUser.getUserId()));
- StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+ model = ObjectUtil.defaultIfNull(model, new SaLoginModel());
+ StpUtil.login(loginUser.getLoginId(),
+ model.setExtra(TENANT_KEY, loginUser.getTenantId())
+ .setExtra(USER_KEY, loginUser.getUserId()));
+ StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
}
/**
@@ -83,7 +63,7 @@
if (loginUser != null) {
return loginUser;
}
- SaSession session = StpUtil.getTokenSession();
+ SaSession session = StpUtil.getSession();
if (ObjectUtil.isNull(session)) {
return null;
}
@@ -96,7 +76,8 @@
* 鑾峰彇鐢ㄦ埛鍩轰簬token
*/
public static LoginUser getLoginUser(String token) {
- SaSession session = StpUtil.getTokenSessionByToken(token);
+ Object loginId = StpUtil.getLoginIdByToken(token);
+ SaSession session = StpUtil.getSessionByLoginId(loginId);
if (ObjectUtil.isNull(session)) {
return null;
}
@@ -155,7 +136,7 @@
* 鑾峰彇鐢ㄦ埛绫诲瀷
*/
public static UserType getUserType() {
- String loginType = StpUtil.stpLogic.getLoginType();
+ String loginType = StpUtil.getLoginIdAsString();
return UserType.getUserType(loginType);
}
--
Gitblit v1.9.3