丁云鹏 vor 1 Jahr
Ursprung
Commit
de68fefc37

+ 4 - 4
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/config/FeatureRedisTemplateConfig.java

@@ -31,11 +31,11 @@ public class FeatureRedisTemplateConfig {
 
     @Bean("featureRedisFactory")
     @Primary
-    public LettuceConnectionFactory factory(@Qualifier("featureRedisPool") GenericObjectPoolConfig<LettucePoolingClientConfiguration> tairPool,
-                                            @Qualifier("featureRedisConfig") RedisStandaloneConfiguration tairConfig) {
+    public LettuceConnectionFactory factory(@Qualifier("featureRedisPool") GenericObjectPoolConfig<LettucePoolingClientConfiguration> featureRedisPool,
+                                            @Qualifier("featureRedisConfig") RedisStandaloneConfiguration featureRedisConfig) {
         LettuceClientConfiguration lettuceClientConfiguration =
-                LettucePoolingClientConfiguration.builder().poolConfig(tairPool).build();
-        return new LettuceConnectionFactory(tairConfig, lettuceClientConfiguration);
+                LettucePoolingClientConfiguration.builder().poolConfig(featureRedisPool).build();
+        return new LettuceConnectionFactory(featureRedisConfig, lettuceClientConfiguration);
     }
 
     @Bean(name = "featureRedisTemplate")

+ 6 - 6
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/config/LongVideoRedisTemplateConfig.java

@@ -19,23 +19,23 @@ public class LongVideoRedisTemplateConfig {
 
     @Bean("longVideoRedisPool")
     @ConfigurationProperties(prefix = "spring.long-video-redis.lettuce.pool")
-    public GenericObjectPoolConfig<LettucePoolingClientConfiguration> redisPool() {
+    public GenericObjectPoolConfig<LettucePoolingClientConfiguration> longVideoRedisPool() {
         return new GenericObjectPoolConfig<>();
     }
 
     @Bean("longVideoRedisConfig")
     @ConfigurationProperties(prefix = "spring.long-video-redis")
-    public RedisStandaloneConfiguration tairConfig() {
+    public RedisStandaloneConfiguration longVideoRedisConfig() {
         return new RedisStandaloneConfiguration();
     }
 
     @Bean("longVideoRedisFactory")
     @Primary
-    public LettuceConnectionFactory factory(GenericObjectPoolConfig<LettucePoolingClientConfiguration> redisPool,
-                                            RedisStandaloneConfiguration redisConfig) {
+    public LettuceConnectionFactory factory(@Qualifier("longVideoRedisPool") GenericObjectPoolConfig<LettucePoolingClientConfiguration> longVideoRedisPool,
+                                            @Qualifier("longVideoRedisConfig") RedisStandaloneConfiguration longVideoRedisConfig) {
         LettuceClientConfiguration lettuceClientConfiguration =
-                LettucePoolingClientConfiguration.builder().poolConfig(redisPool).build();
-        return new LettuceConnectionFactory(redisConfig, lettuceClientConfiguration);
+                LettucePoolingClientConfiguration.builder().poolConfig(longVideoRedisPool).build();
+        return new LettuceConnectionFactory(longVideoRedisConfig, lettuceClientConfiguration);
     }
 
     @Bean(name = "longVideoRedisTemplate")

+ 2 - 2
recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/config/RedisTemplateConfig.java

@@ -31,8 +31,8 @@ public class RedisTemplateConfig {
 
     @Bean("redisFactory")
     @Primary
-    public LettuceConnectionFactory factory(GenericObjectPoolConfig<LettucePoolingClientConfiguration> redisPool,
-                                            RedisStandaloneConfiguration redisConfig) {
+    public LettuceConnectionFactory factory(@Qualifier("redisPool") GenericObjectPoolConfig<LettucePoolingClientConfiguration> redisPool,
+                                            @Qualifier("redisConfig") RedisStandaloneConfiguration redisConfig) {
         LettuceClientConfiguration lettuceClientConfiguration =
                 LettucePoolingClientConfiguration.builder().poolConfig(redisPool).build();
         return new LettuceConnectionFactory(redisConfig, lettuceClientConfiguration);