Merge remote-tracking branch 'origin/master'

ad-engine-commons/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-feature-client</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.9</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>

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

@@ -80,8 +80,12 @@ public class RankServiceImpl implements RankService {
         if (!CollectionUtils.isEmpty(rankResult)) {
 //            log.info("svc=adItemRank request={} rankResult={} dataTime={}", JSONObject.toJSONString(request),JSONObject.toJSONString(rankResult),currentTime.format(timeFormatter));
             JSONObject object=new JSONObject();
-            object.put("request",request);
-            object.put("rankResult",rankResult.get(0));
+            object.put("mid",request.getMid());
+            object.put("adid",rankResult.get(0).getAdId());
+            object.put("type",rankResult.get(0).getScore_type());
+            object.put("pctr",rankResult.get(0).getCtr());
+            object.put("pcvr",rankResult.get(0).getCvr());
+            object.put("lrsamples",rankResult.get(0).getLrSampleString());
             object.put("dataTime",currentTime.format(timeFormatter));
             log.info("svc=adItemRank {}", JSONObject.toJSONString(object));
             return rankResult.get(0);
@@ -164,8 +168,11 @@ public class RankServiceImpl implements RankService {
             result.setEcpm2(rankResult.get(1).getEcpm1());
         }
         JSONObject object=new JSONObject();
-        object.put("request",request);
-        object.put("rankResult",result);
+        object.put("mid",request.getMid());
+        object.put("adid",result.getCreativeId());
+        object.put("type",topItem.getScore_type());
+        object.put("pctr",topItem.getCtr());
+        object.put("pcvr",topItem.getCvr());
         object.put("lrsamples",topItem.getLrSampleString());
         object.put("dataTime",currentTime.format(timeFormatter));
         log.info("svc=adBidRank {}", JSONObject.toJSONString(object));