0.6.2

DataLinkDC · Apr 17, 2022 · 2919ff6 · 2919ff6
2 parents 2ac58ab + bf048af
commit 2919ff6
Show file tree

Hide file tree

Showing 56 changed files with 168 additions and 63 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -95,7 +95,9 @@ body:
         Which version of Dinky are you running? We only accept bugs report from the LTS projects.
       options:
         - dev
-        - 0.6.1-SNAPSHOT
+        - 0.6.3-SNAPSHOT
+        - 0.6.2
+        - 0.6.1
         - 0.6.0
         - 0.5.1
         - 0.5.0

diff --git a/dlink-admin/pom.xml b/dlink-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-admin/src/main/java/com/dlink/model/Task.java b/dlink-admin/src/main/java/com/dlink/model/Task.java
@@ -8,13 +8,15 @@
 import com.dlink.job.JobConfig;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 任务
@@ -102,10 +104,12 @@ public JobConfig buildSubmitConfig() {
         }
         Map<String, String> map = new HashMap<>();
         for (Map<String, String> item : config) {
-            map.put(item.get("key"), item.get("value"));
+            if (Asserts.isNotNull(item)) {
+                map.put(item.get("key"), item.get("value"));
+            }
         }
         return new JobConfig(type, step, false, false, useRemote, clusterId, clusterConfigurationId, jarId, getId(),
-                alias, fragment, statementSet, batchModel, checkPoint, parallelism, savePointStrategy, savePointPath, map);
+            alias, fragment, statementSet, batchModel, checkPoint, parallelism, savePointStrategy, savePointPath, map);
     }
 
 }
diff --git a/dlink-alert/dlink-alert-base/pom.xml b/dlink-alert/dlink-alert-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-alert</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-alert/dlink-alert-dingtalk/pom.xml b/dlink-alert/dlink-alert-dingtalk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-alert</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-alert/dlink-alert-email/pom.xml b/dlink-alert/dlink-alert-email/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-alert</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dlink-alert-email</artifactId>

diff --git a/dlink-alert/dlink-alert-feishu/pom.xml b/dlink-alert/dlink-alert-feishu/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-alert</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dlink-alert-feishu</artifactId>

diff --git a/dlink-alert/dlink-alert-wechat/pom.xml b/dlink-alert/dlink-alert-wechat/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-alert</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-alert/pom.xml b/dlink-alert/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/dlink-app-1.11/pom.xml b/dlink-app/dlink-app-1.11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/dlink-app-1.12/pom.xml b/dlink-app/dlink-app-1.12/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/dlink-app-1.13/pom.xml b/dlink-app/dlink-app-1.13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/dlink-app-1.14/pom.xml b/dlink-app/dlink-app-1.14/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/dlink-app-base/pom.xml b/dlink-app/dlink-app-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-app</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-app/pom.xml b/dlink-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-assembly/pom.xml b/dlink-assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-1.11/pom.xml b/dlink-client/dlink-client-1.11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-1.12/pom.xml b/dlink-client/dlink-client-1.12/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-1.13/pom.xml b/dlink-client/dlink-client-1.13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-1.14/pom.xml b/dlink-client/dlink-client-1.14/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-base/pom.xml b/dlink-client/dlink-client-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/dlink-client-hadoop/pom.xml b/dlink-client/dlink-client-hadoop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-client/pom.xml b/dlink-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/dlink-common/pom.xml b/dlink-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java b/dlink-common/src/main/java/com/dlink/constant/CommonConstant.java
@@ -10,7 +10,7 @@ public interface CommonConstant {
     /**
      * 项目版本号(banner使用)
      */
-    String PROJECT_VERSION = "0.6.2-SNAPSHOT";
+    String PROJECT_VERSION = "0.6.2";
     /**
      * 实例健康
      */

diff --git a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml b/dlink-connectors/dlink-connector-jdbc-1.14/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-connectors/pom.xml b/dlink-connectors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/dlink-core/pom.xml b/dlink-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/dlink-core/src/main/java/com/dlink/job/JobConfig.java b/dlink-core/src/main/java/com/dlink/job/JobConfig.java
@@ -5,6 +5,7 @@
 import com.dlink.gateway.GatewayType;
 import com.dlink.gateway.config.*;
 import com.dlink.session.SessionConfig;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -164,12 +165,12 @@ public void buildGatewayConfig(Map<String, Object> config) {
         gatewayConfig = new GatewayConfig();
         if (config.containsKey("hadoopConfigPath")) {
             gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
-                    config.get("flinkLibPath").toString(),
-                    config.get("hadoopConfigPath").toString()));
+                config.get("flinkLibPath").toString(),
+                config.get("hadoopConfigPath").toString()));
         } else {
             gatewayConfig.setClusterConfig(ClusterConfig.build(config.get("flinkConfigPath").toString(),
-                    config.get("flinkLibPath").toString(),
-                    ""));
+                config.get("flinkLibPath").toString(),
+                ""));
         }
         AppConfig appConfig = new AppConfig();
         if (config.containsKey("userJarPath") && Asserts.isNotNullString((String) config.get("userJarPath"))) {
@@ -204,7 +205,9 @@ public void addGatewayConfig(List<Map<String, String>> configList) {
             gatewayConfig = new GatewayConfig();
         }
         for (Map<String, String> item : configList) {
-            gatewayConfig.getFlinkConfig().getConfiguration().put(item.get("key"), item.get("value"));
+            if (Asserts.isNotNull(item)) {
+                gatewayConfig.getFlinkConfig().getConfiguration().put(item.get("key"), item.get("value"));
+            }
         }
     }
 

