zhaohaipeng 1 месяц назад
Родитель
Сommit
cb3bf2d5ec

+ 19 - 0
recommend-feature-common/src/main/java/com/tzld/piaoquan/recommend/feature/common/enums/Env.java

@@ -0,0 +1,19 @@
+package com.tzld.piaoquan.recommend.feature.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum Env {
+
+    DEV("dev", "开发环境"),
+    PROD("prod", "正式环境"),
+    PROD_DISK("prod_disk", "磁盘存储-正式环境"),
+    ;
+    private final String env;
+    private final String desc;
+
+    Env(String env, String desc) {
+        this.env = env;
+        this.desc = desc;
+    }
+}

+ 6 - 0
recommend-feature-produce/src/main/java/com/tzld/piaoquan/recommend/feature/produce/ODPSToRedis.java

@@ -4,10 +4,13 @@ import com.tzld.piaoquan.recommend.feature.common.model.DTSConfig;
 import com.tzld.piaoquan.recommend.feature.produce.service.DTSConfigService;
 import com.tzld.piaoquan.recommend.feature.produce.service.RedisService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.api.java.JavaRDD;
 
 import java.util.Map;
 
+import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD_DISK;
+
 /**
  * @author dyp
  */
@@ -20,6 +23,9 @@ public class ODPSToRedis extends AbstractODPSSyncJob {
 
     @Override
     protected String appName(Map<String, String> argMap) {
+        if (StringUtils.equals(PROD_DISK.getEnv(), argMap.get("env"))) {
+            return "ODPSSyncToDiskStore : " + argMap.get("table");
+        }
         return "odps sync to redis : " + argMap.get("table");
     }
 

+ 5 - 2
recommend-feature-produce/src/main/java/com/tzld/piaoquan/recommend/feature/produce/service/RedisService.java

@@ -17,6 +17,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD_DISK;
+import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD;
+
 /**
  * https://help.aliyun.com/zh/maxcompute/user-guide/java-sdk-1/?spm=a2c4g.11174283.0.0.6d0111c1E15lI3
  *
@@ -29,10 +32,10 @@ public class RedisService implements Serializable {
     private String hostName = "";
 
     public RedisService(String env) {
-        if (StringUtils.equals(env, "prod")) {
+        if (StringUtils.equals(env, PROD.getEnv())) {
             password = "Wqsd@2019";
             hostName = "r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com";
-        } else if (StringUtils.equals(env, "prod_disk")) {
+        } else if (StringUtils.equals(env, PROD_DISK.getEnv())) {
             password = "Wqsd@2019";
             hostName = "r-bp1r5em55k87e2xb1k.tairpdb.rds.aliyuncs.com";
         } else {