From f3c6513d5ae0d5dc8f4bf2c8625d7edb85b7521d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 13 一月 2023 18:43:40 +0800
Subject: [PATCH] add 新增 flatten-maven-plugin 插件统一版本号管理
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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..8016ab8 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,23 +4,16 @@
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;
import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
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閰嶇疆
@@ -31,7 +24,7 @@
@Configuration
@EnableCaching
@EnableConfigurationProperties(RedissonProperties.class)
-public class RedisConfig extends CachingConfigurerSupport {
+public class RedisConfig {
@Autowired
private RedissonProperties redissonProperties;
@@ -80,18 +73,11 @@
}
/**
- * 鏁村悎spring-cache
+ * 鑷畾涔夌紦瀛樼鐞嗗櫒 鏁村悎spring-cache
*/
@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