map = RedisUtils.getClient().getMapCache(name);
- Cache cache = new RedissonCache(map, config, allowNullValues);
+ Cache cache = new CaffeineCacheDecorator(new RedissonCache(map, config, allowNullValues));
if (transactionAware) {
cache = new TransactionAwareCacheDecorator(cache);
}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 59192c5ce..0475b19f4 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1,2 @@
org.dromara.common.redis.config.RedisConfig
+org.dromara.common.redis.config.CacheConfig
diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml
index 01c282b63..4df7d4ded 100644
--- a/ruoyi-common/ruoyi-common-satoken/pom.xml
+++ b/ruoyi-common/ruoyi-common-satoken/pom.xml
@@ -36,6 +36,11 @@
sa-token-jwt
+
+ com.github.ben-manes.caffeine
+ caffeine
+
+
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
index d88596228..0664755a4 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
@@ -2,26 +2,42 @@ package org.dromara.common.satoken.core.dao;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.util.SaFoxUtil;
+import cn.hutool.core.lang.Console;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
import org.dromara.common.redis.utils.RedisUtils;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Sa-Token持久层接口(使用框架自带RedisUtils实现 协议统一)
+ *
+ * 采用 caffeine + redis 多级缓存 优化并发查询效率
*
* @author Lion Li
*/
public class PlusSaTokenDao implements SaTokenDao {
+ private static final Cache CAFFEINE = Caffeine.newBuilder()
+ // 设置最后一次写入或访问后经过固定时间过期
+ .expireAfterWrite(5, TimeUnit.SECONDS)
+ // 初始的缓存空间大小
+ .initialCapacity(100)
+ // 缓存的最大条数
+ .maximumSize(1000)
+ .build();
+
/**
* 获取Value，如无返空
*/
@Override
public String get(String key) {
- return RedisUtils.getCacheObject(key);
+ Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+ return (String) o;
}
/**
@@ -38,6 +54,7 @@ public class PlusSaTokenDao implements SaTokenDao {
} else {
RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
}
+ CAFFEINE.put(key, value);
}
/**
@@ -47,6 +64,7 @@ public class PlusSaTokenDao implements SaTokenDao {
public void update(String key, String value) {
if (RedisUtils.hasKey(key)) {
RedisUtils.setCacheObject(key, value, true);
+ CAFFEINE.put(key, value);
}
}
@@ -81,7 +99,8 @@ public class PlusSaTokenDao implements SaTokenDao {
*/
@Override
public Object getObject(String key) {
- return RedisUtils.getCacheObject(key);
+ Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+ return o;
}
/**
@@ -98,6 +117,7 @@ public class PlusSaTokenDao implements SaTokenDao {
} else {
RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
}
+ CAFFEINE.put(key, object);
}
/**
@@ -107,6 +127,7 @@ public class PlusSaTokenDao implements SaTokenDao {
public void updateObject(String key, Object object) {
if (RedisUtils.hasKey(key)) {
RedisUtils.setCacheObject(key, object, true);
+ CAFFEINE.put(key, object);
}
}
@@ -139,10 +160,14 @@ public class PlusSaTokenDao implements SaTokenDao {
/**
* 搜索数据
*/
+ @SuppressWarnings("unchecked")
@Override
public List searchData(String prefix, String keyword, int start, int size, boolean sortType) {
- Collection keys = RedisUtils.keys(prefix + "*" + keyword + "*");
- List list = new ArrayList<>(keys);
- return SaFoxUtil.searchList(list, start, size, sortType);
+ String keyStr = prefix + "*" + keyword + "*";
+ return (List) CAFFEINE.get(keyStr, k -> {
+ Collection keys = RedisUtils.keys(keyStr);
+ List list = new ArrayList<>(keys);
+ return SaFoxUtil.searchList(list, start, size, sortType);
+ });
}
}
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 8488ac199..ce3d34451 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.domain.model.LoginUser;
import org.dromara.common.core.enums.UserType;
import java.util.Set;
-import java.util.function.Supplier;
/**
* 登录鉴权助手
@@ -35,9 +32,10 @@ public class LoginHelper {
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,11 +45,6 @@ public class LoginHelper {
* @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())
@@ -66,13 +59,11 @@ public class LoginHelper {
* 获取用户(多级缓存)
*/
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);
}
/**
@@ -90,7 +81,7 @@ public class LoginHelper {
* 获取用户id
*/
public static Long getUserId() {
- return Convert.toLong(getExtra(USER_KEY));
+ return Convert.toLong(getExtra(USER_KEY));
}
/**
@@ -107,8 +98,18 @@ public class LoginHelper {
return Convert.toLong(getExtra(DEPT_KEY));
}
+ /**
+ * 获取当前 Token 的扩展信息
+ *
+ * @param key 键值
+ * @return 对应的扩展数据
+ */
private static Object getExtra(String key) {
- return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key));
+ try {
+ return StpUtil.getExtra(key);
+ } catch (Exception e) {
+ return null;
+ }
}
/**
@@ -136,12 +137,17 @@ public class LoginHelper {
return UserConstants.SUPER_ADMIN_ID.equals(userId);
}
+ /**
+ * 是否为超级管理员
+ *
+ * @return 结果
+ */
public static boolean isSuperAdmin() {
return isSuperAdmin(getUserId());
}
/**
- * 是否为超级管理员
+ * 是否为租户管理员
*
* @param rolePermission 角色权限标识组
* @return 结果
@@ -150,27 +156,22 @@ public class LoginHelper {
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
+ /**
+ * 是否为租户管理员
+ *
+ * @return 结果
+ */
public static boolean isTenantAdmin() {
- Object value = getStorageIfAbsentSet(TENANT_ADMIN_KEY, () -> {
- return isTenantAdmin(getLoginUser().getRolePermission());
- });
- return Convert.toBool(value);
+ return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
}
+ /**
+ * 检查当前用户是否已登录
+ *
+ * @return 结果
+ */
public static boolean isLogin() {
return getLoginUser() != null;
}
- public static Object getStorageIfAbsentSet(String key, Supplier