Merge branch 'feature_20241105_zhaohaipeng_model_score_calibration' into pre-master

ad-engine-server/src/main/resources/ad_score_config_xgboost_20240909.conf

@@ -4,10 +4,5 @@ scorer-config = {
     scorer-priority = 99
     model-path = "zhangbo/model_xgb_351_1000_v2.tar.gz"
   }
-  calibration-score-config = {
-    scorer-name = "com.tzld.piaoquan.ad.engine.service.score.scorer.ScoreCalibrationScorer"
-    scorer-priority = 98
-    model-path = "zhangbo/model_xgb_351_1000_v2_calibration.txt"
-  }
 
 }

ad-engine-server/src/main/resources/ad_score_config_xgboost_20241105.conf

@@ -1,8 +1,13 @@
 scorer-config = {
-  lr-rov-score-config = {
+  xgb-score-config = {
     scorer-name = "com.tzld.piaoquan.ad.engine.service.score.scorer.XGBoostScorer683"
     scorer-priority = 99
     model-path = "zhangbo/model_xgb_351_1000_v2.tar.gz"
   }
+  calibration-score-config = {
+    scorer-name = "com.tzld.piaoquan.ad.engine.service.score.scorer.ScoreCalibrationScorer"
+    scorer-priority = 98
+    model-path = "zhangbo/model_xgb_351_1000_v2_calibration.txt"
+  }
 
-}
+}

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

@@ -142,6 +142,6 @@ public class ScoreCalibrationScorer extends AbstractScorer {
             LOGGER.error("[score calibration] calcScore error: ", e);
         }
 
-        return 0;
+        return newCtcvrScore;
     }
 }