Merge branch 'feature/20240511/sunxy/changeNewExpFlowPool' into pre-master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/common/ThreadPoolFactory.java

@@ -19,8 +19,8 @@ public final class ThreadPoolFactory {
             new ThreadFactoryBuilder().setNameFormat("DEFAULT-%d").build(),
             new ThreadPoolExecutor.AbortPolicy());
     public final static ExecutorService RECALL = new CommonThreadPoolExecutor(
-            128,
-            128,
+            256,
+            256,
             0L, TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(1000),
             new ThreadFactoryBuilder().setNameFormat("RecallService-%d").build(),

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

@@ -91,6 +91,8 @@ public class AllowListStrategy implements FilterStrategy {
                     retainVideoIds.add(videoId);
                 }
             }
+        } else {
+            return Lists.newArrayList(param.getVideoIds());
         }
         if (CollectionUtils.isEmpty(retainVideoIds)) {
             return Collections.emptyList();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -204,7 +204,7 @@ public class RecallService implements ApplicationContextAware {
                                 || "60105".equals(abCode) || "60106".equals(abCode) || "60107".equals(abCode)
                                 || "60113".equals(abCode) || "60114".equals(abCode)
                                 || "60115".equals(abCode) || "60117".equals(abCode) || "60118".equals(abCode)
-                                || "60119".equals(abCode)) {
+                                || "60119".equals(abCode) || "60150".equals(abCode) || "60151".equals(abCode)) {
                             strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategyTomson.class.getSimpleName()));
                         } else {
                             strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategy.class.getSimpleName()));