From b22d73dc1cceb3f5305d65846a68bba98e304176 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Tue, 20 Jan 2026 09:56:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20m2pool=20redis=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/redis/config/RedisConfig.java      | 50 +------------------
 .../common/redis/service/RedisService.java    | 13 -----
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/config/RedisConfig.java b/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/config/RedisConfig.java
index e8f69f1..97acd40 100644
--- a/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/config/RedisConfig.java
+++ b/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/config/RedisConfig.java
@@ -27,21 +27,13 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
  * @Date 2024/6/13 09:58
  * @Author dy
  */
-@RefreshScope
 @Configuration
 @EnableCaching
 public class RedisConfig extends CachingConfigurerSupport {
 
-    @Value("${spring.redis.host}")
-    private String host;
-    @Value("${spring.redis.port}")
-    private int port;
-    @Value("${spring.redis.database:0}")
-    private int database = 0;
-
     @Bean
     @SuppressWarnings(value = { "unchecked", "rawtypes" })
-    public RedisTemplate<Object, Object> redisTemplate(@Qualifier("redisConnectionFactory0") RedisConnectionFactory connectionFactory)
+    public RedisTemplate<Object, Object> redisTemplate( RedisConnectionFactory connectionFactory)
     {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
@@ -65,46 +57,6 @@ public class RedisConfig extends CachingConfigurerSupport {
         template.afterPropertiesSet();
         return template;
     }
-
-    @Bean(name = "redisTemplate7")
-    public RedisTemplate<Object, Object> redisTemplate7(@Qualifier("redisConnectionFactory7") RedisConnectionFactory redisConnectionFactory0) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(redisConnectionFactory0);
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(new StringRedisSerializer());
-        return template;
-    }
-
-
-    /**
-     * 7号 数据库 - >
-     * @return
-     */
-    @Bean
-    public RedisConnectionFactory redisConnectionFactory7() {
-        LettuceConnectionFactory factory = new LettuceConnectionFactory();
-        factory.setHostName(host);
-        factory.setPort(port);
-        factory.setDatabase(7);
-        return factory;
-    }
-
-    /**
-     *  默认 数据库
-     * @return
-     */
-    @Bean
-    @Primary  //添加@Primary默认使用的库
-    public RedisConnectionFactory redisConnectionFactory0() {
-        LettuceConnectionFactory factory = new LettuceConnectionFactory();
-        factory.setHostName(host);
-        factory.setPort(port);
-        factory.setDatabase(database);
-        return factory;
-    }
-
-
-
     @Bean
     public DefaultRedisScript<Long> limitScript()
     {
diff --git a/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/service/RedisService.java b/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/service/RedisService.java
index eeea772..bed1b8a 100644
--- a/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/service/RedisService.java
+++ b/m2pool-common/common-redis/src/main/java/com/m2pool/common/redis/service/RedisService.java
@@ -25,10 +25,6 @@ public class RedisService {
     @Qualifier("redisTemplate")
     private RedisTemplate redisTemplate;
 
-    @Autowired
-    @Qualifier("redisTemplate7")
-    private RedisTemplate redisTemplate7;
-
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
@@ -56,10 +52,6 @@ public class RedisService {
     }
 
 
-    public <T> void setCacheObject7(final String key, final T value, final Long  timeout, final TimeUnit timeUnit)
-    {
-        redisTemplate7.opsForValue().set(key, value, timeout, timeUnit);
-    }
 
     /**
      * 设置有效时间
@@ -132,11 +124,6 @@ public class RedisService {
         return operation.get(key);
     }
 
-    public <T> T getCacheObject7(final String key)
-    {
-        ValueOperations<String, T> operation = redisTemplate7.opsForValue();
-        return operation.get(key);
-    }
 
     /**
      * 所有数字类型转换为BigDecimal