Merge branch 'refs/heads/dev-xym-cold-dnn' into pre-master

# Conflicts:
#	ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/helper/DnnCidDataHelper.java

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/helper/DnnCidDataHelper.java

@@ -7,6 +7,7 @@ import com.aliyun.oss.model.ListObjectsRequest;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.OSSObjectSummary;
 import com.aliyun.oss.model.ObjectListing;
+import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -33,9 +34,9 @@ public class DnnCidDataHelper {
 
     private static final String BUCKET_NAME = "art-recommend";
 
-    private final String modelVersionPath = "fengzhoutian/pai_model_trained_cids/model_version.json";
+    private static final String modelVersionPath = "fengzhoutian/pai_model_trained_cids/model_version.json";
 
-    private final String cidPath = "fengzhoutian/pai_model_trained_cids/";
+    private static final String cidPath = "fengzhoutian/pai_model_trained_cids/";
 
 
     // 提供获取CID集合的方法