Bladeren bron

特征生产

丁云鹏 11 maanden geleden
bovenliggende
commit
d48ff8c5b4

+ 6 - 0
recommend-feature-produce/pom.xml

@@ -55,6 +55,12 @@
             <artifactId>apollo-client</artifactId>
             <version>1.8.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

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

@@ -1,11 +1,11 @@
 package com.tzld.piaoquan.recommend.feature.produce;
 
-import com.tzld.piaoquan.recommend.feature.produce.service.ODPSService;
-import com.tzld.piaoquan.recommend.feature.produce.service.RedisService;
-import com.tzld.piaoquan.recommend.feature.produce.util.JSONUtils;
 import com.tzld.piaoquan.recommend.feature.produce.model.DTSConfig;
 import com.tzld.piaoquan.recommend.feature.produce.service.CMDService;
 import com.tzld.piaoquan.recommend.feature.produce.service.DTSConfigService;
+import com.tzld.piaoquan.recommend.feature.produce.service.ODPSService;
+import com.tzld.piaoquan.recommend.feature.produce.service.RedisService;
+import com.tzld.piaoquan.recommend.feature.produce.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -22,19 +22,21 @@ import java.util.Map;
  */
 @Slf4j
 public class ODPSToRedis {
-    private static ODPSService odpsService = new ODPSService();
-    private static RedisService redisService = new RedisService();
     private static CMDService cmdService = new CMDService();
-    private static DTSConfigService dtsConfigService = new DTSConfigService();
+    private static ODPSService odpsService = new ODPSService();
 
     public static void main(String[] args) {
 
+        log.info("args {}", JSONUtils.toJson(args));
+
         Map<String, String> argMap = cmdService.parse(args);
         if (MapUtils.isEmpty(argMap)) {
             log.error("args is empty");
             return;
         }
+        String env = argMap.get("env");
         // ODPS
+        DTSConfigService dtsConfigService = new DTSConfigService(env);
         DTSConfig config = dtsConfigService.getDTSConfig(argMap);
         if (config == null || !config.selfCheck()) {
             log.error("dts config error");
@@ -48,6 +50,7 @@ public class ODPSToRedis {
         }
 
         // RDD
+        RedisService redisService = new RedisService(env);
         SparkConf sparkConf = new SparkConf()
                 .setAppName("odps sync to redis");
         // .setMaster("local");

+ 2 - 4
recommend-feature-produce/src/main/java/com/tzld/piaoquan/recommend/feature/produce/service/DTSConfigService.java

@@ -1,12 +1,12 @@
 package com.tzld.piaoquan.recommend.feature.produce.service;
 
-import com.aliyun.core.utils.StringUtils;
 import com.ctrip.framework.apollo.ConfigService;
 import com.google.common.reflect.TypeToken;
 import com.tzld.piaoquan.recommend.feature.produce.model.DTSConfig;
 import com.tzld.piaoquan.recommend.feature.produce.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collections;
 import java.util.List;
@@ -21,7 +21,7 @@ import java.util.Optional;
 @Slf4j
 public class DTSConfigService {
 
-    public void init(String env) {
+    public DTSConfigService(String env) {
         System.setProperty("app.id", "recommend-feature");
 
         if (StringUtils.equals(env, "prod")) {
@@ -33,8 +33,6 @@ public class DTSConfigService {
 
     public DTSConfig getDTSConfig(Map<String, String> argMap) {
 
-        init(argMap.get("env"));
-
         List<DTSConfig> dtsConfigs = JSONUtils.fromJson(
                 ConfigService.getAppConfig().getProperty("dts.config.v2", ""),
                 new TypeToken<List<DTSConfig>>() {

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

@@ -19,8 +19,18 @@ import java.util.concurrent.TimeUnit;
  */
 public class RedisService {
     private int port = 6379;
-    private String password = "Wqsd@2019";
-    private String hostName = "r-bp1wwqqkjqwwkxgbup.redis.rds.aliyuncs.com";
+    private String password = "";
+    private String hostName = "";
+
+    public RedisService(String env) {
+        if (StringUtils.equals(env, "prod")) {
+            password = "Wqsd@2019";
+            hostName = "r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com";
+        } else {
+            password = "Wqsd@2019";
+            hostName = "r-bp1wwqqkjqwwkxgbup.redis.rds.aliyuncs.com";
+        }
+    }
 
     private void mSetEx(Iterator<Pair<String, String>> keyValues, long expire, TimeUnit timeUnit) {
         Jedis jedis = new Jedis(hostName, port);