From df5edb67f02935da3e231dda3364e7463b2adde2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 02 一月 2024 20:01:09 +0800
Subject: [PATCH] [重大更新] 使用caffeine重构PlusSaTokenDao层实现 减少将近90%的redis查询提高性能(尝试性更新问题未知 请勿轻易更新尝试)
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 59 +++++++++++++++++++++++------------------------------------
1 files changed, 23 insertions(+), 36 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 2406ba9..db80f08 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
@@ -1,7 +1,5 @@
package org.dromara.common.satoken.utils;
-import cn.dev33.satoken.context.SaHolder;
-import cn.dev33.satoken.context.model.SaStorage;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
@@ -15,7 +13,6 @@
import org.dromara.common.core.enums.UserType;
import java.util.Set;
-import java.util.function.Supplier;
/**
* 鐧诲綍閴存潈鍔╂墜
@@ -35,9 +32,10 @@
public static final String LOGIN_USER_KEY = "loginUser";
public static final String TENANT_KEY = "tenantId";
public static final String USER_KEY = "userId";
+ public static final String USER_NAME_KEY = "userName";
public static final String DEPT_KEY = "deptId";
+ public static final String DEPT_NAME_KEY = "deptName";
public static final String CLIENT_KEY = "clientid";
- public static final String TENANT_ADMIN_KEY = "isTenantAdmin";
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
@@ -47,30 +45,29 @@
* @param model 閰嶇疆鍙傛暟
*/
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());
- storage.set(DEPT_KEY, loginUser.getDeptId());
model = ObjectUtil.defaultIfNull(model, new SaLoginModel());
StpUtil.login(loginUser.getLoginId(),
model.setExtra(TENANT_KEY, loginUser.getTenantId())
.setExtra(USER_KEY, loginUser.getUserId())
- .setExtra(DEPT_KEY, loginUser.getDeptId()));
- StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+ .setExtra(DEPT_KEY, loginUser.getDeptId())
+ .setExtra(TENANT_KEY, loginUser.getTenantId())
+ .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
+ .setExtra(USER_NAME_KEY, loginUser.getUsername())
+ );
+ SaSession tokenSession = StpUtil.getTokenSession();
+ tokenSession.updateTimeout(model.getTimeout());
+ tokenSession.set(LOGIN_USER_KEY, loginUser);
}
/**
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- return (LoginUser) getStorageIfAbsentSet(LOGIN_USER_KEY, () -> {
- SaSession session = StpUtil.getTokenSession();
- if (ObjectUtil.isNull(session)) {
- return null;
- }
- return session.get(LOGIN_USER_KEY);
- });
+ SaSession session = StpUtil.getTokenSession();
+ if (ObjectUtil.isNull(session)) {
+ return null;
+ }
+ return (LoginUser) session.get(LOGIN_USER_KEY);
}
/**
@@ -88,7 +85,7 @@
* 鑾峰彇鐢ㄦ埛id
*/
public static Long getUserId() {
- return Convert.toLong(getExtra(USER_KEY));
+ return Convert.toLong(getExtra(USER_KEY));
}
/**
@@ -106,7 +103,12 @@
}
private static Object getExtra(String key) {
- return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key));
+ try {
+ return StpUtil.getExtra(key);
+ } catch (Exception e) {
+ return null;
+ }
+
}
/**
@@ -149,26 +151,11 @@
}
public static boolean isTenantAdmin() {
- Object value = getStorageIfAbsentSet(TENANT_ADMIN_KEY, () -> {
- return isTenantAdmin(getLoginUser().getRolePermission());
- });
- return Convert.toBool(value);
+ return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
}
public static boolean isLogin() {
return getLoginUser() != null;
}
- public static Object getStorageIfAbsentSet(String key, Supplier<Object> handle) {
- try {
- Object obj = SaHolder.getStorage().get(key);
- if (ObjectUtil.isNull(obj)) {
- obj = handle.get();
- SaHolder.getStorage().set(key, obj);
- }
- return obj;
- } catch (Exception e) {
- return null;
- }
- }
}
--
Gitblit v1.9.3