丁云鹏 8 tháng trước cách đây
mục cha
commit
88986791dc

+ 23 - 0
ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/config/SparkConfig.java

@@ -0,0 +1,23 @@
+package com.tzld.piaoquan.ad.engine.commons.config;
+
+import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.Properties;
+
+@Component
+public class SparkConfig {
+
+    @PostConstruct
+    public void init() {
+        SparkConf sparkConf = new SparkConf()
+                .setMaster("local")
+                .setAppName("XGBoostPredict");
+        JavaSparkContext jsc = new JavaSparkContext(sparkConf);
+    }
+
+}

+ 1 - 1
ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/Model.java

@@ -10,7 +10,7 @@ public abstract class Model {
     public abstract boolean loadFromStream(InputStreamReader in) throws Exception;
 
     public boolean loadFromStream(InputStream is) throws Exception {
-        throw new NoSuchMethodException();
+        return loadFromStream(new InputStreamReader(is));
     }
 }
 

+ 1 - 1
ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/ModelManager.java

@@ -195,7 +195,7 @@ public class ModelManager {
                 log.info("model file [{}] changed, ready to update, last modify: [{}]", loadTask.path, loadTask.lastModifyTime);
 
                 Model model = loadTask.modelClass.newInstance();
-                if (model.loadFromStream(new InputStreamReader(ossObj.getObjectContent()))) {
+                if (model.loadFromStream(ossObj.getObjectContent())) {
                     loadTask.model = model;
                     loadTask.lastModifyTime = timeStamp;
                 }

+ 2 - 0
ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/util/PropertiesUtil.java

@@ -2,7 +2,9 @@ package com.tzld.piaoquan.ad.engine.commons.util;
 
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
 
+@Component
 public class PropertiesUtil implements EnvironmentAware {
 
 

+ 2 - 2
ad-engine-server/src/main/resources/application-dev.yml

@@ -27,8 +27,8 @@ spring:
       #password: wx2023_adP@assword1234
 
   redis-algorithm:
-#    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
-    hostName: r-bp1fogs2mflr1ybfot.redis.rds.aliyuncs.com
+    hostName: r-bp1ps6my7lzg8rdhwx682.redis.rds.aliyuncs.com
+    #hostName: r-bp1fogs2mflr1ybfot.redis.rds.aliyuncs.com
     port: 6379
     password: Wqsd@2019
     timeout: 1000