update 优化 全局创建 caffeine 实例

ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.common.dict.service.impl;
 
-import cn.dev33.satoken.context.SaHolder;
+import com.github.benmanes.caffeine.cache.Cache;
-import cn.hutool.core.util.ObjectUtil;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.service.DictService;
@@ -9,6 +8,7 @@ import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.system.api.RemoteDictService;
 import org.dromara.system.api.domain.vo.RemoteDictDataVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -24,6 +24,9 @@ import java.util.stream.Collectors;
 @Service
 public class DictServiceImpl implements DictService {
 
+    @Autowired
+    private Cache<Object, Object> ceffeine;
+
     @DubboReference
     private RemoteDictService remoteDictService;
 
@@ -35,15 +38,13 @@ public class DictServiceImpl implements DictService {
      * @param separator 分隔符
      * @return 字典标签
      */
+    @SuppressWarnings("unchecked")
     @Override
     public String getDictLabel(String dictType, String dictValue, String separator) {
         // 优先从本地缓存获取
-        List<RemoteDictDataVo> datas = (List<RemoteDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
+        List<RemoteDictDataVo> datas = (List<RemoteDictDataVo>) ceffeine.get(CacheConstants.SYS_DICT_KEY + dictType, k -> {
-        if (ObjectUtil.isNull(datas)) {
+            return remoteDictService.selectDictDataByType(dictType);
-            datas = remoteDictService.selectDictDataByType(dictType);
+        });
-            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
-        }
-
         Map<String, String> map = StreamUtils.toMap(datas, RemoteDictDataVo::getDictValue, RemoteDictDataVo::getDictLabel);
         if (StringUtils.containsAny(dictValue, separator)) {
             return Arrays.stream(dictValue.split(separator))
@@ -62,15 +63,13 @@ public class DictServiceImpl implements DictService {
      * @param separator 分隔符
      * @return 字典值
      */
+    @SuppressWarnings("unchecked")
     @Override
     public String getDictValue(String dictType, String dictLabel, String separator) {
         // 优先从本地缓存获取
-        List<RemoteDictDataVo> datas = (List<RemoteDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
+        List<RemoteDictDataVo> datas = (List<RemoteDictDataVo>) ceffeine.get(CacheConstants.SYS_DICT_KEY + dictType, k -> {
-        if (ObjectUtil.isNull(datas)) {
+            return remoteDictService.selectDictDataByType(dictType);
-            datas = remoteDictService.selectDictDataByType(dictType);
+        });
-            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
-        }
-
         Map<String, String> map = StreamUtils.toMap(datas, RemoteDictDataVo::getDictLabel, RemoteDictDataVo::getDictValue);
         if (StringUtils.containsAny(dictLabel, separator)) {
             return Arrays.stream(dictLabel.split(separator))

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfiguration.java

@@ -0,0 +1,45 @@
+package org.dromara.common.redis.config;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.redis.manager.PlusSpringCacheManager;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存配置
+ *
+ * @author Lion Li
+ */
+@AutoConfiguration
+@EnableCaching
+public class CacheConfiguration {
+
+    /**
+     * caffeine 本地缓存处理器
+     */
+    @Bean
+    public Cache<Object, Object> caffeine() {
+        return Caffeine.newBuilder()
+            // 设置最后一次写入或访问后经过固定时间过期
+            .expireAfterWrite(30, TimeUnit.SECONDS)
+            // 初始的缓存空间大小
+            .initialCapacity(100)
+            // 缓存的最大条数
+            .maximumSize(1000)
+            .build();
+    }
+
+    /**
+     * 自定义缓存管理器 整合spring-cache
+     */
+    @Bean
+    public CacheManager cacheManager() {
+        return new PlusSpringCacheManager();
+    }
+
+}

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.redis.config.properties.RedissonProperties;
 import org.dromara.common.redis.handler.KeyPrefixHandler;
-import org.dromara.common.redis.manager.PlusSpringCacheManager;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.codec.CompositeCodec;
 import org.redisson.codec.TypedJsonJacksonCodec;
@@ -16,8 +15,6 @@ import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -27,7 +24,6 @@ import org.springframework.context.annotation.Bean;
  */
 @Slf4j
 @AutoConfiguration
-@EnableCaching
 @EnableConfigurationProperties(RedissonProperties.class)
 public class RedisConfiguration {
 
@@ -86,14 +82,6 @@ public class RedisConfiguration {
         };
     }
 
-    /**
-     * 自定义缓存管理器 整合spring-cache
-     */
-    @Bean
-    public CacheManager cacheManager() {
-        return new PlusSpringCacheManager();
-    }
-
     /**
      * redis集群配置 yml
      *

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusCacheWrapper.java

@@ -1,11 +1,10 @@
 package org.dromara.common.redis.manager;
 
 import cn.hutool.core.lang.Console;
-import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.core.utils.SpringUtils;
 import org.springframework.cache.Cache;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Cache 装饰器(用于扩展一级缓存)
@@ -14,14 +13,8 @@ import java.util.concurrent.TimeUnit;
  */
 public class PlusCacheWrapper implements Cache {
 
-    private static final com.github.benmanes.caffeine.cache.Cache<Object, Object> CAFFEINE = Caffeine.newBuilder()
+    private static final com.github.benmanes.caffeine.cache.Cache<Object, Object>
-        // 设置最后一次写入或访问后经过固定时间过期
+            CAFFEINE = SpringUtils.getBean("caffeine");
-        .expireAfterWrite(30, TimeUnit.SECONDS)
-        // 初始的缓存空间大小
-        .initialCapacity(100)
-        // 缓存的最大条数
-        .maximumSize(1000)
-        .build();
 
     private final Cache cache;
 

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.RedisConfiguration
+org.dromara.common.redis.config.CacheConfiguration