Merge branch 'feature_filter' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/config/CustomMongoProperties.java

@@ -11,8 +11,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 )
 @Data
 public class CustomMongoProperties {
-    private String host;
-    private Integer port;
+    private String clusterHost;
+    private Integer clusterPort;
+    private String secondaryHost;
+    private Integer secondaryPort;
+
     private String uri;
     private String database;
     private String username;

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")

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")

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/config/MongoTemplateConfig.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.recommend.server.config;
 
+import com.google.common.collect.Lists;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
@@ -32,8 +33,9 @@ public class MongoTemplateConfig {
         MongoClientSettings.Builder builder = MongoClientSettings.builder();
 
         builder.applyToClusterSettings(settings -> {
-            settings.hosts(singletonList(
-                    new ServerAddress(properties.getHost(), properties.getPort())));
+            settings.hosts(Lists.newArrayList(
+                    new ServerAddress(properties.getClusterHost(), properties.getClusterPort()),
+                    new ServerAddress(properties.getSecondaryHost(), properties.getSecondaryPort())));
         });
 
 

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);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/strategy/ViewedStrategy.java

@@ -44,7 +44,7 @@ public class ViewedStrategy implements FilterStrategy {
         if (StringUtils.isBlank(user)) {
             return param.getVideoIds();
         }
-        String key = String.format(keyFormat, param.getMid());
+        String key = String.format(keyFormat, user);
         Set<String> viewedVideoIds = redisTemplate.opsForSet().members(key);
         if (CollectionUtils.isEmpty(viewedVideoIds)) {
             // 从mongo取曝光数据

recommend-server-service/src/main/resources/application-dev.yml

@@ -48,8 +48,10 @@ spring:
         min-idle: 0
   data:
     mongodb:
-      host: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
-      port: 3717
+      clusterHost: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
+      clusterPort: 3717
+      secondaryHost: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
+      secondaryPort: 3717
       database: longvideo
       username: lv
       password: lv@2018

recommend-server-service/src/main/resources/application-pre.yml

@@ -36,7 +36,7 @@ spring:
         max-idle: 8
         min-idle: 0
   long-video-redis:
-    hostName: r-bp1oyhyx4mxgs6klyt561.redis.rds.aliyuncs.com
+    hostName: r-bp109v1gjl63qi00cb.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000
@@ -48,11 +48,13 @@ spring:
         min-idle: 0
   data:
     mongodb:
-      host: dds-bp1982ea69508a541455.mongodb.rds.aliyuncs.com
-      port: 3717
+      clusterHost: s-bp14ce206f81b754.mongodb.rds.aliyuncs.com
+      clusterPort: 3717
+      secondaryHost: s-bp137073555e7bc4.mongodb.rds.aliyuncs.com
+      secondaryPort: 3717
       database: longvideo
       username: lv
-      password: lv@2018
+      password: lv2018
       # 连接池
       maxConnectionIdleTime: 180000
       # maxConnectionLifeTime: 30000

recommend-server-service/src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ spring:
         max-idle: 8
         min-idle: 0
   long-video-redis:
-    hostName: r-bp1oyhyx4mxgs6klyt561.redis.rds.aliyuncs.com
+    hostName: r-bp109v1gjl63qi00cb.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000
@@ -48,11 +48,13 @@ spring:
         min-idle: 0
   data:
     mongodb:
-      host: dds-bp1982ea69508a541455.mongodb.rds.aliyuncs.com
-      port: 3717
+      clusterHost: s-bp14ce206f81b754.mongodb.rds.aliyuncs.com
+      clusterPort: 3717
+      secondaryHost: s-bp137073555e7bc4.mongodb.rds.aliyuncs.com
+      secondaryPort: 3717
       database: longvideo
       username: lv
-      password: lv@2018
+      password: lv2018
       # 连接池
       maxConnectionIdleTime: 180000
       # maxConnectionLifeTime: 30000

recommend-server-service/src/main/resources/application-test.yml

@@ -14,8 +14,10 @@ eureka:
 
 spring:
   redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
-    port: 6379
+    clusterHost: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
+    clusterPort: 3717
+    secondaryHost: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
+    secondaryPort: 3717
     password: Wqsd@2019
     timeout: 1000
     lettuce: