Merge branch 'master' into feature/zhangbo_rank

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.recommend.server.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -41,7 +42,10 @@ public class RecommendParam {
     private int expansionFactor;
     private Boolean riskFilterFlag;
     private Map<Integer, List<String>> appRegionFiltered;
+
+    @JSONField(serialize = false)
     private List<Long> videosWithRisk;
+
     private String regionCode;
     private MachineInfo machineInfo;
     private String province;
@@ -52,3 +56,4 @@ public class RecommendParam {
     private Map<String, String> expIdMap;
 
 }
+

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

@@ -115,7 +115,6 @@ public class RecommendService {
                 && redisTemplate.opsForSet().isMember("special:mid", request.getMid())) {
             return specialMidRecommend(request);
         }
-        // log.info("sprcial mid cost={}", stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
 
         RecommendParam param = genRecommendParam(request, recommendType);
@@ -127,7 +126,6 @@ public class RecommendService {
                 stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         stopwatch.reset().start();
         updateCache(request, param, videos);
-//        log.info("updateCache={}, updateCache cost={}", JSONUtils.toJson(videos), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
 
         // 更新position
         List<VideoProto> vps = new ArrayList<>();
@@ -168,7 +166,6 @@ public class RecommendService {
         recallParam.setProvince(request.getProvince());
 
         RecallResult recallResult = recallService.recall(recallParam);
-        log.info("recallParam {}, recallResult {}", JSONUtils.toJson(recallParam), JSONUtils.toJson(recallResult));
 
         RankParam rankParam = new RankParam();
         rankParam.setRecallResult(recallResult);
@@ -176,7 +173,6 @@ public class RecommendService {
         rankParam.setSpecialRecommend(true);
 
         RankResult rankResult = rankRouter.rank(rankParam);
-        log.info("rankParam, rankResult {}", JSONUtils.toJson(rankParam), JSONUtils.toJson(rankResult));
 
         if (rankResult == null || CollectionUtils.isEmpty(rankResult.getVideos())) {
             return RecommendResponse.newBuilder()
@@ -192,7 +188,6 @@ public class RecommendService {
 
         if (CollectionUtils.isNotEmpty(videos)) {
             Video lastVideo = videos.get(videos.size() - 1);
-            log.info("update recall last video  lastVideo={}", JSONUtils.toJson(lastVideo));
             redisTemplate.opsForValue().set(lastVideo.getLastVideoKey(), String.valueOf(lastVideo.getVideoId()),
                     1, TimeUnit.DAYS);
         }

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

@@ -64,7 +64,7 @@ public class ViewedService {
             param.put("recommendStatus", recommendStatus);
             post.setEntity(new StringEntity(JSONUtils.toJson(param)));
 
-            log.info("request={}", JSONUtils.toJson(param));
+            // log.info("request={}", JSONUtils.toJson(param));
             chr = client.execute(post);
             if (chr == null
                     || chr.getStatusLine() == null
@@ -77,7 +77,7 @@ public class ViewedService {
                 return Collections.emptyList();
             }
             String content = EntityUtils.toString(entity);
-            log.info("response entity={}", JSONUtils.toJson(content));
+            // log.info("response entity={}", JSONUtils.toJson(content));
             Map<String, String> data = JSONUtils.fromJson(content,
                     new TypeToken<Map<String, String>>() {
                     },

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

@@ -2,7 +2,6 @@ package com.tzld.piaoquan.recommend.server.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -15,7 +14,7 @@ public class JSONUtils {
             return "";
         }
         try {
-            return new Gson().toJson(obj);
+            return JSONObject.toJSONString(obj);
         } catch (Exception e) {
             log.error("toJson exception", e);
             return "";