filter

recommend-server-service/pom.xml

@@ -187,10 +187,10 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-<<<<<<< HEAD
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
-=======
+        </dependency>
+        <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
         </dependency>
@@ -198,7 +198,6 @@
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
             <version>3.8.0</version>
->>>>>>> 2eab46b (compatible)
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/util/CommonCollectionUtils.java

@@ -29,11 +29,7 @@ public class CommonCollectionUtils {
         if (CollectionUtils.isEmpty(col)) {
             return Collections.emptyMap();
         }
-<<<<<<< HEAD
-        return col.stream().collect(Collectors.toMap(keyFunc::apply, valueFunc::apply));
-=======
-        return list.stream().collect(Collectors.toMap(keyFunc::apply, valueFunc::apply, (u, v) -> v, HashMap::new));
->>>>>>> b30d926 (filter)
+        return col.stream().collect(Collectors.toMap(keyFunc::apply, valueFunc::apply, (u, v) -> v, HashMap::new));
     }
 
     public static <T, R> Set<R> toSet(Collection<T> col, Function<T, R> func) {

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

@@ -24,7 +24,6 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
-<<<<<<< HEAD
   feature-redis:
     hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
     port: 6379
@@ -36,7 +35,6 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
-=======
   data:
     mongodb:
       host: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com
@@ -51,7 +49,6 @@ spring:
       maxWaitTime: 30000
       minSize: 5
       maxSize: 10
->>>>>>> 2eab46b (compatible)
 
 xxl:
   job: