Merge branch 'pre-master' into test

# Conflicts:
#	ad-engine-server/src/main/resources/application.yml

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

@@ -76,6 +76,7 @@ mybatis:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
 
 datalog: /datalog
+#datalog: /Users/gufengshou/Documents/yiqi_project
 
 logging:
   file:
@@ -90,6 +91,8 @@ aliyun:
       request: request-log
       info: info-log
       error: error-log
+      landingTypeFilter: landingpagetype-filter-error-log
+      adPackageData: ad-package-data
     topic:
     threadpool:
       corePoolSize: 100

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/AddThresholdPredictModel.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
 
 import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
+import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.calculator.ThresholdPredictCalculator;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import com.tzld.piaoquan.ad.engine.service.predict.param.RuleParamHelper;
@@ -20,7 +21,7 @@ public class AddThresholdPredictModel extends ThresholdPredictModel {
     RuleParamHelper paramHelper;
 
     @Autowired
-    AdOwnRedisHelper redisHelper;
+    AlgorithmRedisHelper redisHelper;
 
     /**
      * setModelName

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/BasicThresholdPredictModel.java

@@ -3,6 +3,7 @@ package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
+import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.calculator.ThresholdPredictCalculator;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import com.tzld.piaoquan.ad.engine.service.predict.param.RuleParamHelper;
@@ -20,7 +21,7 @@ public class BasicThresholdPredictModel extends ThresholdPredictModel{
     RuleParamHelper paramHelper;
 
     @Autowired
-    AdOwnRedisHelper redisHelper;
+    AlgorithmRedisHelper redisHelper;
     @Override
     String initName() {
         return "basic";

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/MultiplyThresholdPredictModel.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
 import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
+import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.calculator.ThresholdPredictCalculator;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import com.tzld.piaoquan.ad.engine.service.predict.param.RuleParamHelper;
@@ -19,7 +20,7 @@ public class MultiplyThresholdPredictModel  extends ThresholdPredictModel{
     RuleParamHelper paramHelper;
 
     @Autowired
-    AdOwnRedisHelper redisHelper;
+    AlgorithmRedisHelper redisHelper;
     /**
      * setModelName
      */

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/RoiThresholdPredictModel.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
 import com.tzld.piaoquan.ad.engine.commons.enums.AppTypeEnum;
 import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
+import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.config.RoiModelConfig;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import com.tzld.piaoquan.ad.engine.service.predict.containner.RoiPredictParamContainer;
@@ -23,7 +24,7 @@ public class RoiThresholdPredictModel extends ThresholdPredictModel{
     RuleParamHelper paramHelper;
 
     @Autowired
-    AdOwnRedisHelper redisHelper;
+    AlgorithmRedisHelper redisHelper;
 
     @Override
     String initName() {

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/ScoreThresholdPredictModel.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
 import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
+import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.config.AdOutV1OnlineWeightConfig;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import com.tzld.piaoquan.ad.engine.service.predict.containner.ThresholdModelContainer;
@@ -17,7 +18,7 @@ public class ScoreThresholdPredictModel extends ThresholdPredictModel{
     RuleParamHelper paramHelper;
 
     @Autowired
-    AdOwnRedisHelper redisHelper;
+    AlgorithmRedisHelper redisHelper;
 
     @Override
     String initName() {