diff --git a/dlink-daemon/pom.xml b/dlink-daemon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dlink-doc/sql/dlink.sql b/dlink-doc/sql/dlink.sql
@@ -69,7 +69,7 @@ CREATE TABLE `dlink_cluster_configuration`  (
                                                 `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
                                                 `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
                                                 `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON',
-                                                `is_available` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否可用',
+                                                `is_available` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否可用',
                                                 `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
                                                 `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
                                                 `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
@@ -454,8 +454,8 @@ CREATE TABLE `dlink_task`  (
                                `save_point_strategy` int(1) UNSIGNED ZEROFILL NULL DEFAULT NULL COMMENT 'SavePoint策略',
                                `save_point_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'SavePointPath',
                                `parallelism` int(4) NULL DEFAULT NULL COMMENT 'parallelism',
-                               `fragment` tinyint(1) NULL DEFAULT NULL COMMENT 'fragment',
-                               `statement_set` tinyint(1) NULL DEFAULT NULL COMMENT '启用语句集',
+                               `fragment` tinyint(1) NULL DEFAULT 0 COMMENT 'fragment',
+                               `statement_set` tinyint(1) NULL DEFAULT 0 COMMENT '启用语句集',
                                `batch_model` tinyint(1) NULL DEFAULT 0 COMMENT '使用批模式',
                                `cluster_id` int(11) NULL DEFAULT NULL COMMENT 'Flink集群ID',
                                `cluster_configuration_id` int(11) NULL DEFAULT NULL COMMENT '集群配置ID',

diff --git a/dlink-doc/sql/dlink_history.sql b/dlink-doc/sql/dlink_history.sql
@@ -668,3 +668,8 @@ ALTER TABLE `dlink_job_instance`
 CREATE INDEX dlink_job_instance_task_id_IDX USING BTREE ON dlink_job_instance (task_id);
 
 SET FOREIGN_KEY_CHECKS = 1;
+-- 0.6.2-SNAPSHOT 2022-04-17
+-- ----------------------------
+alter table dlink_task alter column fragment set default 0;
+alter table dlink_task alter column statement_set set default 0;
+alter table dlink_cluster_configuration modify column is_available  tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否可用';
diff --git a/dlink-executor/pom.xml b/dlink-executor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.6.2-SNAPSHOT</version>
+        <version>0.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>