丁云鹏 6 月之前
父節點
當前提交
266724ab47

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.util.Properties;
 
-@Component
+@Component("sparkConfig")
 public class SparkConfig {
 
     @PostConstruct

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

@@ -1,10 +1,11 @@
 package com.tzld.piaoquan.ad.engine.commons.util;
 
 import org.springframework.context.EnvironmentAware;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-@Component
+@Component("propertiesUtil")
 public class PropertiesUtil implements EnvironmentAware {
 
 

+ 1 - 1
ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/util/SimilarityUtils.java

@@ -30,7 +30,7 @@ public final class SimilarityUtils {
             scheduler.scheduleAtFixedRate(() -> {
                 try {
                     long start = System.currentTimeMillis();
-                    String endpoint = PropertiesUtil.getString("oss.adplatform.internal.endpoint");
+                    String endpoint = PropertiesUtil.getString("oss.endpoint");
                     String bucketName = "art-recommend";
                     String path = "similarity/word2vec/Google_word2vec_zhwiki210720_300d.bin";
                     String accessKeyId = "LTAIP6x1l3DXfSxm";

+ 4 - 1
ad-engine-server/src/main/java/com/tzld/piaoquan/ad/engine/server/WarmupService.java

@@ -1,7 +1,9 @@
 package com.tzld.piaoquan.ad.engine.server;
 
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils;
+import com.tzld.piaoquan.ad.engine.commons.util.PropertiesUtil;
 import com.tzld.piaoquan.ad.engine.commons.util.SimilarityUtils;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -10,10 +12,11 @@ import javax.annotation.PostConstruct;
  * @author dyp
  */
 @Component
+@DependsOn({"propertiesUtil", "sparkConfig"})
 public class WarmupService {
 
     @PostConstruct
-    public void init(){
+    public void warmup() {
         ScorerUtils.warmUp();
         SimilarityUtils.init();
     }

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

@@ -4,7 +4,7 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://127.0.0.1:7000/eureka/
+      defaultZone: http://deveureka-internal.piaoquantv.com/eureka/
 
 datalog: .