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 redisTemplate(@Qualifier("redisConnectionFactory0") RedisConnectionFactory connectionFactory) + public RedisTemplate redisTemplate( RedisConnectionFactory connectionFactory) { RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); @@ -65,46 +57,6 @@ public class RedisConfig extends CachingConfigurerSupport { template.afterPropertiesSet(); return template; } - - @Bean(name = "redisTemplate7") - public RedisTemplate redisTemplate7(@Qualifier("redisConnectionFactory7") RedisConnectionFactory redisConnectionFactory0) { - RedisTemplate 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 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 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 getCacheObject7(final String key) - { - ValueOperations operation = redisTemplate7.opsForValue(); - return operation.get(key); - } /** * 所有数字类型转换为BigDecimal