Merge branch 'refs/heads/dev-xym-checkout-model' into pre-master

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/PAIModelV2.java

@@ -34,8 +34,8 @@ public class PAIModelV2 {
         model = new PAIModelV2();
         client = new PredictClient(new HttpConfig());
         client.setEndpoint("1894469520484605.vpc.cn-hangzhou.pai-eas.aliyuncs.com");
-        client.setToken("ZTZiMWY2ZWJmN2M1NmZkYjZkMDA2ZjkzM2Q2ODNlOTc1YWIwODA0OQ==");
-        client.setModelName("ad_rank_dnn_v11_easyrec_prod");
+        client.setToken("M2Y0ZGJlOGRiNDJiYmJlM2E2MGRiNzk4NTdhN2MxOWUzYWMxNzdjYg==");
+        client.setModelName("ad_rank_dnn_v11_easyrec_v2");
     }
 
     private static final String[] sparseUserStrFeatures = {

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy683.java

@@ -367,7 +367,7 @@ public class RankStrategyBy683 extends RankStrategyBasic {
                 top1Item.getExt().put("ecpm", modelCtcvrScore * top1Item.getCpa() * 1000);
             }
             putMetaFeature(top1Item, feature, reqFeature, sceneFeatureMap, request);
-            top1Item.getExt().put("model", "dnn");
+            top1Item.getExt().put("model", "dnn_v2");
         }
         long time6 = System.currentTimeMillis();
         log.info("cost={}, getFeature={}, handleFeature={},  similar={}, bucketFeature={}, getScorerPipeline={}, " +