Merge branch 'master' into vlog_merge_refactor_smz

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

@@ -125,8 +125,8 @@ public class RecommendService {
                 stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
         List<Video> videos = videoRecommend(param);
-        log.info("videoRecommend={}, videoRecommend cost={}", JSONUtils.toJson(videos),
-                stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+        // log.info("videoRecommend={}, videoRecommend cost={}", JSONUtils.toJson(videos),
+//        stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
         updateCache(request, param, videos);
 
@@ -438,13 +438,13 @@ public class RecommendService {
     private List<Video> videoRecommend(RecommendParam param) {
         Stopwatch stopwatch = Stopwatch.createStarted();
         RecallResult recallResult = recallService.recall(convertToRecallParam(param));
-        log.info("recallResult={}, videoRecommend recallResult cost={}", recallResult,
-                stopwatch.elapsed(TimeUnit.MILLISECONDS));
+//        log.info("recallResult={}, videoRecommend recallResult cost={}", recallResult,
+//                stopwatch.elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
 
         RankResult rankResult = rankRouter.rank(convertToRankParam(param, recallResult));
-        log.info("rankResult={}, videoRecommend rank cost={}", rankResult,
-                stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+//        log.info("rankResult={}, videoRecommend rank cost={}", rankResult,
+//                stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
 
 
         if (rankResult == null || CollectionUtils.isEmpty(rankResult.getVideos())) {

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

@@ -43,7 +43,7 @@ public class RankRouter {
     private RankStrategy4RegionMerge rankStrategy4RegionMerge;
 
     public RankResult rank(RankParam param) {
-        log.info("RankParam {}", JSONUtils.toJson(param));
+        // log.info("RankParam {}", JSONUtils.toJson(param));
         String abCode = param.getAbCode();
         if (StringUtils.isBlank(abCode)) {
             return rankService.rank(param);

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

@@ -44,7 +44,7 @@ public class RecallService implements ApplicationContextAware {
     }
 
     public RecallResult recall(RecallParam param) {
-        log.info("RecallParam {}", JSONUtils.toJson(param));
+       //  log.info("RecallParam {}", JSONUtils.toJson(param));
         List<RecallStrategy> strategies = getRecallStrategy(param);
         // log.info("strategies {}", JSONUtils.toJson(CommonCollectionUtils.toList(strategies, o -> o.pushFrom())));
         CountDownLatch cdl = new CountDownLatch(strategies.size());

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

@@ -106,8 +106,8 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
             redisTemplate.delete(lastVideoKey);
             poolKey = updateLastVideoRecord(recordKey, param);
         }
-        log.info("recall recordKey={}, record={}, poolKey={}, lastVideoKey={}, idx={}, ", recordKey, record, poolKey,
-                lastVideoKey, idx);
+//        log.info("recall recordKey={}, record={}, poolKey={}, lastVideoKey={}, idx={}, ", recordKey, record, poolKey,
+//                lastVideoKey, idx);
         if (StringUtils.isBlank(poolKey)) {
             return null;
         }
@@ -172,7 +172,7 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
         int sizeReturn = param.getSize();
         if (abCode != null && this.regionRecallReturnSize != null &&
                 this.regionRecallReturnSize.containsKey(abCode) &&
-                this.regionRecallReturnSize.get(abCode) != null ){
+                this.regionRecallReturnSize.get(abCode) != null) {
             sizeReturn = this.regionRecallReturnSize.get(abCode).getOrDefault(pushFrom, sizeReturn);
         }
 

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

@@ -45,7 +45,7 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
         String recall_key = recallKey(param);
         // [[16687915, 0.5], [16528093, 0.5]]
         String value = redisTemplate.opsForValue().get(recall_key);
-        log.info("recall recall_key={}, value={}", recall_key, JSONUtils.toJson(value));
+        // log.info("recall recall_key={}, value={}", recall_key, JSONUtils.toJson(value));
         if (StringUtils.isBlank(value)) {
             return null;
         }