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

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java

@@ -31,9 +31,6 @@ public abstract class RankService {
     @ApolloJsonValue("${alg.recall.special.app&vid:{}}")
     protected Map<String, List<Long>> specialAppVid;
 
-    @Value("${word2vec.exp:691}")
-    protected String word2vecExp;
-
     public RankResult rank(RankParam param) {
         if (param == null
                 || param.getRecallResult() == null

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV536.java

@@ -226,12 +226,7 @@ public class RankStrategy4RegionMergeModelV536 extends RankStrategy4RegionMergeM
                         String tags = c34567Map.getOrDefault(key, "");
                         if (!tags.isEmpty()) {
                             Future<Pair<String, Double[]>> future = ThreadPoolFactory.defaultPool().submit(() -> {
-                                Double[] doubles = null;
-                                if (param.getAbExpCodes().contains(word2vecExp)) {
-                                    doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
-                                } else {
-                                    doubles = ExtractorUtils.funcC34567ForTags(tags, title);
-                                }
+                                Double[] doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
                                 return Pair.create(key, doubles);
                             });
                             futures.add(future);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV562.java

@@ -250,12 +250,7 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
                         String tags = c34567Map.getOrDefault(key, "");
                         if (!tags.isEmpty()) {
                             Future<Pair<String, Double[]>> future = ThreadPoolFactory.defaultPool().submit(() -> {
-                                Double[] doubles = null;
-                                if (param.getAbExpCodes().contains(word2vecExp)) {
-                                    doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
-                                } else {
-                                    doubles = ExtractorUtils.funcC34567ForTags(tags, title);
-                                }
+                                Double[] doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
                                 return Pair.create(key, doubles);
                             });
                             futures.add(future);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV563.java

@@ -238,12 +238,7 @@ public class RankStrategy4RegionMergeModelV563 extends RankStrategy4RegionMergeM
                         String tags = c34567Map.getOrDefault(key, "");
                         if (!tags.isEmpty()) {
                             Future<Pair<String, Double[]>> future = ThreadPoolFactory.defaultPool().submit(() -> {
-                                Double[] doubles = null;
-                                if (param.getAbExpCodes().contains(word2vecExp)) {
-                                    doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
-                                } else {
-                                    doubles = ExtractorUtils.funcC34567ForTags(tags, title);
-                                }
+                                Double[] doubles = ExtractorUtils.funcC34567ForTagsNew(tags, title);
                                 return Pair.create(key, doubles);
                             });
                             futures.add(future);