From ef91551449a38e9d765a0cbbafe6bfc406564d3c Mon Sep 17 00:00:00 2001 From: houzhongfei <501777010@qq.com> Date: 星期三, 14 十二月 2022 18:50:48 +0800 Subject: [PATCH] ·优化:代码规范 --- ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java index c869528..b82ffd4 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java @@ -4,11 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.framework.config.properties.RedissonProperties; import com.ruoyi.framework.handler.KeyPrefixHandler; +import com.ruoyi.framework.manager.PlusSpringCacheManager; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RedissonClient; import org.redisson.codec.JsonJacksonCodec; -import org.redisson.spring.cache.CacheConfig; -import org.redisson.spring.cache.RedissonSpringCacheManager; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -17,10 +15,6 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * redis閰嶇疆 @@ -80,18 +74,12 @@ } /** - * 鏁村悎spring-cache + * 鑷畾涔夌紦瀛樼鐞嗗櫒 鏁村悎spring-cache */ + @Override @Bean - public CacheManager cacheManager(RedissonClient redissonClient) { - List<RedissonProperties.CacheGroup> cacheGroup = redissonProperties.getCacheGroup(); - Map<String, CacheConfig> config = new HashMap<>(); - for (RedissonProperties.CacheGroup group : cacheGroup) { - CacheConfig cacheConfig = new CacheConfig(group.getTtl(), group.getMaxIdleTime()); - cacheConfig.setMaxSize(group.getMaxSize()); - config.put(group.getGroupId(), cacheConfig); - } - return new RedissonSpringCacheManager(redissonClient, config, new JsonJacksonCodec(objectMapper)); + public CacheManager cacheManager() { + return new PlusSpringCacheManager(); } /** -- Gitblit v1.9.3