切分环境

data/env-dev-sj.yml

@@ -1,7 +1,10 @@
+profile:
+  activate: sj_dev
+
 winhc:
   mysql:
     driverClassName: com.mysql.jdbc.Driver
-    jdbcUrl: jdbc:mysql://39.152.30.112:5306/winhc?characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&useServerPrepStmts=true&cachePrepStmts=true
+    jdbcUrl: jdbc:mysql://127.0.0.1:5306/winhc?characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&useServerPrepStmts=true&cachePrepStmts=true
     username: winhc
     password: winhc123
 

data/env-dev.yml

@@ -1,3 +1,6 @@
+profile:
+  activate: winhc_dev
+
 winhc:
   mysql:
     driverClassName: com.mysql.jdbc.Driver
@@ -7,4 +10,5 @@ winhc:
 
   task:
     numThread: 6
-    batchSize: 500
+    batchSize: 500
+

data/env-prod.yml

@@ -1,3 +1,6 @@
+profile:
+  activate: winhc_prod
+
 winhc:
   mysql:
     driverClassName: com.mysql.jdbc.Driver

src/main/java/com/winhc/data/DataPull.java

@@ -14,6 +14,7 @@ import com.winhc.data.task.BaseTask;
 import com.winhc.data.task.SinkTask;
 import com.winhc.data.task.DownLoadTask;
 import com.winhc.data.utils.*;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,15 +47,18 @@ public class DataPull {
         if (params.containsKey("docker.start")) {
             confPath = "/config.yml";
         } else {
-            Assert.isTrue(params.containsKey("conf"), "请输入配置文件路径\t:\t--conf conf_path");
+            Assert.isTrue(params.containsKey("conf"), "请输入配置文件路径\t:\t--conf conf_path\n");
             confPath = params.get("conf");
         }
 
-        Assert.isTrue(FileUtils.fileExists(confPath), "配置文件不存在\t:\t检查conf路径是否正确");
+        Assert.isTrue(FileUtils.fileExists(confPath), "配置文件不存在\t:\t检查conf路径是否正确\n");
         Map<String, String> confMap = new HashMap<>();
-        Assert.isTrue(getYmlByFileNameOut(confPath, confMap), "conf解析异常\t:\t配置文件必须yml格式");
+        Assert.isTrue(getYmlByFileNameOut(confPath, confMap), "conf解析异常\t:\t配置文件必须yml格式\n");
         //merge params
         initAllConf(args, confMap);
+        String env = EnvConst.getValue("profile.activate");
+        logger.info("profile.activate: {}", env);
+        Assert.isTrue(StringUtils.isNotBlank(env), "请输入环境配置egg:\nprofile:\n  activate: sj\n");
 
         int queueSize = 100000;
         int numThread = Integer.parseInt(EnvConst.getValue("winhc.task.numThread", "8"));

src/main/java/com/winhc/data/utils/Common.java

@@ -14,7 +14,7 @@ public class Common {
             "VALUES (@ds , now() , now(), @status)\n" +
             "ON DUPLICATE KEY UPDATE update_time = VALUES(update_time), status = VALUES(status)";
 
-    public static final String STATUS_PRE = "data/sj/status/";
+    public static final String STATUS_PRE = "data/sj/status/" + EnvConst.getValue("profile.activate") + "/";
     public static final String FILE_PRE = "data/sj/file/";
     public static final String STATUS_SUCCESS_SUFFIX = ".success";
     public static final String STATUS_UPLOAD_SUFFIX = ".upload";

src/main/java/com/winhc/data/utils/OssUtils.java

@@ -112,16 +112,13 @@ public class OssUtils {
         String yesTask = getYesterday();
         //昨天数据已处理->pass
         if (lastTask == Long.parseLong(getYesterday())) return new ArrayList<>();
-        List<String> tasks = upload_task.stream()
-                .filter(x -> !success_task.contains(x) && Long.parseLong(x) > lastTask)
-                .distinct()
-                .collect(Collectors.toList());
         //昨天任务
         /*if (!tasks.contains(yesTask)) {
             tasks.add(yesTask);
         }*/
-        tasks.sort(Comparator.comparing(String::toString));
-        return tasks;
+        return upload_task.stream()
+                .filter(x -> !success_task.contains(x) && Long.parseLong(x) > lastTask)
+                .distinct().sorted(Comparator.comparing(String::toString)).collect(Collectors.toList());
     }
 
     public static void main(String[] args) {