init

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankResult.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.service.rank;
 
+import com.tzld.longarticle.recommend.server.model.Content;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,5 +14,5 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class RankResult {
-    private List<RankItem> contents;
+    private List<Content> contents;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankService.java

@@ -49,7 +49,6 @@ public class RankService {
         });
         Collections.sort(items, Comparator.comparingDouble(o -> -o.getScore()));
 
-
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
         // 1 相似去重
         contents = deduplication(contents);
@@ -80,22 +79,12 @@ public class RankService {
         }
 
         // 3-8
-        pool = contentMap.get(contentPools[1]);
+        pool = contentMap.get(contentPools[2]);
         if (CollectionUtils.isNotEmpty(pool)) {
-            if (pool.size() == 1) {
-                result.add(pool.get(0));
-            } else {
-                result.add(pool.get(0));
-                result.add(pool.get(1));
-            }
+            result.addAll(pool.subList(0, Math.min(pool.size(), param.getSize() - result.size())));
         }
 
-        // 其他
-
-        // 3-8
-
-
-        return new RankResult(items);
+        return new RankResult(result);
     }
 
     private ScoreParam convertToScoreParam(RankParam param) {

long-article-recommend-service/src/main/resources/application-dev.yml

@@ -1,17 +1,6 @@
 server:
   port: 8001
 
-eureka:
-  instance:
-    prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false
-    instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port} #注册到eureka上的唯一实例ID
-    lease-renewal-interval-in-seconds: 10 #表示eureka client发送心跳给server端的频率，默认30
-    lease-expiration-duration-in-seconds: 30 #表示eureka server至上一次收到client的心跳之后，等待下一次心跳的超时时间，在这个时间内若没收到下一次心跳，则将移除该instance，默认90
-  client:
-    registry-fetch-interval-seconds: 5  #定时从Eureka Server拉取服务注册信息的间隔时间
-    serviceUrl:
-      defaultZone: http://deveureka-internal.piaoquantv.com/eureka/
-
 spring:
   redis:
     hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
@@ -24,93 +13,6 @@ spring:
         max-wait: -1
         max-idle: 8
         min-idle: 0
-  feature-redis:
-    hostName: r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com
-    port: 6379
-    password: Wqsd@2019
-    timeout: 1000
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  long-video-redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
-    port: 6379
-    password: Wqsd@2019
-    timeout: 1000
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  filter-redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
-    port: 6379
-    password: Wqsd@2019
-    timeout: 1000
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  video-redis:
-    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
-    port: 6379
-    password: Wqsd@2019
-    timeout: 1000
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  data:
-    mongodb:
-      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
-      replicaSetName: dds-bp1de4fc73029b241978.mongodb.rds.aliyuncs.com:3717,dds-bp1de4fc73029b242144.mongodb.rds.aliyuncs.com:3717
-      # 连接池
-      maxConnectionIdleTime: 180000
-      # maxConnectionLifeTime: 30000
-      maxWaitTime: 3000
-      minSize: 5
-      maxSize: 10
-  datasource:
-    url: jdbc:mysql://rm-bp1k5853td1r25g3n690.mysql.rds.aliyuncs.com:3306/longvideo?useSSL=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
-    username: wx2016_longvideo
-    password: wx2016_longvideoP@assword1234
-    driver-class-name: com.mysql.jdbc.Driver
-    hikari:
-      connection-timeout: 30000
-      minimum-idle: 5
-      maximum-pool-size: 10
-      auto-commit: true
-      idle-timeout: 30000
-  jpa:
-    hibernate:
-      ddl-auto: validate
-    database: mysql
-xxl:
-  job:
-    admin:
-      addresses: http://xxl-job-test-internal.piaoquantv.com/xxl-job-admin
-    accessToken:
-    executor:
-      appname: ${spring.application.name}
-      address:
-      ip:
-      port: 9999
-      logpath: /datalog/weblog/${spring.application.name}/xxl-job/
-      logretentiondays: 30
 
 apollo:
   meta: http://devapolloconfig-internal.piaoquantv.com

long-article-recommend.iml

@@ -7,4 +7,8 @@
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
   </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>