Merge branch 'dev-xym-add-PAI' into pre-master

# Conflicts:
#	ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/scorer/PAIScorer.java

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/scorer/PAIScorer.java

@@ -7,6 +7,7 @@ import com.tzld.piaoquan.ad.engine.commons.score.BaseXGBoostModelScorer;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerConfigInfo;
 import com.tzld.piaoquan.ad.engine.commons.score.model.PAIModel;
+import com.tzld.piaoquan.ad.engine.commons.score.model.PAIModelV1;
 import com.tzld.piaoquan.ad.engine.commons.score.model.XGBoostModel683;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.UserAdFeature;
@@ -57,9 +58,8 @@ public class PAIScorer extends AbstractScorer {
     private List<AdRankItem> rankByJava(final Map<String, String> sceneFeatureMap,
                                         final Map<String, String> userFeatureMap,
                                         final List<AdRankItem> items) {
-        LOGGER.info("PAIScorer rankByJava");
         long startTime = System.currentTimeMillis();
-        PAIModel model = PAIModel.getModel();
+        PAIModelV1 model = PAIModelV1.getModel();
         // 所有都参与打分，按照ctr排序
         multipleCtrScore(items, userFeatureMap, sceneFeatureMap, model);
 
@@ -81,8 +81,8 @@ public class PAIScorer extends AbstractScorer {
     private void multipleCtrScore(final List<AdRankItem> items,
                                   final Map<String, String> userFeatureMap,
                                   final Map<String, String> sceneFeatureMap,
-                                  final PAIModel model) {
-        LOGGER.info("PAIScorer multipleCtrScore");
+                                  final PAIModelV1 model) {
+
         List<Float> score = model.score(items, userFeatureMap, sceneFeatureMap);
         LOGGER.info("PAIScorer score={}", score);
         for (int i = 0; i < items.size(); i++) {