Merge branch 'master' into brandvector

Conflicts:
	service/src/main/java/com/yoho/search/recall/scene/beans/cache/UserRecallCacheBean.java

@@ -100,7 +100,7 @@ public class UserRecallCacheBean extends AbstractCacheBean<UserRecallRequest, Us
     private List<RecallRequestResponse> batchRecall(UserRecallRequest userRecallRequest, UserPersonalFactor userPersonalFactor) {
 
         //1、处理实时推荐SKN的召回
-        CompletableFuture<List<RecallRequestResponse>> sknListCompletableFuture = this.doRecallSknList(userRecallRequest, userPersonalFactor);
+        //CompletableFuture<List<RecallRequestResponse>> sknListCompletableFuture = this.doRecallSknList(userRecallRequest, userPersonalFactor);
 
         //2、处理通用召回
         CompletableFuture<List<RecallRequestResponse>> commonCompletableFuture = this.doRecallCommon(userRecallRequest, userPersonalFactor);
@@ -120,7 +120,7 @@ public class UserRecallCacheBean extends AbstractCacheBean<UserRecallRequest, Us
         //8、构造最终返回结果投入额
         List<RecallRequestResponse> batchRequestResults = new ArrayList<>();
 
-        batchRequestResults.addAll(this.getResultFromCompletableFuture(sknListCompletableFuture));//按skn召回放在第一个，不然merger的时候可能会无序
+        //batchRequestResults.addAll(this.getResultFromCompletableFuture(sknListCompletableFuture));//按skn召回放在第一个，不然merger的时候可能会无序
         batchRequestResults.addAll(this.getResultFromCompletableFuture(commonCompletableFuture));
         batchRequestResults.addAll(this.getResultFromCompletableFuture(realTimeSortBrandCompletableFuture));
         batchRequestResults.addAll(this.getResultFromCompletableFuture(forecastSortBrandCompletableFuture));