Merge branch 'master' into pre-master

ad-engine-server/src/main/resources/application-pre.yml

@@ -83,7 +83,7 @@ spring:
 
 aliyun:
   log:
-    project: ad-engine
+    project: ad-engine-test
 
 rocketmq:
   accessKey: 736nKkR5Gaq0NAgU

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -149,6 +149,7 @@ public class RankServiceImpl implements RankService {
                 item.setCpa(dto.getCpa());
                 item.setPidLambda(PidLambdaContainer.getPidLambda(item.getAdId()));
             }catch (Exception e){
+                log.error("rankItems info error itemId={}",item.getAdId());
                 e.printStackTrace();
             }
         }
@@ -209,7 +210,6 @@ public class RankServiceImpl implements RankService {
         log.info("svc=adBidRank {}", JSONObject.toJSONString(object));
         object.remove("lrsamples");
         log.info("svc=pid_log obj={}", JSONObject.toJSONString(object));
-        log.info("svc=pid_v2_log obj={}", JSONObject.toJSONString(object));
         return result;
     }