From be09a1bd18ce668f3da990bfe9abd84941362340 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 13:18:16 +0800
Subject: [PATCH 01/87] Fix mybatis-plus empty value update problem

When deleting the alert-plugin instance, determine whether there is an alert group association
---
 .../dolphinscheduler/api/enums/Status.java    |  1 +
 .../impl/AlertPluginInstanceServiceImpl.java  | 22 +++++++++++++++++++
 .../dao/entity/AlertPluginInstance.java       |  3 ++-
 .../dao/mapper/AlertGroupMapper.java          |  6 +++++
 .../dao/mapper/AlertGroupMapper.xml           |  7 ++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index 04ef02303d..6605154e42 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -290,6 +290,7 @@ public enum Status {
     QUERY_ALL_ALERT_PLUGIN_INSTANCE_ERROR(110009, "query all alert plugin instance error", "查询所有告警实例失败"),
     PLUGIN_INSTANCE_ALREADY_EXIT(110010,"plugin instance already exit","该告警插件实例已存在"),
     LIST_PAGING_ALERT_PLUGIN_INSTANCE_ERROR(110011,"query plugin instance page error","分页查询告警实例失败"),
+    DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED(110012,"failed to delete the alert instance, there is an alarm group associated with this alert instance","删除告警实例失败，存在与此告警实例关联的警报组")
 
     ;
 
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index 8004a90fae..d48de39d6d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -27,13 +27,16 @@ import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +59,9 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
     @Autowired
     private PluginDefineMapper pluginDefineMapper;
 
+    @Autowired
+    private AlertGroupMapper alertGroupMapper;
+
     /**
      * creat alert plugin instance
      *
@@ -121,6 +127,12 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
     @Override
     public Map<String, Object> delete(User loginUser, int id) {
         Map<String, Object> result = new HashMap<>();
+        //check if there is an associated alert group
+        boolean hasAssociatedAlertGroup = checkHasAssociatedAlertGroup(String.valueOf(id));
+        if (hasAssociatedAlertGroup) {
+            putMsg(result, Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
+        }
+
         int i = alertPluginInstanceMapper.deleteById(id);
         if (i > 0) {
             putMsg(result, Status.SUCCESS);
@@ -205,4 +217,14 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
         return alertPluginInstanceVOS;
 
     }
+
+    private boolean checkHasAssociatedAlertGroup(String id) {
+        List<String> idsList = alertGroupMapper.queryInstanceIdsList();
+        if (CollectionUtils.isEmpty(idsList)) {
+            return false;
+        }
+        Optional<String> first = idsList.stream().filter(k -> Arrays.asList(k.split(",")).contains(id)).findFirst();
+        return first.isPresent();
+    }
+
 }
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java
index 5993697a56..202c06bf00 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertPluginInstance.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.dao.entity;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -39,7 +40,7 @@ public class AlertPluginInstance {
     /**
      * plugin_define_id
      */
-    @TableField("plugin_define_id")
+    @TableField(value = "plugin_define_id", updateStrategy = FieldStrategy.NEVER)
     private int pluginDefineId;
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java
index b206a787b6..ebfa5b42ec 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java
@@ -61,6 +61,12 @@ public interface AlertGroupMapper extends BaseMapper<AlertGroup> {
      */
     List<AlertGroup> queryAllGroupList();
 
+    /**
+     * query instance ids All
+     * @return list
+     */
+    List<String> queryInstanceIdsList();
+
     /**
      * queryAlertGroupInstanceIdsById
      * @param alertGroupId
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
index e60dedfd6c..90fd8a72a7 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.xml
@@ -52,6 +52,13 @@
         order by update_time desc
     </select>
 
+    <select id="queryInstanceIdsList" resultType="String">
+        select
+        alert_instance_ids
+        from t_ds_alertgroup
+        order by update_time desc
+    </select>
+
     <select id="queryAlertGroupInstanceIdsById" resultType="String">
         select alert_instance_ids  from t_ds_alertgroup
         where id = #{alertGroupId}

From b23696c388227f3ae87cc53e5c6b8f6d3d041bab Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 13:30:29 +0800
Subject: [PATCH 02/87] When the alert is executed, if the alarm group is not
 bound to the alert plug-in, the alert status is updated to fail.

---
 .../dolphinscheduler/alert/runner/AlertSender.java  | 13 +++++++------
 .../impl/AlertPluginInstanceServiceImpl.java        |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index d635574543..933b8855f9 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -75,13 +75,14 @@ public class AlertSender {
             List<AlertPluginInstance> alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId);
             if (CollectionUtils.isEmpty(alertInstanceList)) {
                 logger.error("send alert msg fail,no bind plugin instance.");
-                return;
+                alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, "no bind plugin instance", alert.getId());
+                continue;
             }
             AlertData alertData = new AlertData();
             alertData.setId(alert.getId())
-                .setContent(alert.getContent())
-                .setLog(alert.getLog())
-                .setTitle(alert.getTitle());
+                    .setContent(alert.getContent())
+                    .setLog(alert.getLog())
+                    .setTitle(alert.getTitle());
 
             for (AlertPluginInstance instance : alertInstanceList) {
 
@@ -107,7 +108,7 @@ public class AlertSender {
         List<AlertPluginInstance> alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId);
         AlertData alertData = new AlertData();
         alertData.setContent(title)
-            .setTitle(content);
+                .setTitle(content);
 
         boolean sendResponseStatus = true;
         List<AlertSendResponseResult> sendResponseResults = new ArrayList<>();
@@ -126,7 +127,7 @@ public class AlertSender {
         for (AlertPluginInstance instance : alertInstanceList) {
             AlertResult alertResult = this.alertResultHandler(instance, alertData);
             AlertSendResponseResult alertSendResponseResult = new AlertSendResponseResult(
-                Boolean.parseBoolean(String.valueOf(alertResult.getStatus())), alertResult.getMessage());
+                    Boolean.parseBoolean(String.valueOf(alertResult.getStatus())), alertResult.getMessage());
             sendResponseStatus = sendResponseStatus && alertSendResponseResult.getStatus();
             sendResponseResults.add(alertSendResponseResult);
         }
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index d48de39d6d..a77b3ae5f4 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -223,7 +223,7 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
         if (CollectionUtils.isEmpty(idsList)) {
             return false;
         }
-        Optional<String> first = idsList.stream().filter(k -> Arrays.asList(k.split(",")).contains(id)).findFirst();
+        Optional<String> first = idsList.stream().filter(k -> null != k && Arrays.asList(k.split(",")).contains(id)).findFirst();
         return first.isPresent();
     }
 

From 1f6634a8479e02a66b665ff32872f0e7aa7b5867 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 13:34:55 +0800
Subject: [PATCH 03/87] return result

---
 .../api/service/impl/AlertPluginInstanceServiceImpl.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index a77b3ae5f4..dede2c173a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -131,6 +131,7 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
         boolean hasAssociatedAlertGroup = checkHasAssociatedAlertGroup(String.valueOf(id));
         if (hasAssociatedAlertGroup) {
             putMsg(result, Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
+            return result;
         }
 
         int i = alertPluginInstanceMapper.deleteById(id);

From e9c0107faeb8fb2c23d989f114c6ede3c4ffa69e Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Tue, 26 Jan 2021 14:08:41 +0800
Subject: [PATCH 04/87] imp ui dag button tooltip.

---
 .../js/conf/home/pages/dag/_source/dag.vue    | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index a61d289d3d..492f41dd20 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -70,32 +70,38 @@
                :id="item.code"
                :key="$index"
                @click="_ckOperation(item,$event)">
-              <el-button type="text" class="operBtn" data-container="body" :icon="item.icon" v-tooltip.light="item.desc"></el-button>
+              <el-tooltip :content="item.desc" placement="top" :enterable="false">
+                <span><el-button type="text" class="operBtn" data-container="body" :icon="item.icon"></el-button></span>
+              </el-tooltip>
             </a>
           </div>
-          <el-button
-            type="primary"
-            v-tooltip.light="$t('Format DAG')"
-            icon="el-icon-caret-right"
-            size="mini"
-            data-container="body"
-            v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"
-            style="vertical-align: middle;"
-            @click="dagAutomaticLayout">
-          </el-button>
-          <span>
-            <el-button
-              v-tooltip.light="$t('Refresh DAG status')"
-              data-container="body"
-              style="vertical-align: middle;"
-              icon="el-icon-refresh"
-              type="primary"
-              :loading="isRefresh"
-              v-if="type === 'instance'"
-              @click="!isRefresh && _refresh()"
-              size="mini" >
-            </el-button>
-          </span>
+          <el-tooltip :content="$t('Format DAG')" placement="top" :enterable="false">
+            <span>
+              <el-button
+                type="primary"
+                icon="el-icon-caret-right"
+                size="mini"
+                data-container="body"
+                v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"
+                style="vertical-align: middle;"
+                @click="dagAutomaticLayout">
+              </el-button>
+            </span>
+          </el-tooltip>
+          <el-tooltip :content="$t('Refresh DAG status')" placement="top" :enterable="false">
+            <span>
+              <el-button
+                data-container="body"
+                style="vertical-align: middle;"
+                icon="el-icon-refresh"
+                type="primary"
+                :loading="isRefresh"
+                v-if="type === 'instance'"
+                @click="!isRefresh && _refresh()"
+                size="mini" >
+              </el-button>
+            </span>
+          </el-tooltip>
           <el-button
                   v-if="isRtTasks"
                   style="vertical-align: middle;"
@@ -108,7 +114,6 @@
           <span>
             <el-button
               type="primary"
-              v-tooltip.light="$t('Close')"
               icon="el-icon-switch-button"
               size="mini"
               data-container="body"

From 4e2e055e7025b77f3eea23bccd4a27169c2dcf86 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 14:41:17 +0800
Subject: [PATCH 05/87] add ut

---
 .../AlertPluginInstanceServiceTest.java       | 99 +++++++++++++++++++
 pom.xml                                       |  1 +
 2 files changed, 100 insertions(+)
 create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
new file mode 100644
index 0000000000..1801794556
--- /dev/null
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.service;
+
+import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.service.impl.AlertPluginInstanceServiceImpl;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
+import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
+import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AlertPluginInstanceServiceTest {
+
+    @InjectMocks
+    AlertPluginInstanceServiceImpl alertPluginInstanceService;
+
+    @Mock
+    private AlertPluginInstanceMapper alertPluginInstanceMapper;
+
+    @Mock
+    private PluginDefineMapper pluginDefineMapper;
+
+    @Mock
+    private AlertGroupMapper alertGroupMapper;
+
+    private List<AlertPluginInstance> alertPluginInstances;
+
+    private User user;
+
+    @Before
+    public void before() {
+        user = new User();
+        user.setUserType(UserType.ADMIN_USER);
+        user.setId(1);
+        AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
+        alertPluginInstance.setPluginInstanceParams("test1");
+        alertPluginInstance.setPluginDefineId(1);
+        alertPluginInstance.setId(1);
+        alertPluginInstance.setPluginInstanceParams("test");
+        alertPluginInstances = new ArrayList<>();
+        alertPluginInstances.add(alertPluginInstance);
+    }
+
+    @Test
+    public void testCreate() {
+        Mockito.when(alertPluginInstanceMapper.queryByInstanceName("test")).thenReturn(alertPluginInstances);
+        Map<String, Object> result = alertPluginInstanceService.create(user, 1, "test", "test params");
+        Assert.assertEquals(result.get(Constants.STATUS), Status.PLUGIN_INSTANCE_ALREADY_EXIT);
+        Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
+        result = alertPluginInstanceService.create(user, 1, "test1", "test params");
+        Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
+    }
+
+    @Test
+   public void testDelete() {
+        List<String> ids = Arrays.asList("11,2,3",null,"98,1");
+        Mockito.when(alertGroupMapper.queryInstanceIdsList()).thenReturn(ids);
+        Map<String, Object> result= alertPluginInstanceService.delete(user, 1);
+        Assert.assertEquals(result.get(Constants.STATUS), Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
+        Mockito.when(alertPluginInstanceMapper.deleteById(9)).thenReturn(1);
+        result= alertPluginInstanceService.delete(user, 9);
+        Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
+
+    }
+
+}
diff --git a/pom.xml b/pom.xml
index 35ffa58274..214138d9c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -787,6 +787,7 @@
                         <include>**/api/service/BaseDAGServiceTest.java</include>
                         <include>**/api/service/BaseServiceTest.java</include>
                         <include>**/api/service/DataAnalysisServiceTest.java</include>
+                        <include>**/api/service/AlertPluginInstanceServiceTest.java</include>
                         <include>**/api/service/DataSourceServiceTest.java</include>
                         <include>**/api/service/ExecutorService2Test.java</include>
                         <include>**/api/service/ExecutorServiceTest.java</include>

From 1622dde5db4c67932c2510d56d37562d4a5b47a8 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 14:42:36 +0800
Subject: [PATCH 06/87] add ut

---
 .../api/service/AlertPluginInstanceServiceTest.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 1801794556..09deed03b5 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -85,13 +85,13 @@ public class AlertPluginInstanceServiceTest {
     }
 
     @Test
-   public void testDelete() {
-        List<String> ids = Arrays.asList("11,2,3",null,"98,1");
+    public void testDelete() {
+        List<String> ids = Arrays.asList("11,2,3", null, "98,1");
         Mockito.when(alertGroupMapper.queryInstanceIdsList()).thenReturn(ids);
-        Map<String, Object> result= alertPluginInstanceService.delete(user, 1);
+        Map<String, Object> result = alertPluginInstanceService.delete(user, 1);
         Assert.assertEquals(result.get(Constants.STATUS), Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
         Mockito.when(alertPluginInstanceMapper.deleteById(9)).thenReturn(1);
-        result= alertPluginInstanceService.delete(user, 9);
+        result = alertPluginInstanceService.delete(user, 9);
         Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
 
     }

From 47fcac5afd1cb59f3dd9e6cd6f632c997c5e4cee Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 15:02:26 +0800
Subject: [PATCH 07/87] code smell

---
 .../api/service/AlertPluginInstanceServiceTest.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 09deed03b5..049916f4ff 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -78,7 +78,7 @@ public class AlertPluginInstanceServiceTest {
     public void testCreate() {
         Mockito.when(alertPluginInstanceMapper.queryByInstanceName("test")).thenReturn(alertPluginInstances);
         Map<String, Object> result = alertPluginInstanceService.create(user, 1, "test", "test params");
-        Assert.assertEquals(result.get(Constants.STATUS), Status.PLUGIN_INSTANCE_ALREADY_EXIT);
+        Assert.assertEquals(Status.PLUGIN_INSTANCE_ALREADY_EXIT, result.get(Constants.STATUS));
         Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
         result = alertPluginInstanceService.create(user, 1, "test1", "test params");
         Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
@@ -89,10 +89,10 @@ public class AlertPluginInstanceServiceTest {
         List<String> ids = Arrays.asList("11,2,3", null, "98,1");
         Mockito.when(alertGroupMapper.queryInstanceIdsList()).thenReturn(ids);
         Map<String, Object> result = alertPluginInstanceService.delete(user, 1);
-        Assert.assertEquals(result.get(Constants.STATUS), Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
+        Assert.assertEquals(Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED, result.get(Constants.STATUS));
         Mockito.when(alertPluginInstanceMapper.deleteById(9)).thenReturn(1);
         result = alertPluginInstanceService.delete(user, 9);
-        Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
+        Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
 
     }
 

From cd37dd8c49855cd0b70890184a0aed1f351f4e8f Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Tue, 26 Jan 2021 15:38:20 +0800
Subject: [PATCH 08/87] code smell

---
 .../api/service/AlertPluginInstanceServiceTest.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 049916f4ff..7d25fb5e6a 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -81,7 +81,7 @@ public class AlertPluginInstanceServiceTest {
         Assert.assertEquals(Status.PLUGIN_INSTANCE_ALREADY_EXIT, result.get(Constants.STATUS));
         Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
         result = alertPluginInstanceService.create(user, 1, "test1", "test params");
-        Assert.assertEquals(result.get(Constants.STATUS), Status.SUCCESS);
+        Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
     }
 
     @Test

From e6f69aebf03a0399d6f66219531265a94e0a9b51 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 26 Jan 2021 16:59:49 +0800
Subject: [PATCH 09/87] [Improvement][ui] Front-end interface optimization

---
 .../home/pages/dag/_source/formModel/log.vue   |  2 +-
 .../pages/dag/_source/plugIn/jsPlumbHandle.js  |  2 +-
 .../pages/servers/_source/zookeeperList.vue    |  2 +-
 .../definition/pages/list/_source/list.vue     |  4 ++--
 .../pages/index/_source/taskStatusCount.vue    |  6 ------
 .../pages/instance/pages/list/_source/list.vue | 18 +++---------------
 .../pages/instance/pages/list/index.vue        |  7 ++++++-
 .../components/secondaryMenu/_source/menu.js   |  4 ++--
 dolphinscheduler-ui/src/sass/common/index.scss |  3 +++
 9 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
index 502adc767f..5eb0a109a2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
@@ -38,7 +38,7 @@
                 <em class="el-icon-full-screen"></em>
               </a>
               <a href="javascript:" @click="_screenClose" v-show="isScreen" data-container="body" data-toggle="tooltip" :title="$t('Cancel full screen')">
-                <em class="el-icon-minus"></em>
+                <em class="el-icon-aim"></em>
               </a>
             </div>
           </div>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 1977a92409..226324d256 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -573,7 +573,7 @@ JSP.prototype.copyNodes = function ($id) {
 JSP.prototype.handleEventScreen = function ({ item, is }) {
   let screenOpen = true
   if (is) {
-    item.icon = 'el-icon-minus'
+    item.icon = 'el-icon-aim'
     screenOpen = true
   } else {
     item.icon = 'el-icon-full-screen'
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
index df987908f9..46cde99551 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
@@ -24,7 +24,7 @@
         <el-table-column prop="watches" :label="'watches'+$t('Number')"></el-table-column>
         <el-table-column prop="sent" :label="$t('Sent')"></el-table-column>
         <el-table-column prop="received" :label="$t('Received')"></el-table-column>
-        <el-table-column prop="mode" label="leader/follower"></el-table-column>
+        <el-table-column prop="mode" label="leader/follower" min-width="100"></el-table-column>
         <el-table-column prop="minLatency" :label="$t('Min latency')"></el-table-column>
         <el-table-column prop="avgLatency" :label="$t('Avg latency')"></el-table-column>
         <el-table-column prop="maxLatency" :label="$t('Max latency')"></el-table-column>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index b49fea2c2f..64c3f880b5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -25,8 +25,8 @@
             <el-popover trigger="hover" placement="top">
               <p>{{ scope.row.name }}</p>
               <div slot="reference" class="name-wrapper">
-                <router-link :to="{ path: '/projects/definition/list/' + scope.row.id}" tag="a" class="links" :title="scope.row.name">
-                  {{scope.row.name}}
+                <router-link :to="{ path: '/projects/definition/list/' + scope.row.id}" tag="a" class="links">
+                  <span class="ellipsis">{{scope.row.name}}</span>
                 </router-link>
               </div>
             </el-popover>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
index 9fd45418f9..9ebfcc6288 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
@@ -139,9 +139,3 @@
     components: { mNoData }
   }
 </script>
-
-<style lang="scss" rel="stylesheet/scss">
-  .task-status-count-model {
-
-  }
-</style>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 30309415b2..01b7574689 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -25,7 +25,7 @@
             <el-popover trigger="hover" placement="top">
               <p>{{ scope.row.name }}</p>
               <div slot="reference" class="name-wrapper">
-                <router-link :to="{ path: '/projects/instance/list/' + scope.row.id , query:{id: scope.row.processDefinitionId}}" tag="a" class="links" :title="scope.row.name">{{scope.row.name}}</router-link>
+                <router-link :to="{ path: '/projects/instance/list/' + scope.row.id , query:{id: scope.row.processDefinitionId}}" tag="a" class="links"><span class="ellipsis">{{ scope.row.name }}</span></router-link>
               </div>
             </el-popover>
           </template>
@@ -78,10 +78,10 @@
                 </span>
               </el-tooltip>
               <el-tooltip :content="scope.row.state === 'STOP' ? $t('Recovery Suspend') : $t('Stop')" placement="top" :enterable="false">
-                <span><el-button type="warning" size="mini" :disabled="scope.row.state !== 'RUNNING_EXECUTION' && scope.row.state !== 'STOP'"  :icon="scope.row.state === 'STOP' ? 'el-icon-video-play' : 'el-icon-close'" @click="_stop(scope.row,scope.$index)" circle></el-button></span>
+                <span><el-button type="danger" size="mini" :disabled="scope.row.state !== 'RUNNING_EXECUTION' && scope.row.state !== 'STOP'"  :icon="scope.row.state === 'STOP' ? 'el-icon-video-play' : 'el-icon-close'" @click="_stop(scope.row,scope.$index)" circle></el-button></span>
               </el-tooltip>
               <el-tooltip :content="scope.row.state === 'PAUSE' ? $t('Recovery Suspend') : $t('Pause')" placement="top" :enterable="false">
-                <span><el-button type="error" size="mini" :icon="scope.row.state === 'PAUSE' ? 'el-icon-video-play' : 'el-icon-video-pause'" :disabled="scope.row.state !== 'RUNNING_EXECUTION' && scope.row.state !== 'PAUSE'" @click="_suspend(scope.row,scope.$index)" circle></el-button></span>
+                <span><el-button type="warning" size="mini" :icon="scope.row.state === 'PAUSE' ? 'el-icon-video-play' : 'el-icon-video-pause'" :disabled="scope.row.state !== 'RUNNING_EXECUTION' && scope.row.state !== 'PAUSE'" @click="_suspend(scope.row,scope.$index)" circle></el-button></span>
               </el-tooltip>
               <el-tooltip :content="$t('delete')" placement="top" :enterable="false">
                 <el-popconfirm
@@ -437,18 +437,6 @@
         })
         this._arrDelChange()
       },
-      // _arrDelChange (v) {
-      //   let arr = []
-      //   this.list.forEach((item)=>{
-      //     if (item.isCheck) {
-      //       arr.push(item.id)
-      //     }
-      //   })
-      //   this.strDelete = _.join(arr, ',')
-      //   if (v === false) {
-      //     this.checkAll = false
-      //   }
-      // },
       _arrDelChange (v) {
         let arr = []
         arr = _.map(v, 'id')
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index 05b905ac8b..c07eacbae9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -18,7 +18,7 @@
   <div class="wrap-table">
     <m-list-construction :title="$t('Process Instance')">
       <template slot="conditions">
-        <m-instance-conditions @on-query="_onQuery"></m-instance-conditions>
+        <m-instance-conditions class="searchNav" @on-query="_onQuery"></m-instance-conditions>
       </template>
       <template slot="content">
         <template v-if="processInstanceList.length || total>0">
@@ -223,4 +223,9 @@
       }
     }
   }
+  @media screen and (max-width: 1246px) {
+    .searchNav {
+      margin-bottom: 30px;
+    }
+  }
 </style>
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index daaf918665..249bf2e3e2 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -115,7 +115,7 @@ const menu = {
       path: 'warning-instance-manage',
       isOpen: true,
       enabled: true,
-      icon: 'ri-spam-fill',
+      icon: 'el-icon-warning-outline',
       children: []
     },
     {
@@ -133,7 +133,7 @@ const menu = {
       path: 'queue-manage',
       isOpen: true,
       enabled: true,
-      icon: 'ri-group-line',
+      icon: 'el-icon-s-grid',
       children: []
     },
     {
diff --git a/dolphinscheduler-ui/src/sass/common/index.scss b/dolphinscheduler-ui/src/sass/common/index.scss
index 647be6121c..a80ae2c765 100644
--- a/dolphinscheduler-ui/src/sass/common/index.scss
+++ b/dolphinscheduler-ui/src/sass/common/index.scss
@@ -102,6 +102,9 @@ body{
   }
   .main-layout-model {
     &.dag-screen {
+      .m-top {
+        position: unset;
+      }
       .m-bottom {
         z-index: 2;
       }

From d85a4a9dc467bb657bd773d7e021944ee0c367c5 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 26 Jan 2021 17:39:02 +0800
Subject: [PATCH 10/87] fix

---
 .../home/pages/projects/pages/taskInstance/_source/list.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index 47731a1c67..75ec49d6bd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -25,7 +25,7 @@
             <el-popover trigger="hover" placement="top">
               <p>{{ scope.row.processInstanceName }}</p>
               <div slot="reference" class="name-wrapper">
-                <a href="javascript:" class="links" @click="_go(scope.row)"><span class="ellipsis" :title="scope.row.processInstanceName">{{scope.row.processInstanceName}}</span></a>
+                <a href="javascript:" class="links" @click="_go(scope.row)"><span class="ellipsis">{{scope.row.processInstanceName}}</span></a>
               </div>
             </el-popover>
           </template>

From c4013c98231eda71a4186bb9d26980adea2593b4 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Tue, 26 Jan 2021 19:15:50 +0800
Subject: [PATCH 11/87] delete the data-container attribute.

---
 .../js/conf/home/pages/dag/_source/dag.vue    | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 492f41dd20..c56d73f443 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -34,30 +34,30 @@
     <div class="dag-contect">
       <div class="dag-toolbar">
         <div class="assist-btn">
-          <el-button
-            style="vertical-align: middle;"
-            data-toggle="tooltip"
-            :title="$t('View variables')"
-            data-container="body"
-            type="primary"
-            size="mini"
-            :disabled="$route.name !== 'projects-instance-details'"
-            @click="_toggleView"
-            icon="el-icon-c-scale-to-original">
-          </el-button>
-          <span>
+          <el-tooltip :content="$t('View variables')" placement="top" :enterable="false">
+           <span>
             <el-button
               style="vertical-align: middle;"
-              data-toggle="tooltip"
-              :title="$t('Startup parameter')"
-              data-container="body"
               type="primary"
               size="mini"
               :disabled="$route.name !== 'projects-instance-details'"
-              @click="_toggleParam"
-              icon="el-icon-arrow-right">
+              @click="_toggleView"
+              icon="el-icon-c-scale-to-original">
             </el-button>
-          </span>
+           </span>
+          </el-tooltip>
+          <el-tooltip :content="$t('Startup parameter')" placement="top" :enterable="false">
+            <span>
+              <el-button
+                style="vertical-align: middle;"
+                type="primary"
+                size="mini"
+                :disabled="$route.name !== 'projects-instance-details'"
+                @click="_toggleParam"
+                icon="el-icon-arrow-right">
+              </el-button>
+            </span>
+          </el-tooltip>
           <span class="name">{{name}}</span>
           &nbsp;
           <span v-if="name"  class="copy-name" @click="_copyName" :data-clipboard-text="name"><em class="el-icon-copy-document" data-container="body"  data-toggle="tooltip" :title="$t('Copy name')" ></em></span>
@@ -71,7 +71,7 @@
                :key="$index"
                @click="_ckOperation(item,$event)">
               <el-tooltip :content="item.desc" placement="top" :enterable="false">
-                <span><el-button type="text" class="operBtn" data-container="body" :icon="item.icon"></el-button></span>
+                <span><el-button type="text" class="operBtn" :icon="item.icon"></el-button></span>
               </el-tooltip>
             </a>
           </div>
@@ -81,7 +81,6 @@
                 type="primary"
                 icon="el-icon-caret-right"
                 size="mini"
-                data-container="body"
                 v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"
                 style="vertical-align: middle;"
                 @click="dagAutomaticLayout">
@@ -91,7 +90,6 @@
           <el-tooltip :content="$t('Refresh DAG status')" placement="top" :enterable="false">
             <span>
               <el-button
-                data-container="body"
                 style="vertical-align: middle;"
                 icon="el-icon-refresh"
                 type="primary"
@@ -116,7 +114,6 @@
               type="primary"
               icon="el-icon-switch-button"
               size="mini"
-              data-container="body"
               v-if="(type === 'instance' || 'definition') "
               style="vertical-align: middle;"
               @click="_closeDAG">

From bba3dbde17ec0f9fa6d430081822c83c8bd6a8ea Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Wed, 27 Jan 2021 15:19:11 +0800
Subject: [PATCH 12/87] fix alert server client send. (#4587)

---
 .../apache/dolphinscheduler/alert/runner/AlertSender.java | 4 ++--
 .../dolphinscheduler/server/worker/WorkerServer.java      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index d635574543..e8c6880f55 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -106,8 +106,8 @@ public class AlertSender {
 
         List<AlertPluginInstance> alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId);
         AlertData alertData = new AlertData();
-        alertData.setContent(title)
-            .setTitle(content);
+        alertData.setContent(content)
+            .setTitle(title);
 
         boolean sendResponseStatus = true;
         List<AlertSendResponseResult> sendResponseResults = new ArrayList<>();
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index bcc082846b..1f138f6acd 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -103,11 +103,14 @@ public class WorkerServer {
     public void run() {
         logger.info("start worker server...");
 
+        //alert-server client registry
+        alertClientService = new AlertClientService(workerConfig.getAlertListenHost(),Constants.ALERT_RPC_PORT);
+
         //init remoting server
         NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(workerConfig.getListenPort());
         this.nettyRemotingServer = new NettyRemotingServer(serverConfig);
-        this.nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_REQUEST, new TaskExecuteProcessor());
+        this.nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_REQUEST, new TaskExecuteProcessor(alertClientService));
         this.nettyRemotingServer.registerProcessor(CommandType.TASK_KILL_REQUEST, new TaskKillProcessor());
         this.nettyRemotingServer.registerProcessor(CommandType.DB_TASK_ACK, new DBTaskAckProcessor());
         this.nettyRemotingServer.registerProcessor(CommandType.DB_TASK_RESPONSE, new DBTaskResponseProcessor());
@@ -116,9 +119,6 @@ public class WorkerServer {
         // worker registry
         this.workerRegistry.registry();
 
-        //alert-server client registry
-        alertClientService = new AlertClientService(workerConfig.getAlertListenHost(),Constants.ALERT_RPC_PORT);
-
         // retry report task status
         this.retryReportTaskStatusThread.start();
 

From ffdda00a3b5e999c2553b52dfebd95228ab2ae4c Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 28 Jan 2021 15:10:25 +0800
Subject: [PATCH 13/87] [Feature-3826]sql node adds alarm group field

---
 .../formModel/tasks/_source/warningGroups.vue | 76 +++++++++++++++++++
 .../pages/dag/_source/formModel/tasks/sql.vue | 26 +++++--
 .../pages/dag/_source/startingParam/index.vue |  2 +-
 .../conf/home/pages/dag/definitionDetails.vue |  4 +-
 .../src/js/conf/home/pages/dag/index.vue      |  4 +-
 .../conf/home/pages/dag/instanceDetails.vue   |  4 +-
 .../definition/pages/list/_source/list.vue    |  1 +
 .../definition/pages/list/_source/start.vue   |  6 +-
 .../js/conf/home/store/security/actions.js    | 13 ++++
 .../src/js/conf/home/store/security/state.js  |  1 +
 .../src/js/module/i18n/locale/en_US.js        |  2 +
 .../src/js/module/i18n/locale/zh_CN.js        |  2 +
 12 files changed, 128 insertions(+), 13 deletions(-)
 create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue
new file mode 100644
index 0000000000..30bcc522fb
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+  <el-select
+          clearable
+          @change="_onChange"
+          v-model="selectedValue"
+          size="small"
+          style="width: 100%">
+    <el-option
+            v-for="item in alarmGroupsList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.groupName">
+    </el-option>
+  </el-select>
+</template>
+<script>
+  import disabledState from '@/module/mixin/disabledState'
+  export default {
+    name: 'form-warning-group',
+    data () {
+      return {
+        selectedValue: this.value,
+        workerGroupsList: []
+      }
+    },
+    mixins: [disabledState],
+    props: {
+      value: {
+        type: Number,
+        default: null
+      }
+    },
+    model: {
+      prop: 'value',
+      event: 'warningGroupsEvent'
+    },
+    methods: {
+      _onChange (o) {
+        this.$emit('warningGroupsEvent', o)
+      }
+    },
+    watch: {
+      value (val) {
+        this.selectedValue = val
+      }
+    },
+    created () {
+      let stateAlarmGroupsList = this.store.state.security.alarmGroupsListAll || []
+      if (stateAlarmGroupsList.length) {
+        this.alarmGroupsList = stateAlarmGroupsList
+      } else {
+        this.store.dispatch('security/getAlarmGroupsAll').then(res => {
+          this.$nextTick(() => {
+            this.alarmGroupsList = res
+          })
+        })
+      }
+    }
+  }
+</script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 706edcda6a..169ebf87de 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -51,10 +51,17 @@
             type="input"
             size="small"
             v-model="title"
+            :disabled="isDetails"
             :placeholder="$t('Please enter the title of email')">
           </el-input>
         </div>
       </m-list-box>
+      <m-list-box>
+        <div slot="text"><strong class='requiredIcon'>*</strong>{{$t('Alarm group')}}</div>
+        <div slot="content">
+          <m-warning-groups v-model="groupId"></m-warning-groups>
+        </div>
+      </m-list-box>
     </template>
     <m-list-box v-show="type === 'HIVE'">
       <div slot="text">{{$t('SQL Parameter')}}</div>
@@ -142,6 +149,7 @@
   import mDatasource from './_source/datasource'
   import mLocalParams from './_source/localParams'
   import mStatementList from './_source/statementList'
+  import mWarningGroups from './_source/warningGroups'
   import disabledState from '@/module/mixin/disabledState'
   import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
 
@@ -176,7 +184,8 @@
         // Post statements
         postStatements: [],
         item: '',
-        scriptBoxDialog: false
+        scriptBoxDialog: false,
+        groupId: null
       }
     },
     mixins: [disabledState],
@@ -245,16 +254,16 @@
         if (!this.$refs.refDs._verifDatasource()) {
           return false
         }
-        if (this.sqlType === 0 && !this.showType.length) {
+        if (this.sqlType === '0' && !this.showType.length) {
           this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`)
           return false
         }
-        if (this.sqlType === 0 && !this.title) {
+        if (this.sqlType === '0' && !this.title) {
           this.$message.warning(`${i18n.$t('Mail subject required')}`)
           return false
         }
-        if (this.sqlType === 0 && !this.receivers.length) {
-          this.$message.warning(`${i18n.$t('Recipient required')}`)
+        if (this.sqlType === '0' && (this.groupId === '' || this.groupId === null)) {
+          this.$message.warning(`${i18n.$t('Alarm group required')}`)
           return false
         }
         // udfs Subcomponent verification Verification only if the data type is HIVE
@@ -287,6 +296,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
+          groupId: this.groupId,
           showType: (() => {
             /**
              * Special processing return order TABLE,ATTACHMENT
@@ -347,6 +357,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
+          groupId: this.groupId,
           showType: (() => {
             let showType = this.showType
             if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
@@ -377,6 +388,7 @@
         }
         if (val !== 0) {
           this.title = ''
+          this.groupId = null
         }
       },
       // Listening data source
@@ -411,6 +423,7 @@
         this.preStatements = o.params.preStatements || []
         this.postStatements = o.params.postStatements || []
         this.title = o.params.title || ''
+        this.groupId = o.params.groupId
       }
     },
     mounted () {
@@ -436,6 +449,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
+          groupId: this.groupId,
           showType: (() => {
             let showType = this.showType
             if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
@@ -451,6 +465,6 @@
         }
       }
     },
-    components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mStatementList, mScriptBox }
+    components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mStatementList, mScriptBox, mWarningGroups }
   }
 </script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
index bcc91524ff..de42199a1a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
@@ -26,7 +26,7 @@
            <li><span class="tab">{{$t('Process priority')}}：</span><span class="content">{{startupParam.processInstancePriority}}</span></li>
            <li><span class="tab">{{$t('Worker group')}}：</span><span class="content" v-if="workerGroupList.length">{{startupParam.workerGroup}}</span></li>
            <li><span class="tab">{{$t('Notification strategy')}}：</span><span class="content">{{_rtWarningType(startupParam.warningType)}}</span></li>
-           <li><span class="tab">{{$t('Notification group')}}：</span><span class="content" v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
+           <li><span class="tab">{{$t('Alarm group')}}：</span><span class="content" v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
          </ul>
        </div>
     </template>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
index d9acb38453..65510bf69b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
@@ -42,7 +42,7 @@
     methods: {
       ...mapMutations('dag', ['resetParams', 'setIsDetails']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -64,6 +64,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           let item = data[0]
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
index d232e2dd86..81d129a47e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
@@ -41,7 +41,7 @@
     methods: {
       ...mapMutations('dag', ['resetParams']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -63,6 +63,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           this.isLoading = false
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index 0727d12eed..f9561bd52c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -44,7 +44,7 @@
     methods: {
       ...mapMutations('dag', ['setIsDetails', 'resetParams']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -66,6 +66,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           let item = data[0]
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 64c3f880b5..32612213ac 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -129,6 +129,7 @@
     </el-drawer>
     <el-dialog
       :title="$t('Please set the parameters before starting')"
+      v-if="startDialog"
       :visible.sync="startDialog"
       width="auto">
       <m-start :startData= "startData" @onUpdateStart="onUpdateStart" @closeStart="closeStart"></m-start>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index e2ab711528..e9f615d340 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -78,15 +78,16 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('Notification group')}}
+        {{$t('Alarm group')}}
       </div>
       <div class="cont">
         <el-select
            style="width: 200px;"
+           clearable
            size="small"
            v-model="warningGroupId"
           :disabled="!notifyGroupList.length">
-          <el-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a notification group')" size="small" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = ''">
+          <el-input slot="trigger" slot-scope="{ selectedModel }" readonly size="small" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = ''">
             <em slot="suffix" class="el-icon-error" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId"></em>
             <em slot="suffix" class="el-icon-bottom" style="font-size: 12px;" v-show="!warningGroupId"></em>
           </el-input>
@@ -263,7 +264,6 @@
         })
       },
       _getGlobalParams () {
-        this.setIsDetails(true)
         this.store.dispatch('dag/getProcessDetails', this.startData.id).then(res => {
           this.definitionGlobalParams = _.cloneDeep(this.store.state.dag.globalParams)
           this.udpList = _.cloneDeep(this.store.state.dag.globalParams)
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index 9405d264a4..97df05d7bc 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -600,6 +600,19 @@ export default {
       })
     })
   },
+  /**
+   * get alarm groups all
+   */
+  getAlarmGroupsAll ({ state }, payload) {
+    return new Promise((resolve, reject) => {
+      io.get('alert-group/list', payload, res => {
+        state.alarmGroupsListAll = res.data
+        resolve(res)
+      }).catch(e => {
+        reject(e)
+      })
+    })
+  },
   saveWorkerGroups ({ state }, payload) {
     return new Promise((resolve, reject) => {
       io.post('worker-group/save', payload, res => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/state.js b/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
index f3533265a9..a959d9431f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
@@ -16,5 +16,6 @@
  */
 export default {
   workerGroupsListAll: [],
+  alarmGroupsListAll: [],
   tenantAllList: []
 }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 168258a9f6..34145e7132 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -207,6 +207,8 @@ export default {
   'UDF resources': 'UDF resources',
   'UDF resources directory': 'UDF resources directory',
   'Please select UDF resources directory': 'Please select UDF resources directory',
+  'Alarm group': 'Alarm group',
+  'Alarm group required': 'Alarm group required',
   'Edit alarm group': 'Edit alarm group',
   'Create alarm group': 'Create alarm group',
   'Create Alarm Instance': 'Create Alarm Instance',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index fb3bd3fb5b..7cafa9dec1 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -207,6 +207,8 @@ export default {
   'UDF resources': 'UDF资源',
   'UDF resources directory': 'UDF资源目录',
   'Please select UDF resources directory': '请选择UDF资源目录',
+  'Alarm group': '告警组',
+  'Alarm group required': '告警组必填',
   'Edit alarm group': '编辑告警组',
   'Create alarm group': '创建告警组',
   'Create Alarm Instance': '创建告警实例',

From 243ad386d0b9a30879f43fa06f55276911cfbbd6 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 00:26:19 +0800
Subject: [PATCH 14/87] [Improvement][alert-spi]plugin instance only saves the
 main information

plugin instance only saves the main information

when users need to display all the complete information (usually UI display), then do the conversion.
---
 .../alert/dingtalk/DingTalkAlertChannel.java  |  7 ++-
 .../plugin/alert/email/EmailAlertChannel.java |  6 +-
 .../plugin/alert/http/HttpAlertChannel.java   |  6 +-
 .../alert/script/ScriptAlertChannel.java      |  7 ++-
 .../script/ScriptAlertChannelFactoryTest.java | 12 +++-
 .../alert/wechat/WeChatAlertChannel.java      |  6 +-
 .../impl/AlertPluginInstanceServiceImpl.java  | 62 +++++++++++++++++--
 .../spi/alert/AlertResult.java                |  8 +++
 .../spi/params/base/PluginParams.java         |  4 ++
 9 files changed, 104 insertions(+), 14 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
index 7adfacce39..a2815c1736 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
@@ -21,7 +21,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -35,7 +35,10 @@ public class DingTalkAlertChannel implements AlertChannel {
 
         AlertData alertData = alertInfo.getAlertData();
         String alertParams = alertInfo.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        if(null==paramsMap){
+            return new AlertResult("false","ding talk params is null");
+        }
         return new DingTalkSender(paramsMap).sendDingTalkMsg(alertData.getTitle(), alertData.getContent());
     }
 }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
index c793af5710..843266fd18 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
@@ -22,6 +22,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -39,7 +40,10 @@ public class EmailAlertChannel implements AlertChannel {
 
         AlertData alert = info.getAlertData();
         String alertParams = info.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        if(null==paramsMap){
+            return new AlertResult("false","mail params is null");
+        }
         MailSender mailSender = new MailSender(paramsMap);
         AlertResult alertResult = mailSender.sendMails(alert.getTitle(), alert.getContent());
 
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
index 27bc1903d8..b4d1aa30a1 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
@@ -22,6 +22,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -34,7 +35,10 @@ public class HttpAlertChannel implements AlertChannel {
 
         AlertData alertData = alertInfo.getAlertData();
         String alertParams = alertInfo.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        if(null==paramsMap){
+            return new AlertResult("false","http params is null");
+        }
 
         return new HttpSender(paramsMap).send(alertData.getContent());
     }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
index 2a0021277d..bebb18dc04 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
@@ -21,7 +21,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -34,7 +34,10 @@ public class ScriptAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo alertinfo) {
         AlertData alertData = alertinfo.getAlertData();
         String alertParams = alertinfo.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        if(null==paramsMap){
+            return new AlertResult("false","ding talk params is null");
+        }
         return new ScriptSender(paramsMap).sendScriptAlert(alertData.getTitle());
     }
 }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
index 72f2197315..c8ffce5469 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
@@ -18,9 +18,11 @@
 package org.apache.dolphinscheduler.plugin.alert.script;
 
 import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
+import java.util.HashMap;
 import java.util.List;
 
 import org.junit.Assert;
@@ -35,8 +37,16 @@ public class ScriptAlertChannelFactoryTest {
     public void testGetParams() {
         ScriptAlertChannelFactory scriptAlertChannelFactory = new ScriptAlertChannelFactory();
         List<PluginParams> params = scriptAlertChannelFactory.getParams();
-        JSONUtils.toJsonString(params);
+
+       String pluginParamsMapString= JSONUtils.toJsonString(PluginParamsTransfer.getPluginParamsMap(JSONUtils.toJsonString(params)));
+        HashMap paramsMap=   JSONUtils.parseObject(pluginParamsMapString,HashMap.class);
+        System.out.println(paramsMap.get("path"));
         Assert.assertEquals(3, params.size());
+        List<PluginParams> paramss= JSONUtils.toList(JSONUtils.toJsonString(params),PluginParams.class);
+
+        System.out.println(PluginParamsTransfer.getPluginParamsMap(JSONUtils.toJsonString(params)));
+        System.out.println(paramss.get(0).getName());
+        System.out.println(paramss.get(0).getName());
     }
 
     @Test
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
index 4cdd4d375c..299b0dda8c 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
@@ -22,6 +22,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -34,7 +35,10 @@ public class WeChatAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo info) {
         AlertData alertData = info.getAlertData();
         String alertParams = info.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        if(null==paramsMap){
+            return new AlertResult("false","we chat params is null");
+        }
         return new WeChatSender(paramsMap).sendEnterpriseWeChat(alertData.getTitle(), alertData.getContent());
 
     }
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index 8004a90fae..7e0b2578b7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -24,16 +24,20 @@ import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.api.vo.AlertPluginInstanceVO;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +71,8 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
     @Override
     public Map<String, Object> create(User loginUser, int pluginDefineId, String instanceName, String pluginInstanceParams) {
         AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
-        alertPluginInstance.setPluginInstanceParams(pluginInstanceParams);
+        String paramsMapJson = parsePluginParamsMap(pluginInstanceParams);
+        alertPluginInstance.setPluginInstanceParams(paramsMapJson);
         alertPluginInstance.setInstanceName(instanceName);
         alertPluginInstance.setPluginDefineId(pluginDefineId);
 
@@ -82,7 +87,9 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
 
         if (i > 0) {
             putMsg(result, Status.SUCCESS);
+            return result;
         }
+        putMsg(result, Status.SAVE_ERROR);
         return result;
     }
 
@@ -98,7 +105,8 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
     public Map<String, Object> update(User loginUser, int pluginInstanceId, String instanceName, String pluginInstanceParams) {
 
         AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
-        alertPluginInstance.setPluginInstanceParams(pluginInstanceParams);
+        String paramsMapJson = parsePluginParamsMap(pluginInstanceParams);
+        alertPluginInstance.setPluginInstanceParams(paramsMapJson);
         alertPluginInstance.setInstanceName(instanceName);
         alertPluginInstance.setId(pluginInstanceId);
         Map<String, Object> result = new HashMap<>();
@@ -106,8 +114,9 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
 
         if (i > 0) {
             putMsg(result, Status.SUCCESS);
+            return result;
         }
-
+        putMsg(result, Status.SAVE_ERROR);
         return result;
     }
 
@@ -188,21 +197,62 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
         if (CollectionUtils.isEmpty(pluginDefineList)) {
             return null;
         }
-        Map<Integer, String> pluginDefineMap = pluginDefineList.stream().collect(Collectors.toMap(PluginDefine::getId, PluginDefine::getPluginName));
+        Map<Integer, PluginDefine> pluginDefineMap = pluginDefineList.stream().collect(Collectors.toMap(PluginDefine::getId, Function.identity()));
         List<AlertPluginInstanceVO> alertPluginInstanceVOS = new ArrayList<>();
         alertPluginInstances.forEach(alertPluginInstance -> {
             AlertPluginInstanceVO alertPluginInstanceVO = new AlertPluginInstanceVO();
-            alertPluginInstanceVO.setAlertPluginName(pluginDefineMap.get(alertPluginInstance.getPluginDefineId()));
+
             alertPluginInstanceVO.setCreateTime(alertPluginInstance.getCreateTime());
             alertPluginInstanceVO.setUpdateTime(alertPluginInstance.getUpdateTime());
             alertPluginInstanceVO.setPluginDefineId(alertPluginInstance.getPluginDefineId());
             alertPluginInstanceVO.setInstanceName(alertPluginInstance.getInstanceName());
             alertPluginInstanceVO.setId(alertPluginInstance.getId());
+            PluginDefine pluginDefine = pluginDefineMap.get(alertPluginInstance.getPluginDefineId());
+            //FIXME When the user removes the plug-in, this will happen. At this time, maybe we should add a new field to indicate that the plug-in has expired?
+            if (null == pluginDefine) {
+                return;
+            }
+            alertPluginInstanceVO.setAlertPluginName(pluginDefine.getPluginName());
             //todo List pages do not recommend returning this parameter
-            alertPluginInstanceVO.setPluginInstanceParams(alertPluginInstance.getPluginInstanceParams());
+            String pluginParamsMapString = alertPluginInstance.getPluginInstanceParams();
+            String uiPluginParams=parseToPluginUiParams(pluginParamsMapString,pluginDefine.getPluginParams());
+            alertPluginInstanceVO.setPluginInstanceParams(uiPluginParams);
             alertPluginInstanceVOS.add(alertPluginInstanceVO);
         });
         return alertPluginInstanceVOS;
 
     }
+
+    /**
+     * Get the parameters actually needed by the plugin
+     *
+     * @param pluginParams Complete parameters(include ui)
+     * @return k, v(json string)
+     */
+    private String parsePluginParamsMap(String pluginParams) {
+        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(pluginParams);
+        return JSONUtils.toJsonString(paramsMap);
+    }
+
+    /**
+     * parseToPluginUiParams
+     *
+     * @param pluginParamsMapString k-v data
+     * @param pluginUiParams Complete parameters(include ui)
+     * @return Complete parameters list(include ui)
+     */
+    private String parseToPluginUiParams(String pluginParamsMapString, String pluginUiParams) {
+        //todo npe
+        HashMap paramsMap = JSONUtils.parseObject(pluginParamsMapString, HashMap.class);
+        assert paramsMap != null;
+        List<PluginParams> pluginParamsList = JSONUtils.toList(pluginUiParams, PluginParams.class);
+        List<PluginParams> newPluginParamsList = new ArrayList<>(pluginParamsList.size());
+        pluginParamsList.forEach(pluginParams -> {
+            pluginParams.setValue(paramsMap.get(pluginParams.getName()));
+            newPluginParamsList.add(pluginParams);
+
+        });
+
+        return JSONUtils.toJsonString(newPluginParamsList);
+    }
 }
diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java
index a327d09403..6ce5425f7f 100644
--- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java
+++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertResult.java
@@ -38,4 +38,12 @@ public class AlertResult {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public AlertResult(String status, String message) {
+        this.status = status;
+        this.message = message;
+    }
+
+    public AlertResult() {
+    }
 }
diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java
index 1fdf0e0792..34d60a26c4 100644
--- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java
+++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/params/base/PluginParams.java
@@ -165,6 +165,10 @@ public class PluginParams {
     public List<Validate> getValidateList() {
         return validateList;
     }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
 }
 
 

From 5f23ca5deea4203367beda954a3823fecfe65528 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 09:50:23 +0800
Subject: [PATCH 15/87] [Improvement][alert-spi]plugin instance only saves the
 main information

plugin instance only saves the main information

when users need to display all the complete information (usually UI display), then do the conversion.
---
 .../alert/dingtalk/DingTalkAlertChannel.java  |  3 +--
 .../plugin/alert/email/EmailAlertChannel.java |  9 +++-----
 .../email/EmailAlertChannelFactoryTest.java   | 23 ++-----------------
 .../alert/email/EmailAlertChannelTest.java    |  6 ++++-
 .../plugin/alert/http/HttpAlertChannel.java   |  9 +++-----
 .../alert/http/HttpAlertChannelTest.java      |  7 ++++--
 .../alert/script/ScriptAlertChannel.java      |  8 +++----
 .../script/ScriptAlertChannelFactoryTest.java | 12 ----------
 .../alert/wechat/WeChatAlertChannel.java      |  9 +++-----
 .../alert/runner/AlertSender.java             | 15 +++++++-----
 .../impl/AlertPluginInstanceServiceImpl.java  | 11 +++++----
 .../dolphinscheduler/spi/alert/AlertInfo.java |  8 ++++---
 12 files changed, 46 insertions(+), 74 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
index a2815c1736..db83e396bf 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
@@ -34,8 +34,7 @@ public class DingTalkAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo alertInfo) {
 
         AlertData alertData = alertInfo.getAlertData();
-        String alertParams = alertInfo.getAlertParams();
-        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
+        Map<String, String> paramsMap = alertInfo.getAlertParams();
         if(null==paramsMap){
             return new AlertResult("false","ding talk params is null");
         }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
index 843266fd18..3dbf0b8fb9 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -39,10 +37,9 @@ public class EmailAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo info) {
 
         AlertData alert = info.getAlertData();
-        String alertParams = info.getAlertParams();
-        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
-        if(null==paramsMap){
-            return new AlertResult("false","mail params is null");
+        Map<String, String> paramsMap = info.getAlertParams();
+        if (null == paramsMap) {
+            return new AlertResult("false", "mail params is null");
         }
         MailSender mailSender = new MailSender(paramsMap);
         AlertResult alertResult = mailSender.sendMails(alert.getTitle(), alert.getContent());
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
index 977cd8fefc..37a11e47fb 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactoryTest.java
@@ -19,13 +19,10 @@ package org.apache.dolphinscheduler.plugin.alert.email;
 
 import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -36,29 +33,13 @@ import org.junit.Test;
  */
 public class EmailAlertChannelFactoryTest {
 
-    @Before
-    public void before() throws Exception {
-    }
-
-    @After
-    public void after() throws Exception {
-    }
-
-    /**
-     * Method: getName()
-     */
-    @Test
-    public void testGetName() throws Exception {
-    }
-
     /**
      * Method: getParams()
      */
     @Test
-    public void testGetParams() throws Exception {
+    public void testGetParams() {
         EmailAlertChannelFactory emailAlertChannelFactory = new EmailAlertChannelFactory();
         List<PluginParams> params = emailAlertChannelFactory.getParams();
-        System.out.println(JSONUtils.toJsonString(params));
         Assert.assertEquals(12, params.size());
     }
 
@@ -66,7 +47,7 @@ public class EmailAlertChannelFactoryTest {
      * Method: create()
      */
     @Test
-    public void testCreate() throws Exception {
+    public void testCreate() {
         EmailAlertChannelFactory emailAlertChannelFactory = new EmailAlertChannelFactory();
         AlertChannel alertChannel = emailAlertChannelFactory.create();
         Assert.assertNotNull(alertChannel);
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
index 97a1013399..fc28df272c 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelTest.java
@@ -24,6 +24,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertResult;
 import org.apache.dolphinscheduler.spi.alert.ShowType;
 import org.apache.dolphinscheduler.spi.params.InputParam;
 import org.apache.dolphinscheduler.spi.params.PasswordParam;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.RadioParam;
 import org.apache.dolphinscheduler.spi.params.base.DataType;
 import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
@@ -34,6 +35,7 @@ import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -66,7 +68,9 @@ public class EmailAlertChannelTest {
                 .setTitle("test");
         AlertInfo alertInfo = new AlertInfo();
         alertInfo.setAlertData(alertData);
-        alertInfo.setAlertParams(getEmailAlertParams());
+        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(getEmailAlertParams());
+
+        alertInfo.setAlertParams(paramsMap);
         AlertResult alertResult = emailAlertChannel.process(alertInfo);
         Assert.assertNotNull(alertResult);
         Assert.assertEquals("false", alertResult.getStatus());
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
index b4d1aa30a1..cb550b7541 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -34,10 +32,9 @@ public class HttpAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo alertInfo) {
 
         AlertData alertData = alertInfo.getAlertData();
-        String alertParams = alertInfo.getAlertParams();
-        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
-        if(null==paramsMap){
-            return new AlertResult("false","http params is null");
+        Map<String, String> paramsMap = alertInfo.getAlertParams();
+        if (null == paramsMap) {
+            return new AlertResult("false", "http params is null");
         }
 
         return new HttpSender(paramsMap).send(alertData.getContent());
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java
index 31a438b4fc..4d385e8a54 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelTest.java
@@ -21,12 +21,14 @@ import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
 import org.apache.dolphinscheduler.spi.params.InputParam;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 import org.apache.dolphinscheduler.spi.params.base.Validate;
 import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -45,7 +47,7 @@ public class HttpAlertChannelTest {
         alertData.setContent("Fault tolerance warning");
         alertInfo.setAlertData(alertData);
         AlertResult alertResult = alertChannel.process(alertInfo);
-        Assert.assertEquals("Request types are not supported", alertResult.getMessage());
+        Assert.assertEquals("http params is null", alertResult.getMessage());
     }
 
     @Test
@@ -56,7 +58,8 @@ public class HttpAlertChannelTest {
         AlertData alertData = new AlertData();
         alertData.setContent("Fault tolerance warning");
         alertInfo.setAlertData(alertData);
-        alertInfo.setAlertParams(getParams());
+        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(getParams());
+        alertInfo.setAlertParams(paramsMap);
         AlertResult alertResult = alertChannel.process(alertInfo);
         Assert.assertEquals("true", alertResult.getStatus());
     }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
index bebb18dc04..dc6aa27e25 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -33,10 +32,9 @@ public class ScriptAlertChannel implements AlertChannel {
     @Override
     public AlertResult process(AlertInfo alertinfo) {
         AlertData alertData = alertinfo.getAlertData();
-        String alertParams = alertinfo.getAlertParams();
-        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
-        if(null==paramsMap){
-            return new AlertResult("false","ding talk params is null");
+        Map<String, String> paramsMap = alertinfo.getAlertParams();
+        if (null == paramsMap) {
+            return new AlertResult("false", "ding talk params is null");
         }
         return new ScriptSender(paramsMap).sendScriptAlert(alertData.getTitle());
     }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
index c8ffce5469..8cedc2c38e 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactoryTest.java
@@ -18,11 +18,8 @@
 package org.apache.dolphinscheduler.plugin.alert.script;
 
 import org.apache.dolphinscheduler.spi.alert.AlertChannel;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
-import java.util.HashMap;
 import java.util.List;
 
 import org.junit.Assert;
@@ -37,16 +34,7 @@ public class ScriptAlertChannelFactoryTest {
     public void testGetParams() {
         ScriptAlertChannelFactory scriptAlertChannelFactory = new ScriptAlertChannelFactory();
         List<PluginParams> params = scriptAlertChannelFactory.getParams();
-
-       String pluginParamsMapString= JSONUtils.toJsonString(PluginParamsTransfer.getPluginParamsMap(JSONUtils.toJsonString(params)));
-        HashMap paramsMap=   JSONUtils.parseObject(pluginParamsMapString,HashMap.class);
-        System.out.println(paramsMap.get("path"));
         Assert.assertEquals(3, params.size());
-        List<PluginParams> paramss= JSONUtils.toList(JSONUtils.toJsonString(params),PluginParams.class);
-
-        System.out.println(PluginParamsTransfer.getPluginParamsMap(JSONUtils.toJsonString(params)));
-        System.out.println(paramss.get(0).getName());
-        System.out.println(paramss.get(0).getName());
     }
 
     @Test
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
index 299b0dda8c..36cce09ff3 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -34,10 +32,9 @@ public class WeChatAlertChannel implements AlertChannel {
     @Override
     public AlertResult process(AlertInfo info) {
         AlertData alertData = info.getAlertData();
-        String alertParams = info.getAlertParams();
-        Map paramsMap = JSONUtils.parseObject(alertParams,Map.class);
-        if(null==paramsMap){
-            return new AlertResult("false","we chat params is null");
+        Map<String, String> paramsMap = info.getAlertParams();
+        if (null == paramsMap) {
+            return new AlertResult("false", "we chat params is null");
         }
         return new WeChatSender(paramsMap).sendEnterpriseWeChat(alertData.getTitle(), alertData.getContent());
 
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index e8c6880f55..f0c96bb518 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.alert.runner;
 import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.common.enums.AlertStatus;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.AlertDao;
 import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.dao.entity.Alert;
@@ -33,6 +34,7 @@ import org.apache.dolphinscheduler.spi.alert.AlertResult;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,9 +81,9 @@ public class AlertSender {
             }
             AlertData alertData = new AlertData();
             alertData.setId(alert.getId())
-                .setContent(alert.getContent())
-                .setLog(alert.getLog())
-                .setTitle(alert.getTitle());
+                    .setContent(alert.getContent())
+                    .setLog(alert.getLog())
+                    .setTitle(alert.getTitle());
 
             for (AlertPluginInstance instance : alertInstanceList) {
 
@@ -107,7 +109,7 @@ public class AlertSender {
         List<AlertPluginInstance> alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId);
         AlertData alertData = new AlertData();
         alertData.setContent(content)
-            .setTitle(title);
+                .setTitle(title);
 
         boolean sendResponseStatus = true;
         List<AlertSendResponseResult> sendResponseResults = new ArrayList<>();
@@ -126,7 +128,7 @@ public class AlertSender {
         for (AlertPluginInstance instance : alertInstanceList) {
             AlertResult alertResult = this.alertResultHandler(instance, alertData);
             AlertSendResponseResult alertSendResponseResult = new AlertSendResponseResult(
-                Boolean.parseBoolean(String.valueOf(alertResult.getStatus())), alertResult.getMessage());
+                    Boolean.parseBoolean(String.valueOf(alertResult.getStatus())), alertResult.getMessage());
             sendResponseStatus = sendResponseStatus && alertSendResponseResult.getStatus();
             sendResponseResults.add(alertSendResponseResult);
         }
@@ -156,7 +158,8 @@ public class AlertSender {
 
         AlertInfo alertInfo = new AlertInfo();
         alertInfo.setAlertData(alertData);
-        alertInfo.setAlertParams(instance.getPluginInstanceParams());
+        Map<String, String> paramsMap = JSONUtils.toMap(instance.getPluginInstanceParams());
+        alertInfo.setAlertParams(paramsMap);
         AlertResult alertResult = alertChannel.process(alertInfo);
 
         if (alertResult == null) {
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index 7e0b2578b7..6b0c358db9 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -33,6 +33,8 @@ import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
+import org.apache.commons.collections4.MapUtils;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -215,7 +217,7 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
             alertPluginInstanceVO.setAlertPluginName(pluginDefine.getPluginName());
             //todo List pages do not recommend returning this parameter
             String pluginParamsMapString = alertPluginInstance.getPluginInstanceParams();
-            String uiPluginParams=parseToPluginUiParams(pluginParamsMapString,pluginDefine.getPluginParams());
+            String uiPluginParams = parseToPluginUiParams(pluginParamsMapString, pluginDefine.getPluginParams());
             alertPluginInstanceVO.setPluginInstanceParams(uiPluginParams);
             alertPluginInstanceVOS.add(alertPluginInstanceVO);
         });
@@ -242,9 +244,10 @@ public class AlertPluginInstanceServiceImpl extends BaseService implements Alert
      * @return Complete parameters list(include ui)
      */
     private String parseToPluginUiParams(String pluginParamsMapString, String pluginUiParams) {
-        //todo npe
-        HashMap paramsMap = JSONUtils.parseObject(pluginParamsMapString, HashMap.class);
-        assert paramsMap != null;
+        Map<String, String> paramsMap = JSONUtils.toMap(pluginParamsMapString);
+        if (MapUtils.isEmpty(paramsMap)) {
+            return null;
+        }
         List<PluginParams> pluginParamsList = JSONUtils.toList(pluginUiParams, PluginParams.class);
         List<PluginParams> newPluginParamsList = new ArrayList<>(pluginParamsList.size());
         pluginParamsList.forEach(pluginParams -> {
diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertInfo.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertInfo.java
index c91428ce12..d6e54561e7 100644
--- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertInfo.java
+++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/alert/AlertInfo.java
@@ -17,6 +17,8 @@
 
 package org.apache.dolphinscheduler.spi.alert;
 
+import java.util.Map;
+
 /**
  * AlertInfo
  */
@@ -25,18 +27,18 @@ public class AlertInfo {
     /**
      * all params this plugin need is in alertProps
      */
-    private String alertParams;
+    private Map<String,String> alertParams;
 
     /**
      * the alert content
      */
     private AlertData alertData;
 
-    public String getAlertParams() {
+    public Map<String, String> getAlertParams() {
         return alertParams;
     }
 
-    public void setAlertParams(String alertParams) {
+    public void setAlertParams(Map<String, String> alertParams) {
         this.alertParams = alertParams;
     }
 

From 82340b311cc1055ae4e5c58a03d0445709927dc8 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 09:54:58 +0800
Subject: [PATCH 16/87] code style

---
 .../plugin/alert/dingtalk/DingTalkAlertChannel.java          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
index db83e396bf..6b13f24d86 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannel.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import java.util.Map;
 
@@ -35,8 +34,8 @@ public class DingTalkAlertChannel implements AlertChannel {
 
         AlertData alertData = alertInfo.getAlertData();
         Map<String, String> paramsMap = alertInfo.getAlertParams();
-        if(null==paramsMap){
-            return new AlertResult("false","ding talk params is null");
+        if (null == paramsMap) {
+            return new AlertResult("false", "ding talk params is null");
         }
         return new DingTalkSender(paramsMap).sendDingTalkMsg(alertData.getTitle(), alertData.getContent());
     }

From 81e2b82788d635c4085fad9723ad427b0f65e689 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 10:39:28 +0800
Subject: [PATCH 17/87] Store plug-in information when loading plug-in, query
 database when removing alert

---
 .../alert/plugin/AlertPluginManager.java       |  9 ++++++++-
 .../alert/runner/AlertSender.java              |  2 +-
 .../apache/dolphinscheduler/dao/PluginDao.java | 18 +++++++++---------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
index a660087c89..7b26a821c3 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
@@ -31,6 +31,7 @@ import org.apache.dolphinscheduler.spi.classloader.ThreadContextClassLoader;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -47,6 +48,11 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
     private final Map<String, AlertChannelFactory> alertChannelFactoryMap = new ConcurrentHashMap<>();
     private final Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
 
+    /**
+     * k->pluginDefineId v->pluginDefineName
+     */
+    public static Map<Integer, String> pluginDefineMap = new HashMap<>();
+
     public void addAlertChannelFactory(AlertChannelFactory alertChannelFactory) {
         requireNonNull(alertChannelFactory, "alertChannelFactory is null");
 
@@ -93,7 +99,8 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
             String paramsJson = PluginParamsTransfer.transferParamsToJson(params);
 
             PluginDefine pluginDefine = new PluginDefine(nameEn, PluginType.ALERT.getDesc(), paramsJson);
-            pluginDao.addOrUpdatePluginDefine(pluginDefine);
+            int id = pluginDao.addOrUpdatePluginDefine(pluginDefine);
+            pluginDefineMap.put(id, pluginDefine.getPluginName());
         }
     }
 }
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index f0c96bb518..7042a0dd37 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -144,7 +144,7 @@ public class AlertSender {
      * @return AlertResult
      */
     private AlertResult alertResultHandler(AlertPluginInstance instance, AlertData alertData) {
-        String pluginName = pluginDao.getPluginDefineById(instance.getPluginDefineId()).getPluginName();
+        String pluginName = AlertPluginManager.pluginDefineMap.get(instance.getPluginDefineId());
         AlertChannel alertChannel = alertPluginManager.getAlertChannelMap().get(pluginName);
         AlertResult alertResultExtend = new AlertResult();
         String pluginInstanceName = instance.getInstanceName();
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
index ab82997bc2..93df36aadc 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/PluginDao.java
@@ -58,22 +58,22 @@ public class PluginDao extends AbstractBaseDao {
      *
      * @param pluginDefine new pluginDefine
      */
-    public void addOrUpdatePluginDefine(PluginDefine pluginDefine) {
+    public int addOrUpdatePluginDefine(PluginDefine pluginDefine) {
         requireNonNull(pluginDefine, "pluginDefine is null");
         requireNonNull(pluginDefine.getPluginName(), "pluginName is null");
         requireNonNull(pluginDefine.getPluginType(), "pluginType is null");
 
         List<PluginDefine> pluginDefineList = pluginDefineMapper.queryByNameAndType(pluginDefine.getPluginName(), pluginDefine.getPluginType());
         if (pluginDefineList == null || pluginDefineList.size() == 0) {
-            pluginDefineMapper.insert(pluginDefine);
-        } else {
-            PluginDefine currPluginDefine = pluginDefineList.get(0);
-            if (!currPluginDefine.getPluginParams().equals(pluginDefine.getPluginParams())) {
-                currPluginDefine.setUpdateTime(pluginDefine.getUpdateTime());
-                currPluginDefine.setPluginParams(pluginDefine.getPluginParams());
-                pluginDefineMapper.updateById(currPluginDefine);
-            }
+            return pluginDefineMapper.insert(pluginDefine);
         }
+        PluginDefine currPluginDefine = pluginDefineList.get(0);
+        if (!currPluginDefine.getPluginParams().equals(pluginDefine.getPluginParams())) {
+            currPluginDefine.setUpdateTime(pluginDefine.getUpdateTime());
+            currPluginDefine.setPluginParams(pluginDefine.getPluginParams());
+            pluginDefineMapper.updateById(currPluginDefine);
+        }
+        return currPluginDefine.getId();
     }
 
     /**

From 40e3795becfa45cd5b8c320acae412770d664be8 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 11:18:52 +0800
Subject: [PATCH 18/87] Store plug-in information when loading plug-in, query
 database when removing alert Delete unused class

---
 .../AlertPluginDefineCache.java}              | 31 ++++++-----
 .../alert/manager/EmailManager.java           | 55 -------------------
 .../alert/plugin/AlertPluginManager.java      |  9 +--
 .../alert/runner/AlertSender.java             |  3 +-
 4 files changed, 20 insertions(+), 78 deletions(-)
 rename dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/{manager/MsgManager.java => cache/AlertPluginDefineCache.java} (60%)
 delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java
similarity index 60%
rename from dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java
index e7fb161162..5648ef2ad2 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java
@@ -15,26 +15,27 @@
  * limitations under the License.
  */
 
-package org.apache.dolphinscheduler.alert.manager;
+package org.apache.dolphinscheduler.alert.cache;
 
-import org.apache.dolphinscheduler.dao.entity.Alert;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+public class AlertPluginDefineCache {
 
-/**
- * SMS send manager
- */
-public class MsgManager {
-
-    private static final Logger logger = LoggerFactory.getLogger(MsgManager.class);
+    public AlertPluginDefineCache() {
+        throw new IllegalStateException("Utility class");
+    }
 
     /**
-     * SMS send
-     *
-     * @param alert the alert
+     * k->pluginDefineId v->pluginDefineName
      */
-    public void send(Alert alert) {
-        logger.info("send message {}", alert);
+    private static Map<Integer, String> pluginDefineMap = new HashMap<>();
+
+    public static void addPlugin(int id, String name) {
+        pluginDefineMap.put(id, name);
+    }
+
+    public static String getNameById(int id) {
+        return pluginDefineMap.get(id);
     }
 }
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
deleted file mode 100644
index 874b866759..0000000000
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *    http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package org.apache.dolphinscheduler.alert.manager;
-//
-//import org.apache.dolphinscheduler.alert.utils.MailUtils;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * email send manager
-// */
-//public class EmailManager {
-//    /**
-//     * email send
-//     * @param receiversList the receiver list
-//     * @param receiversCcList the cc List
-//     * @param title the title
-//     * @param content the content
-//     * @param showType the showType
-//     * @return the send result
-//     */
-//    public Map<String,Object> send(List<String> receiversList,List<String> receiversCcList,String title,String content,String showType){
-//
-//        return MailUtils.sendMails(receiversList, receiversCcList, title, content, showType);
-//    }
-//
-//    /**
-//     * msg send
-//     * @param receiversList the receiver list
-//     * @param title the title
-//     * @param content the content
-//     * @param showType the showType
-//     * @return the send result
-//     */
-//    public Map<String,Object> send(List<String> receiversList,String title,String content,String showType){
-//
-//        return MailUtils.sendMails(receiversList,title, content, showType);
-//    }
-//
-//}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
index 7b26a821c3..498fd757e9 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
@@ -22,6 +22,7 @@ import static java.util.Objects.requireNonNull;
 
 import static com.google.common.base.Preconditions.checkState;
 
+import org.apache.dolphinscheduler.alert.cache.AlertPluginDefineCache;
 import org.apache.dolphinscheduler.common.enums.PluginType;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
@@ -31,7 +32,6 @@ import org.apache.dolphinscheduler.spi.classloader.ThreadContextClassLoader;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,11 +48,6 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
     private final Map<String, AlertChannelFactory> alertChannelFactoryMap = new ConcurrentHashMap<>();
     private final Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
 
-    /**
-     * k->pluginDefineId v->pluginDefineName
-     */
-    public static Map<Integer, String> pluginDefineMap = new HashMap<>();
-
     public void addAlertChannelFactory(AlertChannelFactory alertChannelFactory) {
         requireNonNull(alertChannelFactory, "alertChannelFactory is null");
 
@@ -100,7 +95,7 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
 
             PluginDefine pluginDefine = new PluginDefine(nameEn, PluginType.ALERT.getDesc(), paramsJson);
             int id = pluginDao.addOrUpdatePluginDefine(pluginDefine);
-            pluginDefineMap.put(id, pluginDefine.getPluginName());
+            AlertPluginDefineCache.addPlugin(id, pluginDefine.getPluginName());
         }
     }
 }
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index fa260ba94d..0fc8dd07e1 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -17,6 +17,7 @@
 
 package org.apache.dolphinscheduler.alert.runner;
 
+import org.apache.dolphinscheduler.alert.cache.AlertPluginDefineCache;
 import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.common.enums.AlertStatus;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
@@ -145,7 +146,7 @@ public class AlertSender {
      * @return AlertResult
      */
     private AlertResult alertResultHandler(AlertPluginInstance instance, AlertData alertData) {
-        String pluginName = AlertPluginManager.pluginDefineMap.get(instance.getPluginDefineId());
+        String pluginName = AlertPluginDefineCache.getNameById(instance.getPluginDefineId());
         AlertChannel alertChannel = alertPluginManager.getAlertChannelMap().get(pluginName);
         AlertResult alertResultExtend = new AlertResult();
         String pluginInstanceName = instance.getInstanceName();

From a0725e93ee460d12e93d40e24b5c9ff72db1aede Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 11:57:39 +0800
Subject: [PATCH 19/87] fix ut error

---
 .../alert/cache/AlertPluginDefineCache.java   | 41 -------------------
 .../alert/plugin/AlertPluginManager.java      | 13 +++++-
 .../alert/runner/AlertSender.java             |  3 +-
 .../alert/AlertServerTest.java                |  2 +
 4 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java
deleted file mode 100644
index 5648ef2ad2..0000000000
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/cache/AlertPluginDefineCache.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.dolphinscheduler.alert.cache;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class AlertPluginDefineCache {
-
-    public AlertPluginDefineCache() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    /**
-     * k->pluginDefineId v->pluginDefineName
-     */
-    private static Map<Integer, String> pluginDefineMap = new HashMap<>();
-
-    public static void addPlugin(int id, String name) {
-        pluginDefineMap.put(id, name);
-    }
-
-    public static String getNameById(int id) {
-        return pluginDefineMap.get(id);
-    }
-}
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
index 498fd757e9..d795e71d52 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
@@ -22,7 +22,6 @@ import static java.util.Objects.requireNonNull;
 
 import static com.google.common.base.Preconditions.checkState;
 
-import org.apache.dolphinscheduler.alert.cache.AlertPluginDefineCache;
 import org.apache.dolphinscheduler.common.enums.PluginType;
 import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
@@ -32,6 +31,7 @@ import org.apache.dolphinscheduler.spi.classloader.ThreadContextClassLoader;
 import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 import org.apache.dolphinscheduler.spi.params.base.PluginParams;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,6 +48,11 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
     private final Map<String, AlertChannelFactory> alertChannelFactoryMap = new ConcurrentHashMap<>();
     private final Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
 
+    /**
+     * k->pluginDefineId v->pluginDefineName
+     */
+    private final Map<Integer, String> pluginDefineMap = new HashMap<>();
+
     public void addAlertChannelFactory(AlertChannelFactory alertChannelFactory) {
         requireNonNull(alertChannelFactory, "alertChannelFactory is null");
 
@@ -84,6 +89,10 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
         return alertChannelMap;
     }
 
+    public String getPluginNameById(int id) {
+        return pluginDefineMap.get(id);
+    }
+
     @Override
     public void installPlugin(DolphinSchedulerPlugin dolphinSchedulerPlugin) {
         for (AlertChannelFactory alertChannelFactory : dolphinSchedulerPlugin.getAlertChannelFactorys()) {
@@ -95,7 +104,7 @@ public class AlertPluginManager extends AbstractDolphinPluginManager {
 
             PluginDefine pluginDefine = new PluginDefine(nameEn, PluginType.ALERT.getDesc(), paramsJson);
             int id = pluginDao.addOrUpdatePluginDefine(pluginDefine);
-            AlertPluginDefineCache.addPlugin(id, pluginDefine.getPluginName());
+            pluginDefineMap.put(id, pluginDefine.getPluginName());
         }
     }
 }
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index 0fc8dd07e1..44a1047613 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -17,7 +17,6 @@
 
 package org.apache.dolphinscheduler.alert.runner;
 
-import org.apache.dolphinscheduler.alert.cache.AlertPluginDefineCache;
 import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.common.enums.AlertStatus;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
@@ -146,7 +145,7 @@ public class AlertSender {
      * @return AlertResult
      */
     private AlertResult alertResultHandler(AlertPluginInstance instance, AlertData alertData) {
-        String pluginName = AlertPluginDefineCache.getNameById(instance.getPluginDefineId());
+        String pluginName = alertPluginManager.getPluginNameById(instance.getPluginDefineId());
         AlertChannel alertChannel = alertPluginManager.getAlertChannelMap().get(pluginName);
         AlertResult alertResultExtend = new AlertResult();
         String pluginInstanceName = instance.getInstanceName();
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
index a8ead79be9..7293b485d6 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
@@ -34,6 +34,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -62,6 +63,7 @@ public class AlertServerTest {
         PowerMockito.whenNew(AlertPluginManager.class).withNoArguments().thenReturn(alertPluginManager);
         ConcurrentHashMap alertChannelMap = new ConcurrentHashMap<>();
         alertChannelMap.put("pluginName",alertChannelMock);
+        PowerMockito.when(alertPluginManager.getPluginNameById(Mockito.anyInt())).thenReturn("pluginName");
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
 
         DolphinPluginManagerConfig alertPluginManagerConfig = PowerMockito.mock(DolphinPluginManagerConfig.class);

From 65779f0912c479c70b0e89a21888c0282a08d157 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 12:29:34 +0800
Subject: [PATCH 20/87] fix ut error

---
 .../apache/dolphinscheduler/alert/runner/AlertSenderTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
index 2664bdcd29..e9fd5ac323 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
@@ -102,6 +102,7 @@ public class AlertSenderTest {
         Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
         alertChannelMap.put(pluginName,alertChannelMock);
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
+        PowerMockito.when(alertPluginManager.getPluginNameById(Mockito.anyInt())).thenReturn("alert-plugin-mail");
 
         alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertFalse(alertSendResponseCommand.getResStatus());
@@ -164,6 +165,7 @@ public class AlertSenderTest {
         String pluginName = "alert-plugin-mail";
         PluginDefine pluginDefine = new PluginDefine(pluginName,"1",null);
         PowerMockito.when(pluginDao.getPluginDefineById(pluginDefineId)).thenReturn(pluginDefine);
+        PowerMockito.when(alertPluginManager.getPluginNameById(1)).thenReturn("alert-instance-mail");
 
         AlertResult alertResult = new AlertResult();
         alertResult.setStatus(String.valueOf(true));

From 68770737779766b670e198714d739050a6d30e07 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 13:38:44 +0800
Subject: [PATCH 21/87] add ut

---
 .../dolphinscheduler/alert/AlertServer.java   |   2 +-
 .../processor/AlertRequestProcessor.java      |   4 +-
 .../alert/runner/AlertSender.java             |   7 +-
 .../alert/AlertServerTest.java                |   7 +-
 .../alert/plugin/EmailAlertPluginTest.java    |   2 +-
 .../alert/runner/AlertSenderTest.java         |  34 +++---
 .../AlertPluginInstanceServiceTest.java       | 109 +++++++++++++++++-
 7 files changed, 134 insertions(+), 31 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
index 54afc93442..0e6cab6c9c 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
@@ -133,7 +133,7 @@ public class AlertServer {
                 logger.warn("No Alert Plugin . Can not send alert info. ");
             } else {
                 List<Alert> alerts = alertDao.listWaitExecutionAlert();
-                alertSender = new AlertSender(alerts, alertDao, alertPluginManager, pluginDao);
+                alertSender = new AlertSender(alerts, alertDao, alertPluginManager);
                 alertSender.run();
             }
         }
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
index 5e8a8f89d6..e88778e3df 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 import io.netty.channel.Channel;
 
 /**
- *  alert request processor
+ * alert request processor
  */
 public class AlertRequestProcessor implements NettyRequestProcessor {
 
@@ -59,7 +59,7 @@ public class AlertRequestProcessor implements NettyRequestProcessor {
                 command.getBody(), AlertSendRequestCommand.class);
         logger.info("received command : {}", alertSendRequestCommand);
 
-        AlertSender alertSender = new AlertSender(alertDao, alertPluginManager, pluginDao);
+        AlertSender alertSender = new AlertSender(alertDao, alertPluginManager);
         AlertSendResponseCommand alertSendResponseCommand = alertSender.syncHandler(alertSendRequestCommand.getGroupId(), alertSendRequestCommand.getTitle(), alertSendRequestCommand.getContent());
         channel.writeAndFlush(alertSendResponseCommand.convert2Command(command.getOpaque()));
 
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index 44a1047613..304756efc6 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -48,25 +48,22 @@ public class AlertSender {
 
     private List<Alert> alertList;
     private AlertDao alertDao;
-    private PluginDao pluginDao;
     private AlertPluginManager alertPluginManager;
 
     public AlertSender(AlertPluginManager alertPluginManager) {
         this.alertPluginManager = alertPluginManager;
     }
 
-    public AlertSender(AlertDao alertDao, AlertPluginManager alertPluginManager, PluginDao pluginDao) {
+    public AlertSender(AlertDao alertDao, AlertPluginManager alertPluginManager) {
         super();
         this.alertDao = alertDao;
-        this.pluginDao = pluginDao;
         this.alertPluginManager = alertPluginManager;
     }
 
-    public AlertSender(List<Alert> alertList, AlertDao alertDao, AlertPluginManager alertPluginManager, PluginDao pluginDao) {
+    public AlertSender(List<Alert> alertList, AlertDao alertDao, AlertPluginManager alertPluginManager) {
         super();
         this.alertList = alertList;
         this.alertDao = alertDao;
-        this.pluginDao = pluginDao;
         this.alertPluginManager = alertPluginManager;
     }
 
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
index 7293b485d6..cdc779e35e 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/AlertServerTest.java
@@ -40,7 +40,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({AlertServer.class,DaoFactory.class})
+@PrepareForTest({AlertServer.class, DaoFactory.class})
 public class AlertServerTest {
 
     @Before
@@ -62,7 +62,7 @@ public class AlertServerTest {
         AlertPluginManager alertPluginManager = PowerMockito.mock(AlertPluginManager.class);
         PowerMockito.whenNew(AlertPluginManager.class).withNoArguments().thenReturn(alertPluginManager);
         ConcurrentHashMap alertChannelMap = new ConcurrentHashMap<>();
-        alertChannelMap.put("pluginName",alertChannelMock);
+        alertChannelMap.put("pluginName", alertChannelMock);
         PowerMockito.when(alertPluginManager.getPluginNameById(Mockito.anyInt())).thenReturn("pluginName");
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
 
@@ -81,7 +81,8 @@ public class AlertServerTest {
         Assert.assertNotNull(alertServer);
 
         new Thread(() -> {
-            alertServer.start(); })
+            alertServer.start();
+        })
                 .start();
 
         Thread.sleep(5 * Constants.ALERT_SCAN_INTERVAL);
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
index 3983545140..4f428d4667 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java
@@ -136,7 +136,7 @@ public class EmailAlertPluginTest {
         alertPluginInstance.setPluginInstanceParams(getEmailAlertParams());
         alertDao.getAlertPluginInstanceMapper().insert(alertPluginInstance);
 
-        AlertSender alertSender = new AlertSender(alertList, alertDao, alertPluginManager, pluginDao);
+        AlertSender alertSender = new AlertSender(alertList, alertDao, alertPluginManager);
         alertSender.run();
 
         Alert alertResult = alertDao.getAlertMapper().selectById(alert1.getId());
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
index e9fd5ac323..3b84bdbe67 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderTest.java
@@ -67,7 +67,7 @@ public class AlertSenderTest {
         int alertGroupId = 1;
         String title = "alert mail test title";
         String content = "alert mail test content";
-        alertSender = new AlertSender(alertDao,alertPluginManager,pluginDao);
+        alertSender = new AlertSender(alertDao, alertPluginManager);
 
         //1.alert instance does not exist
         PowerMockito.when(alertDao.listInstanceByAlertGroupId(alertGroupId)).thenReturn(null);
@@ -75,7 +75,7 @@ public class AlertSenderTest {
         AlertSendResponseCommand alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertFalse(alertSendResponseCommand.getResStatus());
         alertSendResponseCommand.getResResults().forEach(result ->
-                logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage()));
+                logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage()));
 
         //2.alert plugin does not exist
         int pluginDefineId = 1;
@@ -83,31 +83,31 @@ public class AlertSenderTest {
         String pluginInstanceName = "alert-instance-mail";
         List<AlertPluginInstance> alertInstanceList = new ArrayList<>();
         AlertPluginInstance alertPluginInstance = new AlertPluginInstance(
-                pluginDefineId,pluginInstanceParams,pluginInstanceName);
+                pluginDefineId, pluginInstanceParams, pluginInstanceName);
         alertInstanceList.add(alertPluginInstance);
         PowerMockito.when(alertDao.listInstanceByAlertGroupId(1)).thenReturn(alertInstanceList);
 
         String pluginName = "alert-plugin-mail";
-        PluginDefine pluginDefine = new PluginDefine(pluginName,"1",null);
+        PluginDefine pluginDefine = new PluginDefine(pluginName, "1", null);
         PowerMockito.when(pluginDao.getPluginDefineById(pluginDefineId)).thenReturn(pluginDefine);
 
         alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertFalse(alertSendResponseCommand.getResStatus());
         alertSendResponseCommand.getResResults().forEach(result ->
-                logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage()));
+                logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage()));
 
         //3.alert result value is null
         AlertChannel alertChannelMock = PowerMockito.mock(AlertChannel.class);
         PowerMockito.when(alertChannelMock.process(Mockito.any())).thenReturn(null);
         Map<String, AlertChannel> alertChannelMap = new ConcurrentHashMap<>();
-        alertChannelMap.put(pluginName,alertChannelMock);
+        alertChannelMap.put(pluginName, alertChannelMock);
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
         PowerMockito.when(alertPluginManager.getPluginNameById(Mockito.anyInt())).thenReturn("alert-plugin-mail");
 
         alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertFalse(alertSendResponseCommand.getResStatus());
         alertSendResponseCommand.getResResults().forEach(result ->
-                logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage()));
+                logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage()));
 
         //4.abnormal information inside the alert plug-in code
         AlertResult alertResult = new AlertResult();
@@ -115,27 +115,27 @@ public class AlertSenderTest {
         alertResult.setMessage("Abnormal information inside the alert plug-in code");
         PowerMockito.when(alertChannelMock.process(Mockito.any())).thenReturn(alertResult);
         alertChannelMap = new ConcurrentHashMap<>();
-        alertChannelMap.put(pluginName,alertChannelMock);
+        alertChannelMap.put(pluginName, alertChannelMock);
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
 
         alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertFalse(alertSendResponseCommand.getResStatus());
         alertSendResponseCommand.getResResults().forEach(result ->
-                logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage()));
+                logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage()));
 
         //5.alert plugin send success
         alertResult = new AlertResult();
         alertResult.setStatus(String.valueOf(true));
-        alertResult.setMessage(String.format("Alert Plugin %s send success",pluginInstanceName));
+        alertResult.setMessage(String.format("Alert Plugin %s send success", pluginInstanceName));
         PowerMockito.when(alertChannelMock.process(Mockito.any())).thenReturn(alertResult);
         alertChannelMap = new ConcurrentHashMap<>();
-        alertChannelMap.put(pluginName,alertChannelMock);
+        alertChannelMap.put(pluginName, alertChannelMock);
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
 
         alertSendResponseCommand = alertSender.syncHandler(alertGroupId, title, content);
         Assert.assertTrue(alertSendResponseCommand.getResStatus());
         alertSendResponseCommand.getResResults().forEach(result ->
-                logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage()));
+                logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage()));
 
     }
 
@@ -151,29 +151,29 @@ public class AlertSenderTest {
         alert.setContent(content);
         alertList.add(alert);
 
-        alertSender = new AlertSender(alertList,alertDao,alertPluginManager,pluginDao);
+        alertSender = new AlertSender(alertList, alertDao, alertPluginManager);
 
         int pluginDefineId = 1;
         String pluginInstanceParams = "alert-instance-mail-params";
         String pluginInstanceName = "alert-instance-mail";
         List<AlertPluginInstance> alertInstanceList = new ArrayList<>();
         AlertPluginInstance alertPluginInstance = new AlertPluginInstance(
-                pluginDefineId,pluginInstanceParams,pluginInstanceName);
+                pluginDefineId, pluginInstanceParams, pluginInstanceName);
         alertInstanceList.add(alertPluginInstance);
         PowerMockito.when(alertDao.listInstanceByAlertGroupId(alertGroupId)).thenReturn(alertInstanceList);
 
         String pluginName = "alert-plugin-mail";
-        PluginDefine pluginDefine = new PluginDefine(pluginName,"1",null);
+        PluginDefine pluginDefine = new PluginDefine(pluginName, "1", null);
         PowerMockito.when(pluginDao.getPluginDefineById(pluginDefineId)).thenReturn(pluginDefine);
         PowerMockito.when(alertPluginManager.getPluginNameById(1)).thenReturn("alert-instance-mail");
 
         AlertResult alertResult = new AlertResult();
         alertResult.setStatus(String.valueOf(true));
-        alertResult.setMessage(String.format("Alert Plugin %s send success",pluginInstanceName));
+        alertResult.setMessage(String.format("Alert Plugin %s send success", pluginInstanceName));
         AlertChannel alertChannelMock = PowerMockito.mock(AlertChannel.class);
         PowerMockito.when(alertChannelMock.process(Mockito.any())).thenReturn(alertResult);
         ConcurrentHashMap alertChannelMap = new ConcurrentHashMap<>();
-        alertChannelMap.put(pluginName,alertChannelMock);
+        alertChannelMap.put(pluginName, alertChannelMock);
         PowerMockito.when(alertPluginManager.getAlertChannelMap()).thenReturn(alertChannelMap);
         Assert.assertTrue(Boolean.parseBoolean(alertResult.getStatus()));
         alertSender.run();
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 7d25fb5e6a..49593ad275 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -22,6 +22,7 @@ import org.apache.dolphinscheduler.api.service.impl.AlertPluginInstanceServiceIm
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
+import org.apache.dolphinscheduler.dao.entity.PluginDefine;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
@@ -29,6 +30,7 @@ import org.apache.dolphinscheduler.dao.mapper.PluginDefineMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -60,6 +62,82 @@ public class AlertPluginInstanceServiceTest {
 
     private User user;
 
+    private String uiParams="[\n"
+            + "    {\n"
+            + "        \"field\":\"userParams\",\n"
+            + "        \"name\":\"user.params\",\n"
+            + "        \"props\":{\n"
+            + "            \"placeholder\":\"please enter your custom parameters, which will be passed to you when calling your script\",\n"
+            + "            \"size\":\"small\"\n"
+            + "        },\n"
+            + "        \"type\":\"input\",\n"
+            + "        \"title\":\"user.params\",\n"
+            + "        \"value\":\"userParams\",\n"
+            + "        \"validate\":[\n"
+            + "            {\n"
+            + "                \"required\":false,\n"
+            + "                \"message\":null,\n"
+            + "                \"type\":\"string\",\n"
+            + "                \"trigger\":\"blur\",\n"
+            + "                \"min\":null,\n"
+            + "                \"max\":null\n"
+            + "            }\n"
+            + "        ]\n"
+            + "    },\n"
+            + "    {\n"
+            + "        \"field\":\"path\",\n"
+            + "        \"name\":\"path\",\n"
+            + "        \"props\":{\n"
+            + "            \"placeholder\":\"please upload the file to the disk directory of the alert server, and ensure that the path is absolute and has the corresponding access rights\",\n"
+            + "            \"size\":\"small\"\n"
+            + "        },\n"
+            + "        \"type\":\"input\",\n"
+            + "        \"title\":\"path\",\n"
+            + "        \"value\":\"/kris/script/path\",\n"
+            + "        \"validate\":[\n"
+            + "            {\n"
+            + "                \"required\":true,\n"
+            + "                \"message\":null,\n"
+            + "                \"type\":\"string\",\n"
+            + "                \"trigger\":\"blur\",\n"
+            + "                \"min\":null,\n"
+            + "                \"max\":null\n"
+            + "            }\n"
+            + "        ]\n"
+            + "    },\n"
+            + "    {\n"
+            + "        \"field\":\"type\",\n"
+            + "        \"name\":\"type\",\n"
+            + "        \"props\":{\n"
+            + "            \"placeholder\":null,\n"
+            + "            \"size\":\"small\"\n"
+            + "        },\n"
+            + "        \"type\":\"radio\",\n"
+            + "        \"title\":\"type\",\n"
+            + "        \"value\":0,\n"
+            + "        \"validate\":[\n"
+            + "            {\n"
+            + "                \"required\":true,\n"
+            + "                \"message\":null,\n"
+            + "                \"type\":\"string\",\n"
+            + "                \"trigger\":\"blur\",\n"
+            + "                \"min\":null,\n"
+            + "                \"max\":null\n"
+            + "            }\n"
+            + "        ],\n"
+            + "        \"options\":[\n"
+            + "            {\n"
+            + "                \"label\":\"SHELL\",\n"
+            + "                \"value\":0,\n"
+            + "                \"disabled\":false\n"
+            + "            }\n"
+            + "        ]\n"
+            + "    }\n"
+            + "]\n"
+            + "\n";
+
+    private String paramsMap="{\"path\":\"/kris/script/path\",\"userParams\":\"userParams\",\"type\":\"0\"}";
+
     @Before
     public void before() {
         user = new User();
@@ -77,10 +155,10 @@ public class AlertPluginInstanceServiceTest {
     @Test
     public void testCreate() {
         Mockito.when(alertPluginInstanceMapper.queryByInstanceName("test")).thenReturn(alertPluginInstances);
-        Map<String, Object> result = alertPluginInstanceService.create(user, 1, "test", "test params");
+        Map<String, Object> result = alertPluginInstanceService.create(user, 1, "test", uiParams);
         Assert.assertEquals(Status.PLUGIN_INSTANCE_ALREADY_EXIT, result.get(Constants.STATUS));
         Mockito.when(alertPluginInstanceMapper.insert(Mockito.any())).thenReturn(1);
-        result = alertPluginInstanceService.create(user, 1, "test1", "test params");
+        result = alertPluginInstanceService.create(user, 1, "test1", uiParams);
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
     }
 
@@ -96,4 +174,31 @@ public class AlertPluginInstanceServiceTest {
 
     }
 
+    @Test
+    public void testUpdate(){
+        Mockito.when(alertPluginInstanceMapper.updateById(Mockito.any())).thenReturn(0);
+        Map<String, Object> result= alertPluginInstanceService.update(user,1,"testUpdate",uiParams);
+        Assert.assertEquals(Status.SAVE_ERROR, result.get(Constants.STATUS));
+        Mockito.when(alertPluginInstanceMapper.updateById(Mockito.any())).thenReturn(1);
+        result= alertPluginInstanceService.update(user,1,"testUpdate",uiParams);
+        Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+    }
+
+    @Test
+    public  void testQueryAll(){
+        AlertPluginInstance alertPluginInstance=new AlertPluginInstance();
+        alertPluginInstance.setId(1);
+        alertPluginInstance.setPluginDefineId(1);
+        alertPluginInstance.setPluginInstanceParams(paramsMap);
+        alertPluginInstance.setInstanceName("test");
+        PluginDefine pluginDefine=new PluginDefine("script","script",uiParams);
+        pluginDefine.setId(1);
+        List<PluginDefine> pluginDefines= Collections.singletonList(pluginDefine);
+        List<AlertPluginInstance> pluginInstanceList= Collections.singletonList(alertPluginInstance);
+        Mockito.when(alertPluginInstanceMapper.queryAllAlertPluginInstanceList()).thenReturn(pluginInstanceList);
+        Mockito.when(pluginDefineMapper.queryAllPluginDefineList()).thenReturn(pluginDefines);
+        Map<String, Object> result = alertPluginInstanceService.queryAll();
+        Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+    }
+
 }

From 8300444f23d9b4e23cbe919ebd3436410fe3937a Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 13:43:14 +0800
Subject: [PATCH 22/87] code style

---
 .../AlertPluginInstanceServiceTest.java       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
index 49593ad275..fb58070304 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceServiceTest.java
@@ -62,7 +62,7 @@ public class AlertPluginInstanceServiceTest {
 
     private User user;
 
-    private String uiParams="[\n"
+    private String uiParams = "[\n"
             + "    {\n"
             + "        \"field\":\"userParams\",\n"
             + "        \"name\":\"user.params\",\n"
@@ -136,7 +136,7 @@ public class AlertPluginInstanceServiceTest {
             + "]\n"
             + "\n";
 
-    private String paramsMap="{\"path\":\"/kris/script/path\",\"userParams\":\"userParams\",\"type\":\"0\"}";
+    private String paramsMap = "{\"path\":\"/kris/script/path\",\"userParams\":\"userParams\",\"type\":\"0\"}";
 
     @Before
     public void before() {
@@ -175,26 +175,26 @@ public class AlertPluginInstanceServiceTest {
     }
 
     @Test
-    public void testUpdate(){
+    public void testUpdate() {
         Mockito.when(alertPluginInstanceMapper.updateById(Mockito.any())).thenReturn(0);
-        Map<String, Object> result= alertPluginInstanceService.update(user,1,"testUpdate",uiParams);
+        Map<String, Object> result = alertPluginInstanceService.update(user, 1, "testUpdate", uiParams);
         Assert.assertEquals(Status.SAVE_ERROR, result.get(Constants.STATUS));
         Mockito.when(alertPluginInstanceMapper.updateById(Mockito.any())).thenReturn(1);
-        result= alertPluginInstanceService.update(user,1,"testUpdate",uiParams);
+        result = alertPluginInstanceService.update(user, 1, "testUpdate", uiParams);
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
     }
 
     @Test
-    public  void testQueryAll(){
-        AlertPluginInstance alertPluginInstance=new AlertPluginInstance();
+    public void testQueryAll() {
+        AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
         alertPluginInstance.setId(1);
         alertPluginInstance.setPluginDefineId(1);
         alertPluginInstance.setPluginInstanceParams(paramsMap);
         alertPluginInstance.setInstanceName("test");
-        PluginDefine pluginDefine=new PluginDefine("script","script",uiParams);
+        PluginDefine pluginDefine = new PluginDefine("script", "script", uiParams);
         pluginDefine.setId(1);
-        List<PluginDefine> pluginDefines= Collections.singletonList(pluginDefine);
-        List<AlertPluginInstance> pluginInstanceList= Collections.singletonList(alertPluginInstance);
+        List<PluginDefine> pluginDefines = Collections.singletonList(pluginDefine);
+        List<AlertPluginInstance> pluginInstanceList = Collections.singletonList(alertPluginInstance);
         Mockito.when(alertPluginInstanceMapper.queryAllAlertPluginInstanceList()).thenReturn(pluginInstanceList);
         Mockito.when(pluginDefineMapper.queryAllPluginDefineList()).thenReturn(pluginDefines);
         Map<String, Object> result = alertPluginInstanceService.queryAll();

From 9072e88e27d51bb4fc5ccbe121d8cd531f416626 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Fri, 29 Jan 2021 14:03:37 +0800
Subject: [PATCH 23/87] removed unused fields

---
 .../apache/dolphinscheduler/alert/AlertServer.java    |  5 +----
 .../alert/processor/AlertRequestProcessor.java        |  5 +----
 .../dolphinscheduler/alert/runner/AlertSender.java    |  1 -
 .../alert/processor/AlertRequestProcessorTest.java    | 11 ++++-------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
index 0e6cab6c9c..b25cd57f4c 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
@@ -29,7 +29,6 @@ import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.dao.AlertDao;
 import org.apache.dolphinscheduler.dao.DaoFactory;
-import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.dao.entity.Alert;
 import org.apache.dolphinscheduler.remote.NettyRemotingServer;
 import org.apache.dolphinscheduler.remote.command.CommandType;
@@ -53,8 +52,6 @@ public class AlertServer {
      */
     private AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
 
-    private PluginDao pluginDao = DaoFactory.getDaoInstance(PluginDao.class);
-
     private AlertSender alertSender;
 
     private static AlertServer instance;
@@ -114,7 +111,7 @@ public class AlertServer {
         NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(ALERT_RPC_PORT);
         this.server = new NettyRemotingServer(serverConfig);
-        this.server.registerProcessor(CommandType.ALERT_SEND_REQUEST, new AlertRequestProcessor(alertDao, alertPluginManager, pluginDao));
+        this.server.registerProcessor(CommandType.ALERT_SEND_REQUEST, new AlertRequestProcessor(alertDao, alertPluginManager));
         this.server.start();
     }
 
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
index e88778e3df..ec716d9878 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessor.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.alert.runner.AlertSender;
 import org.apache.dolphinscheduler.common.utils.Preconditions;
 import org.apache.dolphinscheduler.dao.AlertDao;
-import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.remote.command.Command;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.command.alert.AlertSendRequestCommand;
@@ -41,12 +40,10 @@ public class AlertRequestProcessor implements NettyRequestProcessor {
 
     private final Logger logger = LoggerFactory.getLogger(AlertRequestProcessor.class);
     private AlertDao alertDao;
-    private PluginDao pluginDao;
     private AlertPluginManager alertPluginManager;
 
-    public AlertRequestProcessor(AlertDao alertDao, AlertPluginManager alertPluginManager, PluginDao pluginDao) {
+    public AlertRequestProcessor(AlertDao alertDao, AlertPluginManager alertPluginManager) {
         this.alertDao = alertDao;
-        this.pluginDao = pluginDao;
         this.alertPluginManager = alertPluginManager;
     }
 
diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index 304756efc6..7ab29e1001 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -22,7 +22,6 @@ import org.apache.dolphinscheduler.common.enums.AlertStatus;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.AlertDao;
-import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.dao.entity.Alert;
 import org.apache.dolphinscheduler.dao.entity.AlertPluginInstance;
 import org.apache.dolphinscheduler.remote.command.alert.AlertSendResponseCommand;
diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
index 0126eb3dae..052d2f3d55 100644
--- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
+++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/processor/AlertRequestProcessorTest.java
@@ -19,7 +19,6 @@ package org.apache.dolphinscheduler.alert.processor;
 
 import org.apache.dolphinscheduler.alert.plugin.AlertPluginManager;
 import org.apache.dolphinscheduler.dao.AlertDao;
-import org.apache.dolphinscheduler.dao.PluginDao;
 import org.apache.dolphinscheduler.remote.command.Command;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.command.alert.AlertSendRequestCommand;
@@ -37,7 +36,6 @@ import io.netty.channel.Channel;
 public class AlertRequestProcessorTest {
 
     private AlertDao alertDao;
-    private PluginDao pluginDao;
     private AlertPluginManager alertPluginManager;
 
     private AlertRequestProcessor alertRequestProcessor;
@@ -45,17 +43,16 @@ public class AlertRequestProcessorTest {
     @Before
     public void before() {
         alertDao = PowerMockito.mock(AlertDao.class);
-        pluginDao = PowerMockito.mock(PluginDao.class);
         alertPluginManager = PowerMockito.mock(AlertPluginManager.class);
-        alertRequestProcessor = new AlertRequestProcessor(alertDao,alertPluginManager,pluginDao);
+        alertRequestProcessor = new AlertRequestProcessor(alertDao, alertPluginManager);
     }
 
     @Test
     public void testProcess() {
         Channel channel = PowerMockito.mock(Channel.class);
-        AlertSendRequestCommand alertSendRequestCommand = new AlertSendRequestCommand(1,"title","content");
+        AlertSendRequestCommand alertSendRequestCommand = new AlertSendRequestCommand(1, "title", "content");
         Command reqCommand = alertSendRequestCommand.convert2Command();
-        Assert.assertEquals(CommandType.ALERT_SEND_REQUEST,reqCommand.getType());
-        alertRequestProcessor.process(channel,reqCommand);
+        Assert.assertEquals(CommandType.ALERT_SEND_REQUEST, reqCommand.getType());
+        alertRequestProcessor.process(channel, reqCommand);
     }
 }

From afd201e6fa50700cf16aad2a292e61c4e5b6e5f9 Mon Sep 17 00:00:00 2001
From: zt-1997 <41983395+zt-1997@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:54:39 +0800
Subject: [PATCH 24/87] [FIX-#4592]Fix that the worker group management IP is
 not displayed correctly. (#4620)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: zt-1997 <“18841012545@163.com”>
---
 .../1.3.3/configuration/dolphin-worker.xml    | 109 ++++++++++--------
 .../api/service/WorkerGroupService.java       |  12 +-
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml b/ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml
index 1ae7a1a765..e5a3adf9f6 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml
@@ -15,53 +15,64 @@
   ~ limitations under the License.
   -->
 <configuration>
-	<property>
-		<name>worker.exec.threads</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description>worker execute thread num</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.heartbeat.interval</name>
-		<value>10</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description>worker heartbeat interval</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.max.cpuload.avg</name>
-		<value>100</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description>only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.reserved.memory</name>
-		<value>0.3</value>
-		<description>only larger than reserved memory, worker server can work. default value : physical memory * 1/10, unit is G.</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-
-	<property>
-		<name>worker.listen.port</name>
-		<value>1234</value>
-		<value-attributes>
-			<type>int</type>
-		</value-attributes>
-		<description>worker listen port</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
-	<property>
-		<name>worker.groups</name>
-		<value>default</value>
-		<description>default worker group</description>
-		<on-ambari-upgrade add="true"/>
-	</property>
+    <property>
+        <name>worker.exec.threads</name>
+        <value>100</value>
+        <value-attributes>
+            <type>int</type>
+        </value-attributes>
+        <description>worker execute thread num</description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.heartbeat.interval</name>
+        <value>10</value>
+        <value-attributes>
+            <type>int</type>
+        </value-attributes>
+        <description>worker heartbeat interval</description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.max.cpuload.avg</name>
+        <value>100</value>
+        <value-attributes>
+            <type>int</type>
+        </value-attributes>
+        <description>only less than cpu avg load, worker server can work. default value : the number of cpu cores * 2
+        </description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.reserved.memory</name>
+        <value>0.3</value>
+        <description>only larger than reserved memory, worker server can work. default value : physical memory * 1/10,
+            unit is G.
+        </description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.listen.port</name>
+        <value>1234</value>
+        <value-attributes>
+            <type>int</type>
+        </value-attributes>
+        <description>worker listen port</description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.groups</name>
+        <value>default</value>
+        <description>default worker group</description>
+        <on-ambari-upgrade add="true"/>
+    </property>
+    <property>
+        <name>worker.weigth</name>
+        <value>100</value>
+        <value-attributes>
+            <type>int</type>
+        </value-attributes>
+        <description>worker weight</description>
+        <on-ambari-upgrade add="true"/>
+    </property>
 </configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
index 83cbd197cd..1c634a9cd2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
@@ -153,19 +153,21 @@ public class WorkerGroupService extends BaseService {
             }
         }
 
-        // available workerGroup list
-        List<String> availableWorkerGroupList = new ArrayList<>();
-
         for (String workerGroup : workerGroupList) {
             String workerGroupPath = workerPath + "/" + workerGroup;
             List<String> childrenNodes = zookeeperCachedOperator.getChildrenKeys(workerGroupPath);
+            String timeStamp = "";
+            for (int i = 0; i < childrenNodes.size(); i++) {
+                String ip = childrenNodes.get(i);
+                childrenNodes.set(i, ip.substring(0, ip.lastIndexOf(":")));
+                timeStamp = ip.substring(ip.lastIndexOf(":"));
+            }
             if (CollectionUtils.isNotEmpty(childrenNodes)) {
-                availableWorkerGroupList.add(workerGroup);
                 WorkerGroup wg = new WorkerGroup();
                 wg.setName(workerGroup);
                 if (isPaging) {
                     wg.setIpList(childrenNodes);
-                    String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
+                    String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0) + timeStamp);
                     wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));
                     wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));
                 }

From e083e28720a5cd5f4b2c1f8916c26a6089e7fa4e Mon Sep 17 00:00:00 2001
From: Segun Ogundipe <davephenoms@gmail.com>
Date: Fri, 29 Jan 2021 12:44:33 +0100
Subject: [PATCH 25/87] [Improvement][service] Refactor service module to fix
 code smell (#4513)

* chore: Refactor code to fix code smell in service module

* chore: Add licence header to new files

* chore: Fix comment from code review

* chore[service]: Reduce the number of custom runtime exception to one
---
 .../common/utils/StringUtils.java             |   4 +
 .../bean/SpringApplicationContext.java        |   5 +-
 .../service/exceptions/ServiceException.java  |  52 ++
 .../service/permission/PermissionCheck.java   |  48 +-
 .../service/process/ProcessService.java       | 307 ++++-----
 .../service/quartz/ProcessScheduleJob.java    |  15 +-
 .../service/quartz/QuartzExecutors.java       | 614 ++++++++++--------
 .../service/quartz/cron/AbstractCycle.java    | 302 +++++----
 .../service/zk/AbstractZKClient.java          | 611 ++++++++---------
 .../service/zk/CuratorZookeeperClient.java    |  22 +-
 .../dolphinscheduler/service/zk/ZKServer.java |  37 +-
 .../service/zk/ZookeeperCachedOperator.java   |  20 +-
 .../service/zk/ZookeeperOperator.java         |  45 +-
 13 files changed, 1095 insertions(+), 987 deletions(-)
 create mode 100644 dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/ServiceException.java

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
index 6e32d12df3..362c6130f4 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
@@ -61,4 +61,8 @@ public class StringUtils {
     public static String trim(String str) {
         return str == null ? null : str.trim();
     }
+
+    public static boolean equalsIgnoreCase(String str1, String str2) {
+        return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
+    }
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/bean/SpringApplicationContext.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/bean/SpringApplicationContext.java
index ddf1fecf76..484b837d70 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/bean/SpringApplicationContext.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/bean/SpringApplicationContext.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.bean;
 
 import org.springframework.beans.BeansException;
@@ -31,9 +32,7 @@ public class SpringApplicationContext implements ApplicationContextAware {
         SpringApplicationContext.applicationContext = applicationContext;
     }
 
-    public static <T> T getBean(Class<T> requiredType){
+    public static <T> T getBean(Class<T> requiredType) {
         return applicationContext.getBean(requiredType);
     }
-
-
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/ServiceException.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/ServiceException.java
new file mode 100644
index 0000000000..4465970678
--- /dev/null
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/exceptions/ServiceException.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.service.exceptions;
+
+/**
+ * Custom ZKServerException exception
+ */
+public class ServiceException extends RuntimeException {
+
+    /**
+     * Construct a new runtime exception with the error message
+     *
+     * @param errMsg Error message
+     */
+    public ServiceException(String errMsg) {
+        super(errMsg);
+    }
+
+    /**
+     * Construct a new runtime exception with the cause
+     *
+     * @param cause cause
+     */
+    public ServiceException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Construct a new runtime exception with the detail message and cause
+     *
+     * @param errMsg message
+     * @param cause cause
+     */
+    public ServiceException(String errMsg, Throwable cause) {
+        super(errMsg, cause);
+    }
+}
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/permission/PermissionCheck.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/permission/PermissionCheck.java
index 1a9295bb10..a8f73f0c97 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/permission/PermissionCheck.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/permission/PermissionCheck.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.permission;
 
 import org.apache.dolphinscheduler.common.enums.AuthorizationType;
@@ -21,11 +22,13 @@ import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.common.process.ResourceInfo;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
 import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.slf4j.Logger;
 
 import java.util.List;
 
+import org.slf4j.Logger;
+
 public class PermissionCheck<T> {
     /**
      * logger
@@ -58,8 +61,9 @@ public class PermissionCheck<T> {
 
     /**
      * permission check
+     *
      * @param authorizationType authorization type
-     * @param processService        process dao
+     * @param processService process dao
      */
     public PermissionCheck(AuthorizationType authorizationType, ProcessService processService) {
         this.authorizationType = authorizationType;
@@ -68,10 +72,6 @@ public class PermissionCheck<T> {
 
     /**
      * permission check
-     * @param authorizationType
-     * @param processService
-     * @param needChecks
-     * @param userId
      */
     public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId) {
         this.authorizationType = authorizationType;
@@ -82,11 +82,6 @@ public class PermissionCheck<T> {
 
     /**
      * permission check
-     * @param authorizationType
-     * @param processService
-     * @param needChecks
-     * @param userId
-     * @param logger
      */
     public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId, Logger logger) {
         this.authorizationType = authorizationType;
@@ -98,13 +93,8 @@ public class PermissionCheck<T> {
 
     /**
      * permission check
-     * @param logger
-     * @param authorizationType
-     * @param processService
-     * @param resourceList
-     * @param userId
      */
-    public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, List<ResourceInfo> resourceList, int userId,Logger logger) {
+    public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, List<ResourceInfo> resourceList, int userId, Logger logger) {
         this.authorizationType = authorizationType;
         this.processService = processService;
         this.resourceList = resourceList;
@@ -154,9 +144,10 @@ public class PermissionCheck<T> {
 
     /**
      * has permission
+     *
      * @return true if has permission
      */
-    public boolean hasPermission(){
+    public boolean hasPermission() {
         try {
             checkPermission();
             return true;
@@ -167,23 +158,24 @@ public class PermissionCheck<T> {
 
     /**
      * check permission
-     * @throws Exception exception
+     *
+     * @throws ServiceException exception
      */
-    public void checkPermission() throws Exception{
-        if(this.needChecks.length > 0){
+    public void checkPermission() throws ServiceException {
+        if (this.needChecks.length > 0) {
 
             // get user type in order to judge whether the user is admin
             User user = processService.getUserById(userId);
             if (user == null) {
-                logger.error("user id {} didn't exist",userId);
-                throw new RuntimeException(String.format("user %s didn't exist",userId));
+                logger.error("user id {} doesn't exist", userId);
+                throw new ServiceException(String.format("user %s doesn't exist", userId));
             }
-            if (user.getUserType() != UserType.ADMIN_USER){
-                List<T> unauthorizedList = processService.listUnauthorized(userId,needChecks,authorizationType);
+            if (user.getUserType() != UserType.ADMIN_USER) {
+                List<T> unauthorizedList = processService.listUnauthorized(userId, needChecks, authorizationType);
                 // if exist unauthorized resource
-                if(CollectionUtils.isNotEmpty(unauthorizedList)){
-                    logger.error("user {} didn't has permission of {}: {}", user.getUserName(), authorizationType.getDescp(),unauthorizedList);
-                    throw new RuntimeException(String.format("user %s didn't has permission of %s %s", user.getUserName(), authorizationType.getDescp(), unauthorizedList.get(0)));
+                if (CollectionUtils.isNotEmpty(unauthorizedList)) {
+                    logger.error("user {} doesn't have permission of {}: {}", user.getUserName(), authorizationType.getDescp(), unauthorizedList);
+                    throw new ServiceException(String.format("user %s doesn't have permission of %s %s", user.getUserName(), authorizationType.getDescp(), unauthorizedList.get(0)));
                 }
             }
         }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index cfe649d74f..7c305097ff 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -84,6 +84,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -110,11 +111,11 @@ public class ProcessService {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final int[] stateArray = new int[] {ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
-        ExecutionStatus.RUNNING_EXECUTION.ordinal(),
-        ExecutionStatus.DELAY_EXECUTION.ordinal(),
-        ExecutionStatus.READY_PAUSE.ordinal(),
-        ExecutionStatus.READY_STOP.ordinal()};
+    private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
+            ExecutionStatus.RUNNING_EXECUTION.ordinal(),
+            ExecutionStatus.DELAY_EXECUTION.ordinal(),
+            ExecutionStatus.READY_PAUSE.ordinal(),
+            ExecutionStatus.READY_STOP.ordinal()};
 
     @Autowired
     private UserMapper userMapper;
@@ -158,16 +159,16 @@ public class ProcessService {
     /**
      * handle Command (construct ProcessInstance from Command) , wrapped in transaction
      *
-     * @param logger         logger
-     * @param host           host
+     * @param logger logger
+     * @param host host
      * @param validThreadNum validThreadNum
-     * @param command        found command
+     * @param command found command
      * @return process instance
      */
     @Transactional(rollbackFor = Exception.class)
     public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, Command command) {
         ProcessInstance processInstance = constructProcessInstance(command, host);
-        //cannot construct process instance, return null;
+        // cannot construct process instance, return null
         if (processInstance == null) {
             logger.error("scan command, command parameter is error: {}", command);
             moveToErrorCommand(command, "process instance is null");
@@ -201,7 +202,7 @@ public class ProcessService {
     /**
      * set process waiting thread
      *
-     * @param command         command
+     * @param command command
      * @param processInstance processInstance
      * @return process instance
      */
@@ -219,7 +220,7 @@ public class ProcessService {
     /**
      * check thread num
      *
-     * @param command        command
+     * @param command command
      * @param validThreadNum validThreadNum
      * @return if thread is enough
      */
@@ -259,7 +260,7 @@ public class ProcessService {
      */
     public Boolean verifyIsNeedCreateCommand(Command command) {
         Boolean isNeedCreate = true;
-        Map<CommandType, Integer> cmdTypeMap = new HashMap<CommandType, Integer>();
+        EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class);
         cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1);
         cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1);
         cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1);
@@ -296,9 +297,6 @@ public class ProcessService {
 
     /**
      * get task node list by definitionId
-     *
-     * @param defineId
-     * @return
      */
     public List<TaskNode> getTaskNodeListByDefinitionId(Integer defineId) {
         ProcessDefinition processDefinition = processDefineMapper.selectById(defineId);
@@ -425,7 +423,7 @@ public class ProcessService {
      * recursive query sub process definition id by parent id.
      *
      * @param parentId parentId
-     * @param ids      ids
+     * @param ids ids
      */
     public void recurseFindSubProcessId(int parentId, List<Integer> ids) {
         ProcessDefinition processDefinition = processDefineMapper.selectById(parentId);
@@ -435,7 +433,7 @@ public class ProcessService {
 
         List<TaskNode> taskNodeList = processData.getTasks();
 
-        if (taskNodeList != null && taskNodeList.size() > 0) {
+        if (taskNodeList != null && !taskNodeList.isEmpty()) {
 
             for (TaskNode taskNode : taskNodeList) {
                 String parameter = taskNode.getParams();
@@ -456,7 +454,7 @@ public class ProcessService {
      * create recovery waiting thread  command and delete origin command at the same time.
      * if the recovery command is exists, only update the field update_time
      *
-     * @param originCommand   originCommand
+     * @param originCommand originCommand
      * @param processInstance processInstance
      */
     public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
@@ -473,17 +471,17 @@ public class ProcessService {
         // process instance quit by "waiting thread" state
         if (originCommand == null) {
             Command command = new Command(
-                CommandType.RECOVER_WAITTING_THREAD,
-                processInstance.getTaskDependType(),
-                processInstance.getFailureStrategy(),
-                processInstance.getExecutorId(),
-                processInstance.getProcessDefinitionId(),
-                JSONUtils.toJsonString(cmdParam),
-                processInstance.getWarningType(),
-                processInstance.getWarningGroupId(),
-                processInstance.getScheduleTime(),
-                processInstance.getWorkerGroup(),
-                processInstance.getProcessInstancePriority()
+                    CommandType.RECOVER_WAITTING_THREAD,
+                    processInstance.getTaskDependType(),
+                    processInstance.getFailureStrategy(),
+                    processInstance.getExecutorId(),
+                    processInstance.getProcessDefinitionId(),
+                    JSONUtils.toJsonString(cmdParam),
+                    processInstance.getWarningType(),
+                    processInstance.getWarningGroupId(),
+                    processInstance.getScheduleTime(),
+                    processInstance.getWorkerGroup(),
+                    processInstance.getProcessInstancePriority()
             );
             saveCommand(command);
             return;
@@ -508,16 +506,14 @@ public class ProcessService {
     /**
      * get schedule time from command
      *
-     * @param command  command
+     * @param command command
      * @param cmdParam cmdParam map
      * @return date
      */
     private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
         Date scheduleTime = command.getScheduleTime();
-        if (scheduleTime == null) {
-            if (cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
-                scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
-            }
+        if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
+            scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
         }
         return scheduleTime;
     }
@@ -526,8 +522,8 @@ public class ProcessService {
      * generate a new work process instance from command.
      *
      * @param processDefinition processDefinition
-     * @param command           command
-     * @param cmdParam          cmdParam map
+     * @param command command
+     * @param cmdParam cmdParam map
      * @return process instance
      */
     private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
@@ -580,10 +576,10 @@ public class ProcessService {
 
         // curing global params
         processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
-            processDefinition.getGlobalParamMap(),
-            processDefinition.getGlobalParamList(),
-            getCommandTypeIfComplement(processInstance, command),
-            processInstance.getScheduleTime()));
+                processDefinition.getGlobalParamMap(),
+                processDefinition.getGlobalParamList(),
+                getCommandTypeIfComplement(processInstance, command),
+                processInstance.getScheduleTime()));
 
         //copy process define json to process instance
         processInstance.setProcessInstanceJson(processDefinition.getProcessDefinitionJson());
@@ -603,7 +599,7 @@ public class ProcessService {
      * use definition creator's tenant.
      *
      * @param tenantId tenantId
-     * @param userId   userId
+     * @param userId userId
      * @return tenant
      */
     public Tenant getTenantForProcess(int tenantId, int userId) {
@@ -626,15 +622,15 @@ public class ProcessService {
     /**
      * check command parameters is valid
      *
-     * @param command  command
+     * @param command command
      * @param cmdParam cmdParam map
      * @return whether command param is valid
      */
     private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
         if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
             if (cmdParam == null
-                || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
-                || cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
+                    || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
+                    || cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
                 logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
                 return false;
             }
@@ -646,7 +642,7 @@ public class ProcessService {
      * construct process instance according to one command.
      *
      * @param command command
-     * @param host    host
+     * @param host host
      * @return process instance
      */
     private ProcessInstance constructProcessInstance(Command command, String host) {
@@ -714,7 +710,7 @@ public class ProcessService {
             // generate one new process instance
             processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
         }
-        if (!checkCmdParam(command, cmdParam)) {
+        if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
             logger.error("command parameter check failed!");
             return null;
         }
@@ -742,7 +738,7 @@ public class ProcessService {
                     initTaskInstance(this.findTaskInstanceById(taskId));
                 }
                 cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING,
-                    String.join(Constants.COMMA, convertIntListToString(failedList)));
+                        String.join(Constants.COMMA, convertIntListToString(failedList)));
                 processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
                 processInstance.setRunTimes(runTime + 1);
                 break;
@@ -755,7 +751,7 @@ public class ProcessService {
                 cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
                 List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE);
                 List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
-                    ExecutionStatus.KILL);
+                        ExecutionStatus.KILL);
                 suspendedNodeList.addAll(stopNodeList);
                 for (Integer taskId : suspendedNodeList) {
                     // initialize the pause state
@@ -809,7 +805,7 @@ public class ProcessService {
      * return complement data if the process start with complement data
      *
      * @param processInstance processInstance
-     * @param command         command
+     * @param command command
      * @return command type
      */
     private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
@@ -824,8 +820,8 @@ public class ProcessService {
      * initialize complement data parameters
      *
      * @param processDefinition processDefinition
-     * @param processInstance   processInstance
-     * @param cmdParam          cmdParam
+     * @param processInstance processInstance
+     * @param cmdParam cmdParam
      */
     private void initComplementDataParam(ProcessDefinition processDefinition,
                                          ProcessInstance processInstance,
@@ -835,14 +831,14 @@ public class ProcessService {
         }
 
         Date startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE),
-            YYYY_MM_DD_HH_MM_SS);
+                YYYY_MM_DD_HH_MM_SS);
         if (Flag.NO == processInstance.getIsSubProcess()) {
             processInstance.setScheduleTime(startComplementTime);
         }
         processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
-            processDefinition.getGlobalParamMap(),
-            processDefinition.getGlobalParamList(),
-            CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
+                processDefinition.getGlobalParamMap(),
+                processDefinition.getGlobalParamList(),
+                CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
 
     }
 
@@ -862,7 +858,7 @@ public class ProcessService {
         Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
         // write sub process id into cmd param.
         if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
-            && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
+                && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
             paramMap.remove(CMD_PARAM_SUB_PROCESS);
             paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
             subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
@@ -875,7 +871,7 @@ public class ProcessService {
             ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
             if (parentInstance != null) {
                 subProcessInstance.setGlobalParams(
-                    joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
+                        joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
                 this.saveProcessInstance(subProcessInstance);
             } else {
                 logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
@@ -897,7 +893,7 @@ public class ProcessService {
      * only the keys doesn't in sub process global would be joined.
      *
      * @param parentGlobalParams parentGlobalParams
-     * @param subGlobalParams    subGlobalParams
+     * @param subGlobalParams subGlobalParams
      * @return global params join
      */
     private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
@@ -922,12 +918,11 @@ public class ProcessService {
      */
     private void initTaskInstance(TaskInstance taskInstance) {
 
-        if (!taskInstance.isSubProcess()) {
-            if (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure()) {
-                taskInstance.setFlag(Flag.NO);
-                updateTaskInstance(taskInstance);
-                return;
-            }
+        if (!taskInstance.isSubProcess()
+                && (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) {
+            taskInstance.setFlag(Flag.NO);
+            updateTaskInstance(taskInstance);
+            return;
         }
         taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
         updateTaskInstance(taskInstance);
@@ -944,12 +939,12 @@ public class ProcessService {
     public TaskInstance submitTask(TaskInstance taskInstance) {
         ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
         logger.info("start submit task : {}, instance id:{}, state: {}",
-            taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
+                taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
         //submit to db
         TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
         if (task == null) {
             logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
-                taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
+                    taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
             return task;
         }
         if (!task.getState().typeIsFinished()) {
@@ -957,7 +952,7 @@ public class ProcessService {
         }
 
         logger.info("end submit task to db successfully:{} state:{} complete, instance id:{} state: {}  ",
-            taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
+                taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
         return task;
     }
 
@@ -968,7 +963,7 @@ public class ProcessService {
      * set map {parent instance id, task instance id, 0(child instance id)}
      *
      * @param parentInstance parentInstance
-     * @param parentTask     parentTask
+     * @param parentTask parentTask
      * @return process instance map
      */
     private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) {
@@ -997,7 +992,7 @@ public class ProcessService {
      * find previous task work process map.
      *
      * @param parentProcessInstance parentProcessInstance
-     * @param parentTask            parentTask
+     * @param parentTask parentTask
      * @return process instance map
      */
     private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
@@ -1015,7 +1010,7 @@ public class ProcessService {
             }
         }
         logger.info("sub process instance is not found,parent task:{},parent instance:{}",
-            parentTask.getId(), parentProcessInstance.getId());
+                parentTask.getId(), parentProcessInstance.getId());
         return null;
     }
 
@@ -1049,10 +1044,6 @@ public class ProcessService {
 
     /**
      * complement data needs transform parent parameter to child.
-     *
-     * @param instanceMap
-     * @param parentProcessInstance
-     * @return
      */
     private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance) {
         // set sub work process command
@@ -1071,11 +1062,6 @@ public class ProcessService {
 
     /**
      * create sub work process command
-     *
-     * @param parentProcessInstance
-     * @param childInstance
-     * @param instanceMap
-     * @param task
      */
     public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
                                            ProcessInstance childInstance,
@@ -1088,25 +1074,23 @@ public class ProcessService {
         String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance);
 
         return new Command(
-            commandType,
-            TaskDependType.TASK_POST,
-            parentProcessInstance.getFailureStrategy(),
-            parentProcessInstance.getExecutorId(),
-            childDefineId,
-            processParam,
-            parentProcessInstance.getWarningType(),
-            parentProcessInstance.getWarningGroupId(),
-            parentProcessInstance.getScheduleTime(),
-            task.getWorkerGroup(),
-            parentProcessInstance.getProcessInstancePriority()
+                commandType,
+                TaskDependType.TASK_POST,
+                parentProcessInstance.getFailureStrategy(),
+                parentProcessInstance.getExecutorId(),
+                childDefineId,
+                processParam,
+                parentProcessInstance.getWarningType(),
+                parentProcessInstance.getWarningGroupId(),
+                parentProcessInstance.getScheduleTime(),
+                task.getWorkerGroup(),
+                parentProcessInstance.getProcessInstancePriority()
         );
     }
 
     /**
      * initialize sub work flow state
      * child instance state would be initialized when 'recovery from pause/stop/failure'
-     *
-     * @param childInstance
      */
     private void initSubInstanceState(ProcessInstance childInstance) {
         if (childInstance != null) {
@@ -1119,9 +1103,6 @@ public class ProcessService {
      * get sub work flow command type
      * child instance exist: child command = fatherCommand
      * child instance not exists: child command = fatherCommand[0]
-     *
-     * @param parentProcessInstance
-     * @return
      */
     private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
         CommandType commandType = parentProcessInstance.getCommandType();
@@ -1136,7 +1117,7 @@ public class ProcessService {
      * update sub process definition
      *
      * @param parentProcessInstance parentProcessInstance
-     * @param childDefinitionId     childDefinitionId
+     * @param childDefinitionId childDefinitionId
      */
     private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, int childDefinitionId) {
         ProcessDefinition fatherDefinition = this.findProcessDefineById(parentProcessInstance.getProcessDefinitionId());
@@ -1150,7 +1131,7 @@ public class ProcessService {
     /**
      * submit task to mysql
      *
-     * @param taskInstance    taskInstance
+     * @param taskInstance taskInstance
      * @param processInstance processInstance
      * @return task instance
      */
@@ -1163,7 +1144,7 @@ public class ProcessService {
             } else {
 
                 if (processInstanceState != ExecutionStatus.READY_STOP
-                    && processInstanceState != ExecutionStatus.READY_PAUSE) {
+                        && processInstanceState != ExecutionStatus.READY_PAUSE) {
                     // failure task set invalid
                     taskInstance.setFlag(Flag.NO);
                     updateTaskInstance(taskInstance);
@@ -1204,19 +1185,19 @@ public class ProcessService {
      * return stop if work process state is ready stop
      * if all of above are not satisfied, return submit success
      *
-     * @param taskInstance         taskInstance
+     * @param taskInstance taskInstance
      * @param processInstanceState processInstanceState
      * @return process instance state
      */
     public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ExecutionStatus processInstanceState) {
         ExecutionStatus state = taskInstance.getState();
         if (
-            // running, delayed or killed
-            // the task already exists in task queue
-            // return state
-            state == ExecutionStatus.RUNNING_EXECUTION
-                || state == ExecutionStatus.DELAY_EXECUTION
-                || state == ExecutionStatus.KILL
+                // running, delayed or killed
+                // the task already exists in task queue
+                // return state
+                state == ExecutionStatus.RUNNING_EXECUTION
+                        || state == ExecutionStatus.DELAY_EXECUTION
+                        || state == ExecutionStatus.KILL
         ) {
             return state;
         }
@@ -1225,7 +1206,7 @@ public class ProcessService {
         if (processInstanceState == ExecutionStatus.READY_PAUSE) {
             state = ExecutionStatus.PAUSE;
         } else if (processInstanceState == ExecutionStatus.READY_STOP
-            || !checkProcessStrategy(taskInstance)) {
+                || !checkProcessStrategy(taskInstance)) {
             state = ExecutionStatus.KILL;
         } else {
             state = ExecutionStatus.SUBMITTED_SUCCESS;
@@ -1380,7 +1361,7 @@ public class ProcessService {
      * get id list by task state
      *
      * @param instanceId instanceId
-     * @param state      state
+     * @param state state
      * @return task instance states
      */
     public List<Integer> findTaskIdByInstanceState(int instanceId, ExecutionStatus state) {
@@ -1435,7 +1416,7 @@ public class ProcessService {
      * find work process map by parent process id and parent task id.
      *
      * @param parentWorkProcessId parentWorkProcessId
-     * @param parentTaskId        parentTaskId
+     * @param parentTaskId parentTaskId
      * @return process instance map
      */
     public ProcessInstanceMap findWorkProcessMapByParent(Integer parentWorkProcessId, Integer parentTaskId) {
@@ -1457,7 +1438,7 @@ public class ProcessService {
      * find sub process instance
      *
      * @param parentProcessId parentProcessId
-     * @param parentTaskId    parentTaskId
+     * @param parentTaskId parentTaskId
      * @return process instance
      */
     public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) {
@@ -1489,12 +1470,12 @@ public class ProcessService {
     /**
      * change task state
      *
-     * @param state       state
-     * @param startTime   startTime
-     * @param host        host
+     * @param state state
+     * @param startTime startTime
+     * @param host host
      * @param executePath executePath
-     * @param logPath     logPath
-     * @param taskInstId  taskInstId
+     * @param logPath logPath
+     * @param taskInstId taskInstId
      */
     public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date startTime, String host,
                                 String executePath,
@@ -1522,12 +1503,12 @@ public class ProcessService {
      * update the process instance
      *
      * @param processInstanceId processInstanceId
-     * @param processJson       processJson
-     * @param globalParams      globalParams
-     * @param scheduleTime      scheduleTime
-     * @param flag              flag
-     * @param locations         locations
-     * @param connects          connects
+     * @param processJson processJson
+     * @param globalParams globalParams
+     * @param scheduleTime scheduleTime
+     * @param flag flag
+     * @param locations locations
+     * @param connects connects
      * @return update process instance result
      */
     public int updateProcessInstance(Integer processInstanceId, String processJson,
@@ -1548,10 +1529,10 @@ public class ProcessService {
     /**
      * change task state
      *
-     * @param state      state
-     * @param endTime    endTime
+     * @param state state
+     * @param endTime endTime
      * @param taskInstId taskInstId
-     * @param varPool    varPool
+     * @param varPool varPool
      */
     public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state,
                                 Date endTime,
@@ -1577,7 +1558,7 @@ public class ProcessService {
         if (intList == null) {
             return new ArrayList<>();
         }
-        List<String> result = new ArrayList<String>(intList.size());
+        List<String> result = new ArrayList<>(intList.size());
         for (Integer intVar : intList) {
             result.add(String.valueOf(intVar));
         }
@@ -1642,7 +1623,7 @@ public class ProcessService {
      */
     public List<TaskInstance> queryNeedFailoverTaskInstances(String host) {
         return taskInstanceMapper.queryByHostAndStatus(host,
-            stateArray);
+                stateArray);
     }
 
     /**
@@ -1659,7 +1640,7 @@ public class ProcessService {
      * update process instance state by id
      *
      * @param processInstanceId processInstanceId
-     * @param executionStatus   executionStatus
+     * @param executionStatus executionStatus
      * @return update process result
      */
     public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) {
@@ -1696,7 +1677,7 @@ public class ProcessService {
     /**
      * find tenant code by resource name
      *
-     * @param resName      resource name
+     * @param resName resource name
      * @param resourceType resource type
      * @return tenant code
      */
@@ -1714,35 +1695,35 @@ public class ProcessService {
      */
     public List<Schedule> selectAllByProcessDefineId(int[] ids) {
         return scheduleMapper.selectAllByProcessDefineArray(
-            ids);
+                ids);
     }
 
     /**
      * get dependency cycle by work process define id and scheduler fire time
      *
-     * @param masterId            masterId
+     * @param masterId masterId
      * @param processDefinitionId processDefinitionId
-     * @param scheduledFireTime   the time the task schedule is expected to trigger
+     * @param scheduledFireTime the time the task schedule is expected to trigger
      * @return CycleDependency
      * @throws Exception if error throws Exception
      */
     public CycleDependency getCycleDependency(int masterId, int processDefinitionId, Date scheduledFireTime) throws Exception {
-        List<CycleDependency> list = getCycleDependencies(masterId, new int[] {processDefinitionId}, scheduledFireTime);
-        return list.size() > 0 ? list.get(0) : null;
+        List<CycleDependency> list = getCycleDependencies(masterId, new int[]{processDefinitionId}, scheduledFireTime);
+        return !list.isEmpty() ? list.get(0) : null;
 
     }
 
     /**
      * get dependency cycle list by work process define id list and scheduler fire time
      *
-     * @param masterId          masterId
-     * @param ids               ids
+     * @param masterId masterId
+     * @param ids ids
      * @param scheduledFireTime the time the task schedule is expected to trigger
      * @return CycleDependency list
      * @throws Exception if error throws Exception
      */
     public List<CycleDependency> getCycleDependencies(int masterId, int[] ids, Date scheduledFireTime) throws Exception {
-        List<CycleDependency> cycleDependencyList = new ArrayList<CycleDependency>();
+        List<CycleDependency> cycleDependencyList = new ArrayList<>();
         if (null == ids || ids.length == 0) {
             logger.warn("ids[] is empty!is invalid!");
             return cycleDependencyList;
@@ -1769,14 +1750,10 @@ public class ProcessService {
             }
             Calendar calendar = Calendar.getInstance();
             switch (cycleEnum) {
-                /*case MINUTE:
-                    calendar.add(Calendar.MINUTE,-61);*/
                 case HOUR:
                     calendar.add(Calendar.HOUR, -25);
                     break;
                 case DAY:
-                    calendar.add(Calendar.DATE, -32);
-                    break;
                 case WEEK:
                     calendar.add(Calendar.DATE, -32);
                     break;
@@ -1784,7 +1761,8 @@ public class ProcessService {
                     calendar.add(Calendar.MONTH, -13);
                     break;
                 default:
-                    logger.warn("Dependent process definition's  cycleEnum is {},not support!!", cycleEnum.name());
+                    String cycleName = cycleEnum.name();
+                    logger.warn("Dependent process definition's  cycleEnum is {},not support!!", cycleName);
                     continue;
             }
             Date start = calendar.getTime();
@@ -1794,7 +1772,7 @@ public class ProcessService {
             } else {
                 list = CronUtils.getFireDateList(start, scheduledFireTime, depCronExpression);
             }
-            if (list.size() >= 1) {
+            if (!list.isEmpty()) {
                 start = list.get(list.size() - 1);
                 CycleDependency dependency = new CycleDependency(depSchedule.getProcessDefinitionId(), start, CronUtils.getExpirationTime(start, cycleEnum), cycleEnum);
                 cycleDependencyList.add(dependency);
@@ -1813,8 +1791,8 @@ public class ProcessService {
      */
     public ProcessInstance findLastSchedulerProcessInterval(int definitionId, DateInterval dateInterval) {
         return processInstanceMapper.queryLastSchedulerProcess(definitionId,
-            dateInterval.getStartTime(),
-            dateInterval.getEndTime());
+                dateInterval.getStartTime(),
+                dateInterval.getEndTime());
     }
 
     /**
@@ -1826,23 +1804,23 @@ public class ProcessService {
      */
     public ProcessInstance findLastManualProcessInterval(int definitionId, DateInterval dateInterval) {
         return processInstanceMapper.queryLastManualProcess(definitionId,
-            dateInterval.getStartTime(),
-            dateInterval.getEndTime());
+                dateInterval.getStartTime(),
+                dateInterval.getEndTime());
     }
 
     /**
      * find last running process instance
      *
      * @param definitionId process definition id
-     * @param startTime    start time
-     * @param endTime      end time
+     * @param startTime start time
+     * @param endTime end time
      * @return process instance
      */
     public ProcessInstance findLastRunningProcess(int definitionId, Date startTime, Date endTime) {
         return processInstanceMapper.queryLastRunningProcess(definitionId,
-            startTime,
-            endTime,
-            stateArray);
+                startTime,
+                endTime,
+                stateArray);
     }
 
     /**
@@ -1867,6 +1845,7 @@ public class ProcessService {
 
     /**
      * query project name and user name by processInstanceId.
+     *
      * @param processInstanceId processInstanceId
      * @return projectName and userName
      */
@@ -1934,35 +1913,32 @@ public class ProcessService {
     /**
      * list unauthorized udf function
      *
-     * @param userId     user id
+     * @param userId user id
      * @param needChecks data source id array
      * @return unauthorized udf function list
      */
     public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) {
-        List<T> resultList = new ArrayList<T>();
+        List<T> resultList = new ArrayList<>();
 
         if (Objects.nonNull(needChecks) && needChecks.length > 0) {
-            Set<T> originResSet = new HashSet<T>(Arrays.asList(needChecks));
+            Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
 
             switch (authorizationType) {
                 case RESOURCE_FILE_ID:
-                    Set<Integer> authorizedResourceFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
+                case UDF_FILE:
+                    Set<Integer> authorizedResourceFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(Resource::getId).collect(toSet());
                     originResSet.removeAll(authorizedResourceFiles);
                     break;
                 case RESOURCE_FILE_NAME:
-                    Set<String> authorizedResources = resourceMapper.listAuthorizedResource(userId, needChecks).stream().map(t -> t.getFullName()).collect(toSet());
+                    Set<String> authorizedResources = resourceMapper.listAuthorizedResource(userId, needChecks).stream().map(Resource::getFullName).collect(toSet());
                     originResSet.removeAll(authorizedResources);
                     break;
-                case UDF_FILE:
-                    Set<Integer> authorizedUdfFiles = resourceMapper.listAuthorizedResourceById(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
-                    originResSet.removeAll(authorizedUdfFiles);
-                    break;
                 case DATASOURCE:
-                    Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
+                    Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet());
                     originResSet.removeAll(authorizedDatasources);
                     break;
                 case UDF:
-                    Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(t -> t.getId()).collect(toSet());
+                    Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet());
                     originResSet.removeAll(authorizedUdfs);
                     break;
                 default:
@@ -2007,9 +1983,6 @@ public class ProcessService {
 
     /**
      * format task app id in task instance
-     *
-     * @param taskInstance
-     * @return
      */
     public String formatTaskAppId(TaskInstance taskInstance) {
         ProcessDefinition definition = this.findProcessDefineById(taskInstance.getProcessDefinitionId());
@@ -2019,9 +1992,9 @@ public class ProcessService {
             return "";
         }
         return String.format("%s_%s_%s",
-            definition.getId(),
-            processInstanceById.getId(),
-            taskInstance.getId());
+                definition.getId(),
+                processInstanceById.getId(),
+                taskInstance.getId());
     }
 
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/ProcessScheduleJob.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/ProcessScheduleJob.java
index 6ac847b8db..2921ce2bba 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/ProcessScheduleJob.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/ProcessScheduleJob.java
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.service.quartz;
 
+package org.apache.dolphinscheduler.service.quartz;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.CommandType;
@@ -25,6 +25,9 @@ import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
 import org.apache.dolphinscheduler.dao.entity.Schedule;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 import org.apache.dolphinscheduler.service.process.ProcessService;
+
+import java.util.Date;
+
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
@@ -34,8 +37,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import java.util.Date;
-
 /**
  * process schedule job
  */
@@ -46,7 +47,7 @@ public class ProcessScheduleJob implements Job {
      */
     private static final Logger logger = LoggerFactory.getLogger(ProcessScheduleJob.class);
 
-    public ProcessService getProcessService(){
+    public ProcessService getProcessService() {
         return SpringApplicationContext.getBean(ProcessService.class);
     }
 
@@ -66,10 +67,8 @@ public class ProcessScheduleJob implements Job {
         int projectId = dataMap.getInt(Constants.PROJECT_ID);
         int scheduleId = dataMap.getInt(Constants.SCHEDULE_ID);
 
-
         Date scheduledFireTime = context.getScheduledFireTime();
 
-
         Date fireTime = context.getFireTime();
 
         logger.info("scheduled fire time :{}, fire time :{}, process id :{}", scheduledFireTime, fireTime, scheduleId);
@@ -82,11 +81,10 @@ public class ProcessScheduleJob implements Job {
             return;
         }
 
-
         ProcessDefinition processDefinition = getProcessService().findProcessDefineById(schedule.getProcessDefinitionId());
         // release state : online/offline
         ReleaseState releaseState = processDefinition.getReleaseState();
-        if (processDefinition == null || releaseState == ReleaseState.OFFLINE) {
+        if (releaseState == ReleaseState.OFFLINE) {
             logger.warn("process definition does not exist in db or offline，need not to create command, projectId:{}, processId:{}", projectId, scheduleId);
             return;
         }
@@ -107,7 +105,6 @@ public class ProcessScheduleJob implements Job {
         getProcessService().createCommand(command);
     }
 
-
     /**
      * delete job
      */
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
index 3b15810e05..fd91e4076d 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
@@ -14,15 +14,76 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.quartz;
 
+import static org.apache.dolphinscheduler.common.Constants.ORG_POSTGRESQL_DRIVER;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_CLASS;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_DATASOURCE;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_ISCLUSTERED;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_TABLEPREFIX;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_JOBSTORE_USEPROPERTIES;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_INSTANCEID;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_INSTANCENAME;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_CLASS;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_THREADCOUNT;
+import static org.apache.dolphinscheduler.common.Constants.ORG_QUARTZ_THREADPOOL_THREADPRIORITY;
+import static org.apache.dolphinscheduler.common.Constants.PROJECT_ID;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_ACQUIRETRIGGERSWITHINLOCK;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_CLUSTERCHECKININTERVAL;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_DATASOURCE;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_INSTANCEID;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_INSTANCENAME;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_JOB_GROUP_PRIFIX;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_JOB_PRIFIX;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_MISFIRETHRESHOLD;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_PROPERTIES_PATH;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_TABLE_PREFIX;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_THREADCOUNT;
+import static org.apache.dolphinscheduler.common.Constants.QUARTZ_THREADPRIORITY;
+import static org.apache.dolphinscheduler.common.Constants.SCHEDULE;
+import static org.apache.dolphinscheduler.common.Constants.SCHEDULE_ID;
+import static org.apache.dolphinscheduler.common.Constants.SPRING_DATASOURCE_DRIVER_CLASS_NAME;
+import static org.apache.dolphinscheduler.common.Constants.STRING_FALSE;
+import static org.apache.dolphinscheduler.common.Constants.STRING_TRUE;
+import static org.apache.dolphinscheduler.common.Constants.UNDERLINE;
+
+import static org.quartz.CronScheduleBuilder.cronSchedule;
+import static org.quartz.JobBuilder.newJob;
+import static org.quartz.TriggerBuilder.newTrigger;
+
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.apache.dolphinscheduler.dao.entity.Schedule;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
+
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.StringUtils;
-import org.apache.dolphinscheduler.common.utils.*;
-import org.apache.dolphinscheduler.dao.entity.Schedule;
-import org.quartz.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.quartz.CronTrigger;
+import org.quartz.Job;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.TriggerKey;
 import org.quartz.impl.StdSchedulerFactory;
 import org.quartz.impl.jdbcjobstore.JobStoreTX;
 import org.quartz.impl.jdbcjobstore.PostgreSQLDelegate;
@@ -32,300 +93,289 @@ import org.quartz.simpl.SimpleThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import static org.apache.dolphinscheduler.common.Constants.*;
-import static org.quartz.CronScheduleBuilder.cronSchedule;
-import static org.quartz.JobBuilder.newJob;
-import static org.quartz.TriggerBuilder.newTrigger;
-
 /**
  * single Quartz executors instance
  */
 public class QuartzExecutors {
 
-  /**
-   * logger of QuartzExecutors
-   */
-  private static final Logger logger = LoggerFactory.getLogger(QuartzExecutors.class);
-
-  /**
-   * read write lock
-   */
-  private final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-  /**
-   * A Scheduler maintains a registry of org.quartz.JobDetail and Trigger.
-   */
-  private static Scheduler scheduler;
-
-  /**
-   * load conf
-   */
-  private static Configuration conf;
-
-  private static final class Holder {
-    private static final QuartzExecutors instance = new QuartzExecutors();
-  }
-
-
-  private QuartzExecutors() {
-    try {
-      conf = new PropertiesConfiguration(QUARTZ_PROPERTIES_PATH);
-      init();
-    }catch (ConfigurationException e){
-      logger.warn("not loaded quartz configuration file, will used default value",e);
+    /**
+     * logger of QuartzExecutors
+     */
+    private static final Logger logger = LoggerFactory.getLogger(QuartzExecutors.class);
+
+    /**
+     * read write lock
+     */
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    /**
+     * A Scheduler maintains a registry of org.quartz.JobDetail and Trigger.
+     */
+    private static Scheduler scheduler;
+
+    /**
+     * load conf
+     */
+    private static Configuration conf;
+
+    private static final class Holder {
+        private static final QuartzExecutors instance = new QuartzExecutors();
     }
-  }
-
-  /**
-   * thread safe and performance promote
-   * @return instance of Quartz Executors
-   */
-  public static QuartzExecutors getInstance() {
-   return Holder.instance;
-  }
-
-
-  /**
-   * init
-   *
-   * Returns a client-usable handle to a Scheduler.
-   */
-  private void init() {
-    try {
-      StdSchedulerFactory schedulerFactory = new StdSchedulerFactory();
-      Properties properties = new Properties();
-
-      String dataSourceDriverClass = org.apache.dolphinscheduler.dao.utils.PropertyUtils.getString(SPRING_DATASOURCE_DRIVER_CLASS_NAME);
-      if (dataSourceDriverClass.equals(ORG_POSTGRESQL_DRIVER)){
-        properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS,conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, PostgreSQLDelegate.class.getName()));
-      } else {
-        properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS,conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, StdJDBCDelegate.class.getName()));
-      }
-      properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCENAME, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCENAME, QUARTZ_INSTANCENAME));
-      properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCEID, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCEID, QUARTZ_INSTANCEID));
-      properties.setProperty(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON,conf.getString(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON,STRING_TRUE));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_USEPROPERTIES,conf.getString(ORG_QUARTZ_JOBSTORE_USEPROPERTIES,STRING_FALSE));
-      properties.setProperty(ORG_QUARTZ_THREADPOOL_CLASS,conf.getString(ORG_QUARTZ_THREADPOOL_CLASS, SimpleThreadPool.class.getName()));
-      properties.setProperty(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS,conf.getString(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS,STRING_TRUE));
-      properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADCOUNT,conf.getString(ORG_QUARTZ_THREADPOOL_THREADCOUNT, QUARTZ_THREADCOUNT));
-      properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADPRIORITY,conf.getString(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, QUARTZ_THREADPRIORITY));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_CLASS,conf.getString(ORG_QUARTZ_JOBSTORE_CLASS, JobStoreTX.class.getName()));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_TABLEPREFIX,conf.getString(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, QUARTZ_TABLE_PREFIX));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_ISCLUSTERED,conf.getString(ORG_QUARTZ_JOBSTORE_ISCLUSTERED,STRING_TRUE));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD,conf.getString(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, QUARTZ_MISFIRETHRESHOLD));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL,conf.getString(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, QUARTZ_CLUSTERCHECKININTERVAL));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK,conf.getString(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, QUARTZ_ACQUIRETRIGGERSWITHINLOCK));
-      properties.setProperty(ORG_QUARTZ_JOBSTORE_DATASOURCE,conf.getString(ORG_QUARTZ_JOBSTORE_DATASOURCE, QUARTZ_DATASOURCE));
-      properties.setProperty(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS,conf.getString(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS,DruidConnectionProvider.class.getName()));
-
-      schedulerFactory.initialize(properties);
-      scheduler = schedulerFactory.getScheduler();
-
-    } catch (SchedulerException e) {
-      logger.error(e.getMessage(),e);
-      System.exit(1);
+
+    private QuartzExecutors() {
+        try {
+            conf = new PropertiesConfiguration(QUARTZ_PROPERTIES_PATH);
+            init();
+        } catch (ConfigurationException e) {
+            logger.warn("not loaded quartz configuration file, will used default value", e);
+        }
     }
 
-  }
-
-  /**
-   * Whether the scheduler has been started.
-   *
-   * @throws SchedulerException scheduler exception
-   */
-  public void start() throws SchedulerException {
-    if (!scheduler.isStarted()){
-      scheduler.start();
-      logger.info("Quartz service started" );
+    /**
+     * thread safe and performance promote
+     *
+     * @return instance of Quartz Executors
+     */
+    public static QuartzExecutors getInstance() {
+        return Holder.instance;
     }
-  }
-
-  /**
-   * stop all scheduled tasks
-   *
-   * Halts the Scheduler's firing of Triggers,
-   * and cleans up all resources associated with the Scheduler.
-   *
-   * The scheduler cannot be re-started.
-   * @throws SchedulerException scheduler exception
-   */
-  public void shutdown() throws SchedulerException {
-    if (!scheduler.isShutdown()) {
-        // don't wait for the task to complete
-        scheduler.shutdown();
-        logger.info("Quartz service stopped, and halt all tasks");
+
+    /**
+     * init
+     * <p>
+     * Returns a client-usable handle to a Scheduler.
+     */
+    private void init() {
+        try {
+            StdSchedulerFactory schedulerFactory = new StdSchedulerFactory();
+            Properties properties = new Properties();
+
+            String dataSourceDriverClass = org.apache.dolphinscheduler.dao.utils.PropertyUtils.getString(SPRING_DATASOURCE_DRIVER_CLASS_NAME);
+            if (dataSourceDriverClass.equals(ORG_POSTGRESQL_DRIVER)) {
+                properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, PostgreSQLDelegate.class.getName()));
+            } else {
+                properties.setProperty(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, conf.getString(ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS, StdJDBCDelegate.class.getName()));
+            }
+            properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCENAME, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCENAME, QUARTZ_INSTANCENAME));
+            properties.setProperty(ORG_QUARTZ_SCHEDULER_INSTANCEID, conf.getString(ORG_QUARTZ_SCHEDULER_INSTANCEID, QUARTZ_INSTANCEID));
+            properties.setProperty(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON, conf.getString(ORG_QUARTZ_SCHEDULER_MAKESCHEDULERTHREADDAEMON, STRING_TRUE));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_USEPROPERTIES, conf.getString(ORG_QUARTZ_JOBSTORE_USEPROPERTIES, STRING_FALSE));
+            properties.setProperty(ORG_QUARTZ_THREADPOOL_CLASS, conf.getString(ORG_QUARTZ_THREADPOOL_CLASS, SimpleThreadPool.class.getName()));
+            properties.setProperty(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS, conf.getString(ORG_QUARTZ_THREADPOOL_MAKETHREADSDAEMONS, STRING_TRUE));
+            properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADCOUNT, conf.getString(ORG_QUARTZ_THREADPOOL_THREADCOUNT, QUARTZ_THREADCOUNT));
+            properties.setProperty(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, conf.getString(ORG_QUARTZ_THREADPOOL_THREADPRIORITY, QUARTZ_THREADPRIORITY));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_CLASS, conf.getString(ORG_QUARTZ_JOBSTORE_CLASS, JobStoreTX.class.getName()));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, conf.getString(ORG_QUARTZ_JOBSTORE_TABLEPREFIX, QUARTZ_TABLE_PREFIX));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_ISCLUSTERED, conf.getString(ORG_QUARTZ_JOBSTORE_ISCLUSTERED, STRING_TRUE));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, conf.getString(ORG_QUARTZ_JOBSTORE_MISFIRETHRESHOLD, QUARTZ_MISFIRETHRESHOLD));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, conf.getString(ORG_QUARTZ_JOBSTORE_CLUSTERCHECKININTERVAL, QUARTZ_CLUSTERCHECKININTERVAL));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, conf.getString(ORG_QUARTZ_JOBSTORE_ACQUIRETRIGGERSWITHINLOCK, QUARTZ_ACQUIRETRIGGERSWITHINLOCK));
+            properties.setProperty(ORG_QUARTZ_JOBSTORE_DATASOURCE, conf.getString(ORG_QUARTZ_JOBSTORE_DATASOURCE, QUARTZ_DATASOURCE));
+            properties.setProperty(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS, conf.getString(ORG_QUARTZ_DATASOURCE_MYDS_CONNECTIONPROVIDER_CLASS, DruidConnectionProvider.class.getName()));
+
+            schedulerFactory.initialize(properties);
+            scheduler = schedulerFactory.getScheduler();
+
+        } catch (SchedulerException e) {
+            logger.error(e.getMessage(), e);
+            System.exit(1);
+        }
+
     }
-  }
-
-
-  /**
-   * add task trigger , if this task already exists, return this task with updated trigger
-   *
-   * @param clazz             job class name
-   * @param jobName           job name
-   * @param jobGroupName      job group name
-   * @param startDate         job start date
-   * @param endDate           job end date
-   * @param cronExpression    cron expression
-   * @param jobDataMap        job parameters data map
-   */
-  public void addJob(Class<? extends Job> clazz,String jobName,String jobGroupName,Date startDate, Date endDate,
-                                 String cronExpression,
-                                 Map<String, Object> jobDataMap) {
-    lock.writeLock().lock();
-    try {
-
-      JobKey jobKey = new JobKey(jobName, jobGroupName);
-      JobDetail jobDetail;
-      //add a task (if this task already exists, return this task directly)
-      if (scheduler.checkExists(jobKey)) {
-
-        jobDetail = scheduler.getJobDetail(jobKey);
-        if (jobDataMap != null) {
-          jobDetail.getJobDataMap().putAll(jobDataMap);
+
+    /**
+     * Whether the scheduler has been started.
+     *
+     * @throws SchedulerException scheduler exception
+     */
+    public void start() throws SchedulerException {
+        if (!scheduler.isStarted()) {
+            scheduler.start();
+            logger.info("Quartz service started");
         }
-      } else {
-        jobDetail = newJob(clazz).withIdentity(jobKey).build();
+    }
 
-        if (jobDataMap != null) {
-          jobDetail.getJobDataMap().putAll(jobDataMap);
+    /**
+     * stop all scheduled tasks
+     * <p>
+     * Halts the Scheduler's firing of Triggers,
+     * and cleans up all resources associated with the Scheduler.
+     * <p>
+     * The scheduler cannot be re-started.
+     *
+     * @throws SchedulerException scheduler exception
+     */
+    public void shutdown() throws SchedulerException {
+        if (!scheduler.isShutdown()) {
+            // don't wait for the task to complete
+            scheduler.shutdown();
+            logger.info("Quartz service stopped, and halt all tasks");
         }
+    }
 
-        scheduler.addJob(jobDetail, false, true);
-
-        logger.info("Add job, job name: {}, group name: {}",
-                jobName, jobGroupName);
-      }
-
-      TriggerKey triggerKey = new TriggerKey(jobName, jobGroupName);
-      /**
-       * Instructs the Scheduler that upon a mis-fire
-       * situation, the CronTrigger wants to have it's
-       * next-fire-time updated to the next time in the schedule after the
-       * current time (taking into account any associated Calendar),
-       * but it does not want to be fired now.
-       */
-      CronTrigger cronTrigger = newTrigger().withIdentity(triggerKey).startAt(startDate).endAt(endDate)
-              .withSchedule(cronSchedule(cronExpression).withMisfireHandlingInstructionDoNothing())
-              .forJob(jobDetail).build();
-
-      if (scheduler.checkExists(triggerKey)) {
-          // updateProcessInstance scheduler trigger when scheduler cycle changes
-          CronTrigger oldCronTrigger = (CronTrigger) scheduler.getTrigger(triggerKey);
-          String oldCronExpression = oldCronTrigger.getCronExpression();
-
-          if (!StringUtils.equalsIgnoreCase(cronExpression,oldCronExpression)) {
-            // reschedule job trigger
-            scheduler.rescheduleJob(triggerKey, cronTrigger);
-            logger.info("reschedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
-                    jobName, jobGroupName, cronExpression, startDate, endDate);
-          }
-      } else {
-        scheduler.scheduleJob(cronTrigger);
-        logger.info("schedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
-                jobName, jobGroupName, cronExpression, startDate, endDate);
-      }
-
-    } catch (Exception e) {
-      logger.error("add job failed", e);
-      throw new RuntimeException("add job failed", e);
-    } finally {
-      lock.writeLock().unlock();
+    /**
+     * add task trigger , if this task already exists, return this task with updated trigger
+     *
+     * @param clazz job class name
+     * @param jobName job name
+     * @param jobGroupName job group name
+     * @param startDate job start date
+     * @param endDate job end date
+     * @param cronExpression cron expression
+     * @param jobDataMap job parameters data map
+     */
+    public void addJob(Class<? extends Job> clazz, String jobName, String jobGroupName, Date startDate, Date endDate,
+                       String cronExpression,
+                       Map<String, Object> jobDataMap) {
+        lock.writeLock().lock();
+        try {
+
+            JobKey jobKey = new JobKey(jobName, jobGroupName);
+            JobDetail jobDetail;
+            //add a task (if this task already exists, return this task directly)
+            if (scheduler.checkExists(jobKey)) {
+
+                jobDetail = scheduler.getJobDetail(jobKey);
+                if (jobDataMap != null) {
+                    jobDetail.getJobDataMap().putAll(jobDataMap);
+                }
+            } else {
+                jobDetail = newJob(clazz).withIdentity(jobKey).build();
+
+                if (jobDataMap != null) {
+                    jobDetail.getJobDataMap().putAll(jobDataMap);
+                }
+
+                scheduler.addJob(jobDetail, false, true);
+
+                logger.info("Add job, job name: {}, group name: {}",
+                        jobName, jobGroupName);
+            }
+
+            TriggerKey triggerKey = new TriggerKey(jobName, jobGroupName);
+            /**
+             * Instructs the Scheduler that upon a mis-fire
+             * situation, the CronTrigger wants to have it's
+             * next-fire-time updated to the next time in the schedule after the
+             * current time (taking into account any associated Calendar),
+             * but it does not want to be fired now.
+             */
+            CronTrigger cronTrigger = newTrigger().withIdentity(triggerKey).startAt(startDate).endAt(endDate)
+                    .withSchedule(cronSchedule(cronExpression).withMisfireHandlingInstructionDoNothing())
+                    .forJob(jobDetail).build();
+
+            if (scheduler.checkExists(triggerKey)) {
+                // updateProcessInstance scheduler trigger when scheduler cycle changes
+                CronTrigger oldCronTrigger = (CronTrigger) scheduler.getTrigger(triggerKey);
+                String oldCronExpression = oldCronTrigger.getCronExpression();
+
+                if (!StringUtils.equalsIgnoreCase(cronExpression, oldCronExpression)) {
+                    // reschedule job trigger
+                    scheduler.rescheduleJob(triggerKey, cronTrigger);
+                    logger.info("reschedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
+                            jobName, jobGroupName, cronExpression, startDate, endDate);
+                }
+            } else {
+                scheduler.scheduleJob(cronTrigger);
+                logger.info("schedule job trigger, triggerName: {}, triggerGroupName: {}, cronExpression: {}, startDate: {}, endDate: {}",
+                        jobName, jobGroupName, cronExpression, startDate, endDate);
+            }
+
+        } catch (Exception e) {
+            throw new ServiceException("add job failed", e);
+        } finally {
+            lock.writeLock().unlock();
+        }
     }
-  }
-
-
-  /**
-   * delete job
-   *
-   * @param jobName      job name
-   * @param jobGroupName job group name
-   * @return true if the Job was found and deleted.
-   */
-  public boolean deleteJob(String jobName, String jobGroupName) {
-    lock.writeLock().lock();
-    try {
-      JobKey jobKey = new JobKey(jobName,jobGroupName);
-      if(scheduler.checkExists(jobKey)){
-        logger.info("try to delete job, job name: {}, job group name: {},", jobName, jobGroupName);
-        return scheduler.deleteJob(jobKey);
-      }else {
-        return true;
-      }
-
-    } catch (SchedulerException e) {
-      logger.error("delete job : {} failed",jobName, e);
-    } finally {
-      lock.writeLock().unlock();
+
+    /**
+     * delete job
+     *
+     * @param jobName job name
+     * @param jobGroupName job group name
+     * @return true if the Job was found and deleted.
+     */
+    public boolean deleteJob(String jobName, String jobGroupName) {
+        lock.writeLock().lock();
+        try {
+            JobKey jobKey = new JobKey(jobName, jobGroupName);
+            if (scheduler.checkExists(jobKey)) {
+                logger.info("try to delete job, job name: {}, job group name: {},", jobName, jobGroupName);
+                return scheduler.deleteJob(jobKey);
+            } else {
+                return true;
+            }
+
+        } catch (SchedulerException e) {
+            logger.error("delete job : {} failed", jobName, e);
+        } finally {
+            lock.writeLock().unlock();
+        }
+        return false;
+    }
+
+    /**
+     * delete all jobs in job group
+     *
+     * @param jobGroupName job group name
+     * @return true if all of the Jobs were found and deleted, false if
+     * one or more were not deleted.
+     */
+    public boolean deleteAllJobs(String jobGroupName) {
+        lock.writeLock().lock();
+        try {
+            logger.info("try to delete all jobs in job group: {}", jobGroupName);
+            List<JobKey> jobKeys = new ArrayList<>();
+            jobKeys.addAll(scheduler.getJobKeys(GroupMatcher.groupEndsWith(jobGroupName)));
+
+            return scheduler.deleteJobs(jobKeys);
+        } catch (SchedulerException e) {
+            logger.error("delete all jobs in job group: {} failed", jobGroupName, e);
+        } finally {
+            lock.writeLock().unlock();
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * delete all jobs in job group
-   *
-   * @param jobGroupName job group name
-   *
-   * @return true if all of the Jobs were found and deleted, false if
-   *      one or more were not deleted.
-   */
-  public boolean deleteAllJobs(String jobGroupName) {
-    lock.writeLock().lock();
-    try {
-      logger.info("try to delete all jobs in job group: {}", jobGroupName);
-      List<JobKey> jobKeys = new ArrayList<>();
-      jobKeys.addAll(scheduler.getJobKeys(GroupMatcher.groupEndsWith(jobGroupName)));
-
-      return scheduler.deleteJobs(jobKeys);
-    } catch (SchedulerException e) {
-      logger.error("delete all jobs in job group: {} failed",jobGroupName, e);
-    } finally {
-      lock.writeLock().unlock();
+
+    /**
+     * build job name
+     *
+     * @param processId process id
+     * @return job name
+     */
+    public static String buildJobName(int processId) {
+        StringBuilder sb = new StringBuilder(30);
+        sb.append(QUARTZ_JOB_PRIFIX).append(UNDERLINE).append(processId);
+        return sb.toString();
+    }
+
+    /**
+     * build job group name
+     *
+     * @param projectId project id
+     * @return job group name
+     */
+    public static String buildJobGroupName(int projectId) {
+        StringBuilder sb = new StringBuilder(30);
+        sb.append(QUARTZ_JOB_GROUP_PRIFIX).append(UNDERLINE).append(projectId);
+        return sb.toString();
+    }
+
+    /**
+     * add params to map
+     *
+     * @param projectId project id
+     * @param scheduleId schedule id
+     * @param schedule schedule
+     * @return data map
+     */
+    public static Map<String, Object> buildDataMap(int projectId, int scheduleId, Schedule schedule) {
+        Map<String, Object> dataMap = new HashMap<>(3);
+        dataMap.put(PROJECT_ID, projectId);
+        dataMap.put(SCHEDULE_ID, scheduleId);
+        dataMap.put(SCHEDULE, JSONUtils.toJsonString(schedule));
+
+        return dataMap;
     }
-    return false;
-  }
-
-  /**
-   * build job name
-   * @param processId process id
-   * @return job name
-   */
-  public static String buildJobName(int processId) {
-    StringBuilder sb = new StringBuilder(30);
-    sb.append(QUARTZ_JOB_PRIFIX).append(UNDERLINE).append(processId);
-    return sb.toString();
-  }
-
-  /**
-   * build job group name
-   * @param projectId project id
-   * @return job group name
-   */
-  public static String buildJobGroupName(int projectId) {
-    StringBuilder sb = new StringBuilder(30);
-    sb.append(QUARTZ_JOB_GROUP_PRIFIX).append(UNDERLINE).append(projectId);
-    return sb.toString();
-  }
-
-  /**
-   * add params to map
-   *
-   * @param projectId   project id
-   * @param scheduleId  schedule id
-   * @param schedule    schedule
-   * @return data map
-   */
-  public static Map<String, Object> buildDataMap(int projectId, int scheduleId, Schedule schedule) {
-    Map<String, Object> dataMap = new HashMap<>(3);
-    dataMap.put(PROJECT_ID, projectId);
-    dataMap.put(SCHEDULE_ID, scheduleId);
-    dataMap.put(SCHEDULE, JSONUtils.toJsonString(schedule));
-
-    return dataMap;
-  }
 
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/AbstractCycle.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/AbstractCycle.java
index 0a2e31b610..60c862340b 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/AbstractCycle.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/AbstractCycle.java
@@ -14,159 +14,177 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.quartz.cron;
 
+import org.apache.dolphinscheduler.common.enums.CycleEnum;
+
 import com.cronutils.model.Cron;
 import com.cronutils.model.field.CronField;
 import com.cronutils.model.field.CronFieldName;
-import com.cronutils.model.field.expression.*;
-import org.apache.dolphinscheduler.common.enums.CycleEnum;
+import com.cronutils.model.field.expression.Always;
+import com.cronutils.model.field.expression.And;
+import com.cronutils.model.field.expression.Between;
+import com.cronutils.model.field.expression.Every;
+import com.cronutils.model.field.expression.FieldExpression;
+import com.cronutils.model.field.expression.On;
 
 /**
  * Cycle
  */
 public abstract class AbstractCycle {
 
-  protected Cron cron;
-
-  protected CronField minField;
-  protected CronField hourField;
-  protected CronField dayOfMonthField;
-  protected CronField dayOfWeekField;
-  protected CronField monthField;
-  protected CronField yearField;
-
-  public CycleLinks addCycle(AbstractCycle cycle) {
-    return new CycleLinks(this.cron).addCycle(this).addCycle(cycle);
-  }
-
-  /**
-   * cycle constructor
-   * @param cron cron
-   */
-  public AbstractCycle(Cron cron) {
-    if (cron == null) {
-      throw new IllegalArgumentException("cron must not be null!");
+    protected Cron cron;
+
+    protected CronField minField;
+    protected CronField hourField;
+    protected CronField dayOfMonthField;
+    protected CronField dayOfWeekField;
+    protected CronField monthField;
+    protected CronField yearField;
+
+    public CycleLinks addCycle(AbstractCycle cycle) {
+        return new CycleLinks(this.cron).addCycle(this).addCycle(cycle);
+    }
+
+    /**
+     * cycle constructor
+     *
+     * @param cron cron
+     */
+    protected AbstractCycle(Cron cron) {
+        if (cron == null) {
+            throw new IllegalArgumentException("cron must not be null!");
+        }
+
+        this.cron = cron;
+        this.minField = cron.retrieve(CronFieldName.MINUTE);
+        this.hourField = cron.retrieve(CronFieldName.HOUR);
+        this.dayOfMonthField = cron.retrieve(CronFieldName.DAY_OF_MONTH);
+        this.dayOfWeekField = cron.retrieve(CronFieldName.DAY_OF_WEEK);
+        this.monthField = cron.retrieve(CronFieldName.MONTH);
+        this.yearField = cron.retrieve(CronFieldName.YEAR);
+    }
+
+    /**
+     * whether the minute field has a value
+     *
+     * @return if minute field has a value return true，else return false
+     */
+    protected boolean minFiledIsSetAll() {
+        FieldExpression minFieldExpression = minField.getExpression();
+        return (minFieldExpression instanceof Every || minFieldExpression instanceof Always
+                || minFieldExpression instanceof Between || minFieldExpression instanceof And
+                || minFieldExpression instanceof On);
+    }
+
+    /**
+     * whether the minute field has a value of every or always
+     *
+     * @return if minute field has a value of every or always return true，else return false
+     */
+    protected boolean minFiledIsEvery() {
+        FieldExpression minFieldExpression = minField.getExpression();
+        return (minFieldExpression instanceof Every || minFieldExpression instanceof Always);
+    }
+
+    /**
+     * whether the hour field has a value
+     *
+     * @return if hour field has a value return true，else return false
+     */
+    protected boolean hourFiledIsSetAll() {
+        FieldExpression hourFieldExpression = hourField.getExpression();
+        return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always
+                || hourFieldExpression instanceof Between || hourFieldExpression instanceof And
+                || hourFieldExpression instanceof On);
+    }
+
+    /**
+     * whether the hour field has a value of every or always
+     *
+     * @return if hour field has a value of every or always return true，else return false
+     */
+    protected boolean hourFiledIsEvery() {
+        FieldExpression hourFieldExpression = hourField.getExpression();
+        return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always);
+    }
+
+    /**
+     * whether the day Of month field has a value
+     *
+     * @return if day Of month field has a value return true，else return false
+     */
+    protected boolean dayOfMonthFieldIsSetAll() {
+        return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always
+                || dayOfMonthField.getExpression() instanceof Between || dayOfMonthField.getExpression() instanceof And
+                || dayOfMonthField.getExpression() instanceof On);
+    }
+
+    /**
+     * whether the day Of Month field has a value of every or always
+     *
+     * @return if day Of Month field has a value of every or always return true，else return false
+     */
+    protected boolean dayOfMonthFieldIsEvery() {
+        return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always);
+    }
+
+    /**
+     * whether month field has a value
+     *
+     * @return if month field has a value return true，else return false
+     */
+    protected boolean monthFieldIsSetAll() {
+        FieldExpression monthFieldExpression = monthField.getExpression();
+        return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always
+                || monthFieldExpression instanceof Between || monthFieldExpression instanceof And
+                || monthFieldExpression instanceof On);
+    }
+
+    /**
+     * whether the month field has a value of every or always
+     *
+     * @return if  month field has a value of every or always return true，else return false
+     */
+    protected boolean monthFieldIsEvery() {
+        FieldExpression monthFieldExpression = monthField.getExpression();
+        return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always);
+    }
+
+    /**
+     * whether the day Of week field has a value
+     *
+     * @return if day Of week field has a value return true，else return false
+     */
+    protected boolean dayofWeekFieldIsSetAll() {
+        FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
+        return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always
+                || dayOfWeekFieldExpression instanceof Between || dayOfWeekFieldExpression instanceof And
+                || dayOfWeekFieldExpression instanceof On);
+    }
+
+    /**
+     * whether the day Of week field has a value of every or always
+     *
+     * @return if day Of week field has a value of every or always return true，else return false
+     */
+    protected boolean dayofWeekFieldIsEvery() {
+        FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
+        return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always);
     }
 
-    this.cron = cron;
-    this.minField = cron.retrieve(CronFieldName.MINUTE);
-    this.hourField = cron.retrieve(CronFieldName.HOUR);
-    this.dayOfMonthField = cron.retrieve(CronFieldName.DAY_OF_MONTH);
-    this.dayOfWeekField = cron.retrieve(CronFieldName.DAY_OF_WEEK);
-    this.monthField = cron.retrieve(CronFieldName.MONTH);
-    this.yearField = cron.retrieve(CronFieldName.YEAR);
-  }
-
-  /**
-   * whether the minute field has a value
-   * @return if minute field has a value return true，else return false
-   */
-  protected boolean minFiledIsSetAll(){
-    FieldExpression minFieldExpression = minField.getExpression();
-    return (minFieldExpression instanceof Every || minFieldExpression instanceof Always
-            || minFieldExpression instanceof Between || minFieldExpression instanceof And
-            || minFieldExpression instanceof On);
-  }
-
-
-  /**
-   * whether the minute field has a value of every or always
-   * @return if minute field has a value of every or always return true，else return false
-   */
-  protected boolean minFiledIsEvery(){
-    FieldExpression minFieldExpression = minField.getExpression();
-    return (minFieldExpression instanceof Every || minFieldExpression instanceof Always);
-  }
-
-  /**
-   * whether the hour field has a value
-   * @return if hour field has a value return true，else return false
-   */
-  protected boolean hourFiledIsSetAll(){
-    FieldExpression hourFieldExpression = hourField.getExpression();
-    return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always
-            || hourFieldExpression instanceof Between || hourFieldExpression instanceof And
-            || hourFieldExpression instanceof On);
-  }
-
-  /**
-   * whether the hour field has a value of every or always
-   * @return if hour field has a value of every or always return true，else return false
-   */
-  protected boolean hourFiledIsEvery(){
-    FieldExpression hourFieldExpression = hourField.getExpression();
-    return (hourFieldExpression instanceof Every || hourFieldExpression instanceof Always);
-  }
-
-  /**
-   * whether the day Of month field has a value
-   * @return if day Of month field has a value return true，else return false
-   */
-  protected boolean dayOfMonthFieldIsSetAll(){
-    return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always
-            || dayOfMonthField.getExpression() instanceof Between || dayOfMonthField.getExpression() instanceof And
-            || dayOfMonthField.getExpression() instanceof On);
-  }
-
-
-  /**
-   * whether the day Of Month field has a value of every or always
-   * @return if day Of Month field has a value of every or always return true，else return false
-   */
-  protected boolean dayOfMonthFieldIsEvery(){
-    return (dayOfMonthField.getExpression() instanceof Every || dayOfMonthField.getExpression() instanceof Always);
-  }
-
-  /**
-   * whether month field has a value
-   * @return if month field has a value return true，else return false
-   */
-  protected boolean monthFieldIsSetAll(){
-    FieldExpression monthFieldExpression = monthField.getExpression();
-    return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always
-            || monthFieldExpression instanceof Between || monthFieldExpression instanceof And
-            || monthFieldExpression instanceof On);
-  }
-
-  /**
-   * whether the month field has a value of every or always
-   * @return if  month field has a value of every or always return true，else return false
-   */
-  protected boolean monthFieldIsEvery(){
-    FieldExpression monthFieldExpression = monthField.getExpression();
-    return (monthFieldExpression instanceof Every || monthFieldExpression instanceof Always);
-  }
-
-  /**
-   * whether the day Of week field has a value
-   * @return if day Of week field has a value return true，else return false
-   */
-  protected boolean dayofWeekFieldIsSetAll(){
-    FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
-    return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always
-            || dayOfWeekFieldExpression instanceof Between || dayOfWeekFieldExpression instanceof And
-            || dayOfWeekFieldExpression instanceof On);
-  }
-
-  /**
-   * whether the day Of week field has a value of every or always
-   * @return if day Of week field has a value of every or always return true，else return false
-   */
-  protected boolean dayofWeekFieldIsEvery(){
-    FieldExpression dayOfWeekFieldExpression = dayOfWeekField.getExpression();
-    return (dayOfWeekFieldExpression instanceof Every || dayOfWeekFieldExpression instanceof Always);
-  }
-
-  /**
-   * get cycle enum
-   * @return CycleEnum
-   */
-  protected abstract CycleEnum getCycle();
-
-  /**
-   * get mini level cycle enum
-   * @return CycleEnum
-   */
-  protected abstract CycleEnum getMiniCycle();
+    /**
+     * get cycle enum
+     *
+     * @return CycleEnum
+     */
+    protected abstract CycleEnum getCycle();
+
+    /**
+     * get mini level cycle enum
+     *
+     * @return CycleEnum
+     */
+    protected abstract CycleEnum getMiniCycle();
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/AbstractZKClient.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/AbstractZKClient.java
index 8a7d891c2e..37d8f10c93 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/AbstractZKClient.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/AbstractZKClient.java
@@ -14,322 +14,329 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.zk;
 
-import org.apache.curator.framework.recipes.locks.InterProcessMutex;
+import static org.apache.dolphinscheduler.common.Constants.ADD_ZK_OP;
+import static org.apache.dolphinscheduler.common.Constants.COLON;
+import static org.apache.dolphinscheduler.common.Constants.DELETE_ZK_OP;
+import static org.apache.dolphinscheduler.common.Constants.DIVISION_STRING;
+import static org.apache.dolphinscheduler.common.Constants.MASTER_PREFIX;
+import static org.apache.dolphinscheduler.common.Constants.SINGLE_SLASH;
+import static org.apache.dolphinscheduler.common.Constants.UNDERLINE;
+import static org.apache.dolphinscheduler.common.Constants.WORKER_PREFIX;
+
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ZKNodeType;
 import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.common.utils.ResInfo;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
+
+import org.apache.curator.framework.recipes.locks.InterProcessMutex;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-
-import static org.apache.dolphinscheduler.common.Constants.*;
-
 /**
  * abstract zookeeper client
  */
 @Component
 public abstract class AbstractZKClient extends ZookeeperCachedOperator {
 
-	private static final Logger logger = LoggerFactory.getLogger(AbstractZKClient.class);
-
-
-	/**
-	 *  remove dead server by host
-	 * @param host host
-	 * @param serverType serverType
-	 * @throws Exception
-	 */
-	public void removeDeadServerByHost(String host, String serverType) throws Exception {
-		List<String> deadServers = super.getChildrenKeys(getDeadZNodeParentPath());
-		for(String serverPath : deadServers){
-			if(serverPath.startsWith(serverType+UNDERLINE+host)){
-				String server = getDeadZNodeParentPath() + SINGLE_SLASH + serverPath;
-				super.remove(server);
-				logger.info("{} server {} deleted from zk dead server path success" , serverType , host);
-			}
-		}
-	}
-
-
-	/**
-	 * opType(add): if find dead server , then add to zk deadServerPath
-	 * opType(delete): delete path from zk
-	 *
-	 * @param zNode   		  node path
-	 * @param zkNodeType	  master or worker
-	 * @param opType		  delete or add
-	 * @throws Exception errors
-	 */
-	public void handleDeadServer(String zNode, ZKNodeType zkNodeType, String opType) throws Exception {
-		String host = getHostByEventDataPath(zNode);
-		String type = (zkNodeType == ZKNodeType.MASTER) ? MASTER_PREFIX : WORKER_PREFIX;
-
-		//check server restart, if restart , dead server path in zk should be delete
-		if(opType.equals(DELETE_ZK_OP)){
-			removeDeadServerByHost(host, type);
-
-		}else if(opType.equals(ADD_ZK_OP)){
-			String deadServerPath = getDeadZNodeParentPath() + SINGLE_SLASH + type + UNDERLINE + host;
-			if(!super.isExisted(deadServerPath)){
-				//add dead server info to zk dead server path : /dead-servers/
-
-				super.persist(deadServerPath,(type + UNDERLINE + host));
-
-				logger.info("{} server dead , and {} added to zk dead server path success" ,
-						zkNodeType.toString(), zNode);
-			}
-		}
-
-	}
-
-	/**
-	 * get active master num
-	 * @return active master number
-	 */
-	public int getActiveMasterNum(){
-		List<String> childrenList = new ArrayList<>();
-		try {
-			// read master node parent path from conf
-			if(super.isExisted(getZNodeParentPath(ZKNodeType.MASTER))){
-				childrenList = super.getChildrenKeys(getZNodeParentPath(ZKNodeType.MASTER));
-			}
-		} catch (Exception e) {
-			logger.error("getActiveMasterNum error",e);
-		}
-		return childrenList.size();
-	}
-
-	/**
-	 *
-	 * @return zookeeper quorum
-	 */
-	public String getZookeeperQuorum(){
-		return getZookeeperConfig().getServerList();
-	}
-
-	/**
-	 * get server list.
-	 * @param zkNodeType zookeeper node type
-	 * @return server list
-	 */
-	public List<Server> getServersList(ZKNodeType zkNodeType){
-		Map<String, String> masterMap = getServerMaps(zkNodeType);
-		String parentPath = getZNodeParentPath(zkNodeType);
-
-		List<Server> masterServers = new ArrayList<>();
-		for (Map.Entry<String, String> entry : masterMap.entrySet()) {
-			Server masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
-			if(masterServer == null){
-				continue;
-			}
-			String key = entry.getKey();
-			masterServer.setZkDirectory(parentPath + "/"+ key);
-			//set host and port
-			String[] hostAndPort=key.split(COLON);
-			String[] hosts=hostAndPort[0].split(DIVISION_STRING);
-			// fetch the last one
-			masterServer.setHost(hosts[hosts.length-1]);
-			masterServer.setPort(Integer.parseInt(hostAndPort[1]));
-			masterServers.add(masterServer);
-		}
-		return masterServers;
-	}
-
-	/**
-	 * get master server list map.
-	 * @param zkNodeType zookeeper node type
-	 * @return result : {host : resource info}
-	 */
-	public Map<String, String> getServerMaps(ZKNodeType zkNodeType){
-
-		Map<String, String> masterMap = new HashMap<>();
-		try {
-			String path =  getZNodeParentPath(zkNodeType);
-			List<String> serverList  = super.getChildrenKeys(path);
-			if(zkNodeType == ZKNodeType.WORKER){
-			    List<String> workerList = new ArrayList<>();
-			    for(String group : serverList){
-			    	List<String> groupServers = super.getChildrenKeys(path + Constants.SLASH + group);
-			    	for(String groupServer : groupServers){
-			    		workerList.add(group + Constants.SLASH + groupServer);
-					}
-				}
-				serverList = workerList;
-			}
-			for(String server : serverList){
-				masterMap.putIfAbsent(server, super.get(path + Constants.SLASH + server));
-			}
-		} catch (Exception e) {
-			logger.error("get server list failed", e);
-		}
-
-		return masterMap;
-	}
-
-	/**
-	 * check the zookeeper node already exists
-	 * @param host host
-	 * @param zkNodeType zookeeper node type
-	 * @return true if exists
-	 */
-	public boolean checkZKNodeExists(String host, ZKNodeType zkNodeType) {
-		String path = getZNodeParentPath(zkNodeType);
-		if(StringUtils.isEmpty(path)){
-			logger.error("check zk node exists error, host:{}, zk node type:{}",
-					host, zkNodeType.toString());
-			return false;
-		}
-		Map<String, String> serverMaps = getServerMaps(zkNodeType);
-		for(String hostKey : serverMaps.keySet()){
-			if(hostKey.contains(host)){
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 *
-	 * @return get worker node parent path
-	 */
-	protected String getWorkerZNodeParentPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_WORKERS;
-	}
-
-	/**
-	 *
-	 * @return get master node parent path
-	 */
-	protected String getMasterZNodeParentPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_MASTERS;
-	}
-
-	/**
-	 *
-	 * @return get master lock path
-	 */
-	public String getMasterLockPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_MASTERS;
-	}
-
-	/**
-	 *
-	 * @param zkNodeType zookeeper node type
-	 * @return get zookeeper node parent path
-	 */
-	public String getZNodeParentPath(ZKNodeType zkNodeType) {
-		String path = "";
-		switch (zkNodeType){
-			case MASTER:
-				return getMasterZNodeParentPath();
-			case WORKER:
-				return getWorkerZNodeParentPath();
-			case DEAD_SERVER:
-				return getDeadZNodeParentPath();
-			default:
-				break;
-		}
-		return path;
-	}
-
-	/**
-	 *
-	 * @return get dead server node parent path
-	 */
-	protected String getDeadZNodeParentPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_DEAD_SERVERS;
-	}
-
-	/**
-	 *
-	 * @return get master start up lock path
-	 */
-	public String getMasterStartUpLockPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS;
-	}
-
-	/**
-	 *
-	 * @return get master failover lock path
-	 */
-	public String getMasterFailoverLockPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS;
-	}
-
-	/**
-	 *
-	 * @return get worker failover lock path
-	 */
-	public String getWorkerFailoverLockPath(){
-		return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS;
-	}
-
-	/**
-	 * release mutex
-	 * @param mutex mutex
-	 */
-	public void releaseMutex(InterProcessMutex mutex) {
-		if (mutex != null){
-			try {
-				mutex.release();
-			} catch (Exception e) {
-				if("instance must be started before calling this method".equals(e.getMessage())){
-					logger.warn("lock release");
-				}else{
-					logger.error("lock release failed",e);
-				}
-
-			}
-		}
-	}
-
-	/**
-	 *  init system znode
-	 */
-	protected void initSystemZNode(){
-		try {
-			persist(getMasterZNodeParentPath(), "");
-			persist(getWorkerZNodeParentPath(), "");
-			persist(getDeadZNodeParentPath(), "");
-
-			logger.info("initialize server nodes success.");
-		} catch (Exception e) {
-			logger.error("init system znode failed",e);
-		}
-	}
-
-	/**
-	 *  get host ip, string format: masterParentPath/ip
-	 * @param path path
-	 * @return host ip, string format: masterParentPath/ip
-	 */
-	protected String getHostByEventDataPath(String path) {
-		if(StringUtils.isEmpty(path)){
-			logger.error("empty path!");
-			return "";
-		}
-		String[] pathArray = path.split(SINGLE_SLASH);
-		if(pathArray.length < 1){
-			logger.error("parse ip error: {}", path);
-			return "";
-		}
-		return pathArray[pathArray.length - 1];
-
-	}
-
-	@Override
-	public String toString() {
-		return "AbstractZKClient{" +
-				"zkClient=" + getZkClient() +
-				", deadServerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.DEAD_SERVER) + '\'' +
-				", masterZNodeParentPath='" + getZNodeParentPath(ZKNodeType.MASTER) + '\'' +
-				", workerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.WORKER) + '\'' +
-				'}';
-	}
-}
\ No newline at end of file
+    private static final Logger logger = LoggerFactory.getLogger(AbstractZKClient.class);
+
+    /**
+     * remove dead server by host
+     *
+     * @param host host
+     * @param serverType serverType
+     */
+    public void removeDeadServerByHost(String host, String serverType) {
+        List<String> deadServers = super.getChildrenKeys(getDeadZNodeParentPath());
+        for (String serverPath : deadServers) {
+            if (serverPath.startsWith(serverType + UNDERLINE + host)) {
+                String server = getDeadZNodeParentPath() + SINGLE_SLASH + serverPath;
+                super.remove(server);
+                logger.info("{} server {} deleted from zk dead server path success", serverType, host);
+            }
+        }
+    }
+
+    /**
+     * opType(add): if find dead server , then add to zk deadServerPath
+     * opType(delete): delete path from zk
+     *
+     * @param zNode node path
+     * @param zkNodeType master or worker
+     * @param opType delete or add
+     */
+    public void handleDeadServer(String zNode, ZKNodeType zkNodeType, String opType) {
+        String host = getHostByEventDataPath(zNode);
+        String type = (zkNodeType == ZKNodeType.MASTER) ? MASTER_PREFIX : WORKER_PREFIX;
+
+        //check server restart, if restart , dead server path in zk should be delete
+        if (opType.equals(DELETE_ZK_OP)) {
+            removeDeadServerByHost(host, type);
+
+        } else if (opType.equals(ADD_ZK_OP)) {
+            String deadServerPath = getDeadZNodeParentPath() + SINGLE_SLASH + type + UNDERLINE + host;
+            if (!super.isExisted(deadServerPath)) {
+                //add dead server info to zk dead server path : /dead-servers/
+
+                super.persist(deadServerPath, (type + UNDERLINE + host));
+
+                logger.info("{} server dead , and {} added to zk dead server path success",
+                        zkNodeType, zNode);
+            }
+        }
+
+    }
+
+    /**
+     * get active master num
+     *
+     * @return active master number
+     */
+    public int getActiveMasterNum() {
+        List<String> childrenList = new ArrayList<>();
+        try {
+            // read master node parent path from conf
+            if (super.isExisted(getZNodeParentPath(ZKNodeType.MASTER))) {
+                childrenList = super.getChildrenKeys(getZNodeParentPath(ZKNodeType.MASTER));
+            }
+        } catch (Exception e) {
+            logger.error("getActiveMasterNum error", e);
+        }
+        return childrenList.size();
+    }
+
+    /**
+     * @return zookeeper quorum
+     */
+    public String getZookeeperQuorum() {
+        return getZookeeperConfig().getServerList();
+    }
+
+    /**
+     * get server list.
+     *
+     * @param zkNodeType zookeeper node type
+     * @return server list
+     */
+    public List<Server> getServersList(ZKNodeType zkNodeType) {
+        Map<String, String> masterMap = getServerMaps(zkNodeType);
+        String parentPath = getZNodeParentPath(zkNodeType);
+
+        List<Server> masterServers = new ArrayList<>();
+        for (Map.Entry<String, String> entry : masterMap.entrySet()) {
+            Server masterServer = ResInfo.parseHeartbeatForZKInfo(entry.getValue());
+            if (masterServer == null) {
+                continue;
+            }
+            String key = entry.getKey();
+            masterServer.setZkDirectory(parentPath + "/" + key);
+            //set host and port
+            String[] hostAndPort = key.split(COLON);
+            String[] hosts = hostAndPort[0].split(DIVISION_STRING);
+            // fetch the last one
+            masterServer.setHost(hosts[hosts.length - 1]);
+            masterServer.setPort(Integer.parseInt(hostAndPort[1]));
+            masterServers.add(masterServer);
+        }
+        return masterServers;
+    }
+
+    /**
+     * get master server list map.
+     *
+     * @param zkNodeType zookeeper node type
+     * @return result : {host : resource info}
+     */
+    public Map<String, String> getServerMaps(ZKNodeType zkNodeType) {
+
+        Map<String, String> masterMap = new HashMap<>();
+        try {
+            String path = getZNodeParentPath(zkNodeType);
+            List<String> serverList = super.getChildrenKeys(path);
+            if (zkNodeType == ZKNodeType.WORKER) {
+                List<String> workerList = new ArrayList<>();
+                for (String group : serverList) {
+                    List<String> groupServers = super.getChildrenKeys(path + Constants.SLASH + group);
+                    for (String groupServer : groupServers) {
+                        workerList.add(group + Constants.SLASH + groupServer);
+                    }
+                }
+                serverList = workerList;
+            }
+            for (String server : serverList) {
+                masterMap.putIfAbsent(server, super.get(path + Constants.SLASH + server));
+            }
+        } catch (Exception e) {
+            logger.error("get server list failed", e);
+        }
+
+        return masterMap;
+    }
+
+    /**
+     * check the zookeeper node already exists
+     *
+     * @param host host
+     * @param zkNodeType zookeeper node type
+     * @return true if exists
+     */
+    public boolean checkZKNodeExists(String host, ZKNodeType zkNodeType) {
+        String path = getZNodeParentPath(zkNodeType);
+        if (StringUtils.isEmpty(path)) {
+            logger.error("check zk node exists error, host:{}, zk node type:{}",
+                    host, zkNodeType);
+            return false;
+        }
+        Map<String, String> serverMaps = getServerMaps(zkNodeType);
+        for (String hostKey : serverMaps.keySet()) {
+            if (hostKey.contains(host)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @return get worker node parent path
+     */
+    protected String getWorkerZNodeParentPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_WORKERS;
+    }
+
+    /**
+     * @return get master node parent path
+     */
+    protected String getMasterZNodeParentPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_MASTERS;
+    }
+
+    /**
+     * @return get master lock path
+     */
+    public String getMasterLockPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_MASTERS;
+    }
+
+    /**
+     * @param zkNodeType zookeeper node type
+     * @return get zookeeper node parent path
+     */
+    public String getZNodeParentPath(ZKNodeType zkNodeType) {
+        String path = "";
+        switch (zkNodeType) {
+            case MASTER:
+                return getMasterZNodeParentPath();
+            case WORKER:
+                return getWorkerZNodeParentPath();
+            case DEAD_SERVER:
+                return getDeadZNodeParentPath();
+            default:
+                break;
+        }
+        return path;
+    }
+
+    /**
+     * @return get dead server node parent path
+     */
+    protected String getDeadZNodeParentPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_DEAD_SERVERS;
+    }
+
+    /**
+     * @return get master start up lock path
+     */
+    public String getMasterStartUpLockPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS;
+    }
+
+    /**
+     * @return get master failover lock path
+     */
+    public String getMasterFailoverLockPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS;
+    }
+
+    /**
+     * @return get worker failover lock path
+     */
+    public String getWorkerFailoverLockPath() {
+        return getZookeeperConfig().getDsRoot() + Constants.ZOOKEEPER_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS;
+    }
+
+    /**
+     * release mutex
+     *
+     * @param mutex mutex
+     */
+    public void releaseMutex(InterProcessMutex mutex) {
+        if (mutex != null) {
+            try {
+                mutex.release();
+            } catch (Exception e) {
+                if ("instance must be started before calling this method".equals(e.getMessage())) {
+                    logger.warn("lock release");
+                } else {
+                    logger.error("lock release failed", e);
+                }
+
+            }
+        }
+    }
+
+    /**
+     * init system znode
+     */
+    protected void initSystemZNode() {
+        try {
+            persist(getMasterZNodeParentPath(), "");
+            persist(getWorkerZNodeParentPath(), "");
+            persist(getDeadZNodeParentPath(), "");
+
+            logger.info("initialize server nodes success.");
+        } catch (Exception e) {
+            logger.error("init system znode failed", e);
+        }
+    }
+
+    /**
+     * get host ip, string format: masterParentPath/ip
+     *
+     * @param path path
+     * @return host ip, string format: masterParentPath/ip
+     */
+    protected String getHostByEventDataPath(String path) {
+        if (StringUtils.isEmpty(path)) {
+            logger.error("empty path!");
+            return "";
+        }
+        String[] pathArray = path.split(SINGLE_SLASH);
+        if (pathArray.length < 1) {
+            logger.error("parse ip error: {}", path);
+            return "";
+        }
+        return pathArray[pathArray.length - 1];
+
+    }
+
+    @Override
+    public String toString() {
+        return "AbstractZKClient{"
+                + "zkClient=" + getZkClient()
+                + ", deadServerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.DEAD_SERVER) + '\''
+                + ", masterZNodeParentPath='" + getZNodeParentPath(ZKNodeType.MASTER) + '\''
+                + ", workerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.WORKER) + '\''
+                + '}';
+    }
+}
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/CuratorZookeeperClient.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/CuratorZookeeperClient.java
index 5a04c5a23b..e25a22f031 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/CuratorZookeeperClient.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/CuratorZookeeperClient.java
@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.zk;
 
-import org.apache.commons.lang.StringUtils;
+import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
+
+import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
+
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.ACLProvider;
@@ -25,18 +30,16 @@ import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.data.ACL;
 
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
-
 /**
  * Shared Curator zookeeper client
  */
@@ -49,7 +52,6 @@ public class CuratorZookeeperClient implements InitializingBean {
 
     private CuratorFramework zkClient;
 
-
     @Override
     public void afterPropertiesSet() throws Exception {
         this.zkClient = buildClient();
@@ -91,7 +93,7 @@ public class CuratorZookeeperClient implements InitializingBean {
             zkClient.blockUntilConnected(30, TimeUnit.SECONDS);
 
         } catch (final Exception ex) {
-            throw new RuntimeException(ex);
+            throw new ServiceException(ex);
         }
         return zkClient;
     }
@@ -123,4 +125,4 @@ public class CuratorZookeeperClient implements InitializingBean {
     public CuratorFramework getZkClient() {
         return zkClient;
     }
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
index c7a53ebdc0..7ac23a3c4d 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
@@ -14,19 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.zk;
 
 import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
+
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * just speed experience version
@@ -51,10 +54,10 @@ public class ZKServer {
         ZKServer zkServer;
         if (args.length == 0) {
             zkServer = new ZKServer();
-        } else if (args.length == 1){
-            zkServer = new ZKServer(Integer.valueOf(args[0]), "");
+        } else if (args.length == 1) {
+            zkServer = new ZKServer(Integer.parseInt(args[0]), "");
         } else {
-            zkServer = new ZKServer(Integer.valueOf(args[0]), args[1]);
+            zkServer = new ZKServer(Integer.parseInt(args[0]), args[1]);
         }
         zkServer.registerHook();
         zkServer.start();
@@ -73,7 +76,7 @@ public class ZKServer {
     }
 
     private void registerHook() {
-        /**
+        /*
          *  register hooks, which are called before the process exits
          */
         Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
@@ -90,7 +93,7 @@ public class ZKServer {
         }
     }
 
-    public boolean isStarted(){
+    public boolean isStarted() {
         return isStarted.get();
     }
 
@@ -119,19 +122,19 @@ public class ZKServer {
         if (file.exists()) {
             logger.warn("The path of zk server exists");
         }
-        logger.info("zk server starting, data dir path:{}" , zkDataDir);
-        startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME,"60");
+        logger.info("zk server starting, data dir path:{}", zkDataDir);
+        startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME, "60");
     }
 
     /**
      * Starts a local Zk instance
      *
-     * @param port        The port to listen on
+     * @param port The port to listen on
      * @param dataDirPath The path for the Zk data directory
-     * @param tickTime    zk tick time
-     * @param maxClientCnxns    zk max client connections
+     * @param tickTime zk tick time
+     * @param maxClientCnxns zk max client connections
      */
-    private void startLocalZkServer(final int port, final String dataDirPath,final int tickTime,String maxClientCnxns) {
+    private void startLocalZkServer(final int port, final String dataDirPath, final int tickTime, String maxClientCnxns) {
         if (isStarted.compareAndSet(false, true)) {
             zooKeeperServerMain = new PublicZooKeeperServerMain();
             logger.info("Zookeeper data path : {} ", dataDirPath);
@@ -144,8 +147,7 @@ public class ZKServer {
 
                 zooKeeperServerMain.initializeAndRun(args);
             } catch (QuorumPeerConfig.ConfigException | IOException e) {
-                logger.warn("Caught exception while starting ZK", e);
-                throw new RuntimeException(e);
+                throw new ServiceException("Caught exception while starting ZK", e);
             }
         }
     }
@@ -159,7 +161,7 @@ public class ZKServer {
             logger.info("zk server stopped");
 
         } catch (Exception e) {
-            logger.error("Failed to stop ZK ",e);
+            logger.error("Failed to stop ZK ", e);
         }
     }
 
@@ -180,8 +182,7 @@ public class ZKServer {
                     org.apache.commons.io.FileUtils.deleteDirectory(new File(dataDir));
                 }
             } catch (Exception e) {
-                logger.warn("Caught exception while stopping ZK server", e);
-                throw new RuntimeException(e);
+                throw new ServiceException("Caught exception while starting ZK", e);
             }
         }
     }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java
index 6dfce79a3a..88c339b045 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java
@@ -14,21 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.zk;
 
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
 
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.TreeCache;
 import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
 import org.apache.curator.framework.recipes.cache.TreeCacheListener;
+
+import java.nio.charset.StandardCharsets;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.nio.charset.StandardCharsets;
-
 @Component
 public class ZookeeperCachedOperator extends ZookeeperOperator {
 
@@ -36,6 +39,7 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
 
 
     private TreeCache treeCache;
+
     /**
      * register a unified listener of /${dsRoot},
      */
@@ -59,14 +63,16 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
             treeCache.start();
         } catch (Exception e) {
             logger.error("add listener to zk path: {} failed", getZookeeperConfig().getDsRoot());
-            throw new RuntimeException(e);
+            throw new ServiceException(e);
         }
     }
 
     //for sub class
-    protected void dataChanged(final CuratorFramework client, final TreeCacheEvent event, final String path){}
+    protected void dataChanged(final CuratorFramework client, final TreeCacheEvent event, final String path) {
+        // Used by sub class
+    }
 
-    public String getFromCache(final String cachePath, final String key) {
+    public String getFromCache(final String key) {
         ChildData resultInCache = treeCache.getCurrentData(key);
         if (null != resultInCache) {
             return null == resultInCache.getData() ? null : new String(resultInCache.getData(), StandardCharsets.UTF_8);
@@ -74,11 +80,11 @@ public class ZookeeperCachedOperator extends ZookeeperOperator {
         return null;
     }
 
-    public TreeCache getTreeCache(final String cachePath) {
+    public TreeCache getTreeCache() {
         return treeCache;
     }
 
-    public void addListener(TreeCacheListener listener){
+    public void addListener(TreeCacheListener listener) {
         this.treeCache.getListenable().addListener(listener);
     }
 
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java
index e7b049f8bf..8a219837b7 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperOperator.java
@@ -14,13 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.service.zk;
 
-import org.apache.commons.lang.StringUtils;
+import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
+
+import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.apache.dolphinscheduler.service.exceptions.ServiceException;
+
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.api.ACLProvider;
-import org.apache.curator.framework.api.transaction.CuratorOp;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.utils.CloseableUtils;
@@ -29,18 +33,16 @@ import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
-
 /**
  * zk base operator
  */
@@ -64,19 +66,23 @@ public class ZookeeperOperator implements InitializingBean {
     /**
      * this method is for sub class,
      */
-    protected void registerListener(){}
+    protected void registerListener() {
+        // Used by sub class
+    }
 
-    protected void treeCacheStart(){}
+    protected void treeCacheStart() {
+        // Used by sub class
+    }
 
     public void initStateLister() {
         checkNotNull(zkClient);
 
         zkClient.getConnectionStateListenable().addListener((client, newState) -> {
-            if(newState == ConnectionState.LOST){
+            if (newState == ConnectionState.LOST) {
                 logger.error("connection lost from zookeeper");
-            } else if(newState == ConnectionState.RECONNECTED){
+            } else if (newState == ConnectionState.RECONNECTED) {
                 logger.info("reconnected to zookeeper");
-            } else if(newState == ConnectionState.SUSPENDED){
+            } else if (newState == ConnectionState.SUSPENDED) {
                 logger.warn("connection SUSPENDED to zookeeper");
             }
         });
@@ -85,7 +91,8 @@ public class ZookeeperOperator implements InitializingBean {
     private CuratorFramework buildClient() {
         logger.info("zookeeper registry center init, server lists is: {}.", zookeeperConfig.getServerList());
 
-        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder().ensembleProvider(new DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),"zookeeper quorum can't be null")))
+        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder().ensembleProvider(new DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),
+                "zookeeper quorum can't be null")))
                 .retryPolicy(new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMs(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepMs()));
 
         //these has default value
@@ -114,7 +121,7 @@ public class ZookeeperOperator implements InitializingBean {
         try {
             zkClient.blockUntilConnected();
         } catch (final Exception ex) {
-            throw new RuntimeException(ex);
+            throw new ServiceException(ex);
         }
         return zkClient;
     }
@@ -138,12 +145,12 @@ public class ZookeeperOperator implements InitializingBean {
             throw new IllegalStateException(ex);
         } catch (Exception ex) {
             logger.error("getChildrenKeys key : {}", key, ex);
-            throw new RuntimeException(ex);
+            throw new ServiceException(ex);
         }
     }
 
-    public boolean hasChildren(final String key){
-        Stat stat ;
+    public boolean hasChildren(final String key) {
+        Stat stat;
         try {
             stat = zkClient.checkExists().forPath(key);
             return stat.getNumChildren() >= 1;
@@ -241,4 +248,4 @@ public class ZookeeperOperator implements InitializingBean {
     public void close() {
         CloseableUtils.closeQuietly(zkClient);
     }
-}
\ No newline at end of file
+}

From ad82bb021502c697cf744868ac26dd4d0ed1605e Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Fri, 29 Jan 2021 19:54:18 +0800
Subject: [PATCH 26/87] fix ui datasource dialog visible. (#4597)

---
 .../src/js/conf/home/pages/datasource/pages/list/index.vue       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
index 04683ebe4e..545c6c0b70 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@@ -22,6 +22,7 @@
           <el-button size="mini" @click="_create('')">{{$t('Create Datasource')}}</el-button>
           <el-dialog
             :title="item ?($t('Edit')+$t('Datasource')) : ($t('Create')+$t('Datasource'))"
+            v-if="dialogVisible"
             :visible.sync="dialogVisible"
             width="auto"
             :append-to-body="true">

From e54e42339aceef0eb747ee5e7b1213c47c8ff358 Mon Sep 17 00:00:00 2001
From: Tq <36755957+Tianqi-Dotes@users.noreply.github.com>
Date: Fri, 29 Jan 2021 21:33:58 +0800
Subject: [PATCH 27/87] Review readme (#4614)

* fix DS introduction in the README.md

* review README.md

* Update README.md

add some content

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 README.md | 54 +++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index ede405baa7..1d5ce11f0b 100644
--- a/README.md
+++ b/README.md
@@ -7,46 +7,44 @@ Dolphin Scheduler Official Website
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache-dolphinscheduler&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache-dolphinscheduler)
 
 
-> Dolphin Scheduler for Big Data
-
 [![Stargazers over time](https://starchart.cc/apache/incubator-dolphinscheduler.svg)](https://starchart.cc/apache/incubator-dolphinscheduler)
 
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](README.md)
 [![CN doc](https://img.shields.io/badge/文档-中文版-blue.svg)](README_zh_CN.md)
 
 
-### Design features:
+### Design Features:
 
-Dolphin Scheduler is a distributed and easy-to-extend visual DAG workflow scheduling system. It dedicates to solving the complex dependencies in data processing to make the scheduling system `out of the box` for the data processing process.
+DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing multiple types of jobs available `out of the box`. 
 
 Its main objectives are as follows:
 
  - Associate the tasks according to the dependencies of the tasks in a DAG graph, which can visualize the running state of the task in real-time.
- - Support many task types: Shell, MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Sub_Process, Procedure, etc.
- - Support process scheduling, dependency scheduling, manual scheduling, manual pause/stop/recovery, support for failed retry/alarm, recovery from specified nodes, Kill task, etc.
- - Support the priority of process & task, task failover, and task timeout alarm or failure.
- - Support process global parameters and node custom parameter settings.
- - Support online upload/download of resource files, management, etc. Support online file creation and editing.
- - Support task log online viewing and scrolling, online download log, etc.
- - Implement cluster HA, decentralize Master cluster and Worker cluster through Zookeeper.
+ - Support various task types: Shell, MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Sub_Process, Procedure, etc.
+ - Support scheduling of workflows and dependencies, manual scheduling to pause/stop/recover task, support failure task retry/alarm, recover specified nodes from failure, kill task, etc.
+ - Support the priority of workflows & tasks, task failover, and task timeout alarm or failure.
+ - Support workflow global parameters and node customized parameter settings.
+ - Support online upload/download/management of resource files, etc. Support online file creation and editing.
+ - Support task log online viewing and scrolling and downloading, etc.
+ - Have implemented cluster HA, decentralize Master cluster and Worker cluster through Zookeeper.
  - Support the viewing of Master/Worker CPU load, memory, and CPU usage metrics.
- - Support presenting tree or Gantt chart of workflow history as well as the statistics results of task & process status in each workflow.
- - Support backfilling data.
+ - Support displaying workflow history in tree/Gantt chart, as well as statistical analysis on the task status & process status in each workflow.
+ - Support back-filling data.
  - Support multi-tenant.
  - Support internationalization.
- - There are more waiting for partners to explore...
+ - More features waiting for partners to explore...
 
 
-### What's in Dolphin Scheduler
+### What's in DolphinScheduler
 
  Stability | Easy to use | Features | Scalability |
  -- | -- | -- | --
-Decentralized multi-master and multi-worker | Visualization process defines key information such as task status, task type, retry times, task running machine, visual variables, and so on at a glance.  |  Support pause, recover operation | Support custom task types
-HA is supported by itself | All process definition operations are visualized, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, the API mode operation is provided. | Users on Dolphin Scheduler can achieve many-to-one or one-to-one mapping relationship through tenants and Hadoop users, which is very important for scheduling large data jobs.  | The scheduler uses distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic online and offline.
-Overload processing: Overload processing: By using the task queue mechanism, the number of schedulable tasks on a single machine can be flexibly configured. Machine jam can be avoided with high tolerance to numbers of tasks cached in task queue. | One-click deployment | Support traditional shell tasks, and big data platform task scheduling: MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Procedure, Sub_Process |  |
+Decentralized multi-master and multi-worker | Visualization of workflow key information, such as task status, task type, retry times, task operation machine information, visual variables, and so on at a glance.  |  Support pause, recover operation | Support customized task types
+support HA | Visualization of all workflow operations, dragging tasks to draw DAGs, configuring data sources and resources. At the same time, for third-party systems, provide API mode operations. | Users on DolphinScheduler can achieve many-to-one or one-to-one mapping relationship through tenants and Hadoop users, which is very important for scheduling large data jobs.  | The scheduler supports distributed scheduling, and the overall scheduling capability will increase linearly with the scale of the cluster. Master and Worker support dynamic adjustment.
+Overload processing: By using the task queue mechanism, the number of schedulable tasks on a single machine can be flexibly configured. Machine jam can be avoided with high tolerance to numbers of tasks cached in task queue. | One-click deployment | Support traditional shell tasks, and big data platform task scheduling: MR, Spark, SQL (MySQL, PostgreSQL, hive, spark SQL), Python, Procedure, Sub_Process |  |
 
 
-### System partial screenshot
+### User Interface Screenshots
 
 ![home page](https://user-images.githubusercontent.com/15833811/75218288-bf286400-57d4-11ea-8263-d639c6511d5f.jpg)
 ![dag](https://user-images.githubusercontent.com/15833811/75236750-3374fe80-57f9-11ea-857d-62a66a5a559d.png)
@@ -57,13 +55,9 @@ Overload processing: Overload processing: By using the task queue mechanism, the
 ![security](https://user-images.githubusercontent.com/15833811/75236441-bfd2f180-57f8-11ea-88bd-f24311e01b7e.png)
 ![treeview](https://user-images.githubusercontent.com/15833811/75217191-3fe56100-57d1-11ea-8856-f19180d9a879.png)
 
+### QuickStart in Docker
+Please referer the official website document:[[QuickStart in Docker](https://dolphinscheduler.apache.org/en-us/docs/1.3.4/user_doc/docker-deployment.html)]
 
-### Recent R&D plan
-The work plan of Dolphin Scheduler: [R&D plan](https://github.com/apache/incubator-dolphinscheduler/projects/1), which `In Develop` card shows the features that are currently being developed and TODO card lists what needs to be done(including feature ideas).
-
-### How to contribute
-
-Welcome to participate in contributing, please refer to this website to find out more: [[How to contribute](https://dolphinscheduler.apache.org/en-us/docs/development/contribute.html)]
 
 ### How to Build
 
@@ -80,14 +74,16 @@ dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${latest.release
 
 ### Thanks
 
-Dolphin Scheduler is based on a lot of excellent open-source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open-source projects of Apache and so on.
-We would like to express our deep gratitude to all the open-source projects which contribute to making the dream of Dolphin Scheduler comes true. We hope that we are not only the beneficiaries of open-source, but also give back to the community. Besides, we expect the partners who have the same passion and conviction to open-source will join in and contribute to the open-source community!
-
+DolphinScheduler is based on a lot of excellent open-source projects, such as google guava, guice, grpc, netty, ali bonecp, quartz, and many open-source projects of Apache and so on.
+We would like to express our deep gratitude to all the open-source projects used in Dolphin Scheduler. We hope that we are not only the beneficiaries of open-source, but also give back to the community. Besides, we hope everyone who have the same enthusiasm and passion for open source could join in and contribute to the open-source community!
 
 ### Get Help
-1. Submit an issue
+1. Submit an [[issue](https://github.com/apache/incubator-dolphinscheduler/issues/new/choose)]
 1. Subscribe to the mail list: https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html, then email dev@dolphinscheduler.apache.org
 
+### How to Contribute
+The community welcomes everyone to participate in contributing, please refer to this website to find out more: [[How to contribute](https://dolphinscheduler.apache.org/en-us/community/development/contribute.html)]
+
 
 ### License
 Please refer to the [LICENSE](https://github.com/apache/incubator-dolphinscheduler/blob/dev/LICENSE) file.

From 0e43b0d82a110e10e95858c69d9e3e0fd121edd5 Mon Sep 17 00:00:00 2001
From: cooper <1322849632@qq.com>
Date: Fri, 29 Jan 2021 22:08:58 +0800
Subject: [PATCH 28/87] Remove duplicate
 license(LICENSE-@form-create-element-ui ) (#4630)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 李长福 <changfu.li@dmall.com>
---
 .../LICENSE-@form-create-element-ui           | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui 

diff --git a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui  b/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui 
deleted file mode 100644
index 468a05fc1d..0000000000
--- a/dolphinscheduler-dist/release-docs/licenses/ui-licenses/LICENSE-@form-create-element-ui 	
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 xaboy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE. 

From d80f0614efb426b92052514fcc2d7f27259e4043 Mon Sep 17 00:00:00 2001
From: "felix.wang" <59079269+felix-thinkingdata@users.noreply.github.com>
Date: Fri, 29 Jan 2021 22:41:13 +0800
Subject: [PATCH 29/87] [Feature-#4350][Alert]support feishu plugin (#4594)

* feishu robot

* Add Feishu to the plugin packing process
---
 .../dolphinscheduler-alert-feishu/pom.xml     |  82 +++++++
 .../alert/feishu/FeiShuAlertChannel.java      |  37 +++
 .../feishu/FeiShuAlertChannelFactory.java     |  82 +++++++
 .../alert/feishu/FeiShuAlertPlugin.java       |  30 +++
 .../alert/feishu/FeiShuParamsConstants.java   |  49 ++++
 .../plugin/alert/feishu/FeiShuSender.java     | 223 ++++++++++++++++++
 .../plugin/alert/feishu/HttpRequestUtil.java  |  50 ++++
 .../feishu/FeiShuAlertChannelFactoryTest.java |  45 ++++
 .../plugin/alert/feishu/FeiShuSenderTest.java |  75 ++++++
 dolphinscheduler-alert-plugin/pom.xml         |   1 +
 .../src/main/provisio/dolphinscheduler.xml    |   5 +
 pom.xml                                       |   2 +
 12 files changed, 681 insertions(+)
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertPlugin.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java
 create mode 100644 dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml
new file mode 100644
index 0000000000..44d4cdbb07
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dolphinscheduler-alert-plugin</artifactId>
+        <groupId>org.apache.dolphinscheduler</groupId>
+        <version>1.3.4-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.dolphinscheduler</groupId>
+    <artifactId>dolphinscheduler-alert-feishu</artifactId>
+    <packaging>dolphinscheduler-plugin</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.dolphinscheduler</groupId>
+            <artifactId>dolphinscheduler-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>dolphinscheduler-alert-feishu-${project.version}</finalName>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
new file mode 100644
index 0000000000..8a195e08f8
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertInfo;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
+
+import java.util.Map;
+
+public class FeiShuAlertChannel implements AlertChannel {
+    @Override
+    public AlertResult process(AlertInfo alertInfo) {
+
+        AlertData alertData = alertInfo.getAlertData();
+        String alertParams = alertInfo.getAlertParams();
+        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        return new FeiShuSender(paramsMap).sendFeiShuMsg(alertData);
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
new file mode 100644
index 0000000000..0e863f95d4
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
+import org.apache.dolphinscheduler.spi.params.InputParam;
+import org.apache.dolphinscheduler.spi.params.PasswordParam;
+import org.apache.dolphinscheduler.spi.params.RadioParam;
+import org.apache.dolphinscheduler.spi.params.base.ParamsOptions;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.params.base.Validate;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class FeiShuAlertChannelFactory implements AlertChannelFactory {
+    @Override
+    public String getName() {
+        return "Feishu";
+    }
+
+    @Override
+    public List<PluginParams> getParams() {
+        InputParam webHookParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_WEB_HOOK, FeiShuParamsConstants.WEB_HOOK)
+                .addValidate(Validate.newBuilder()
+                        .setRequired(true)
+                        .build())
+                .build();
+        RadioParam isEnableProxy =
+                RadioParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE, FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE)
+                        .addParamsOptions(new ParamsOptions("YES", true, false))
+                        .addParamsOptions(new ParamsOptions("NO", false, false))
+                        .setValue(true)
+                        .addValidate(Validate.newBuilder()
+                                .setRequired(false)
+                                .build())
+                        .build();
+        InputParam proxyParam =
+                InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY, FeiShuParamsConstants.FEI_SHU_PROXY)
+                        .addValidate(Validate.newBuilder()
+                                .setRequired(false).build())
+                        .build();
+
+        InputParam portParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PORT, FeiShuParamsConstants.FEI_SHU_PORT)
+                .addValidate(Validate.newBuilder()
+                        .setRequired(false).build())
+                .build();
+
+        InputParam userParam =
+                InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_USER, FeiShuParamsConstants.FEI_SHU_USER)
+                        .addValidate(Validate.newBuilder()
+                                .setRequired(false).build())
+                        .build();
+        PasswordParam passwordParam = PasswordParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD, FeiShuParamsConstants.FEI_SHU_PASSWORD)
+                .setPlaceholder("if enable use authentication, you need input password")
+                .build();
+
+        return Arrays.asList(webHookParam, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
+
+    }
+
+    @Override
+    public AlertChannel create() {
+        return new FeiShuAlertChannel();
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertPlugin.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertPlugin.java
new file mode 100644
index 0000000000..e71be3e2bd
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertPlugin.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.DolphinSchedulerPlugin;
+import org.apache.dolphinscheduler.spi.alert.AlertChannelFactory;
+
+import com.google.common.collect.ImmutableList;
+
+public class FeiShuAlertPlugin  implements DolphinSchedulerPlugin {
+    @Override
+    public Iterable<AlertChannelFactory> getAlertChannelFactorys() {
+        return ImmutableList.of(new FeiShuAlertChannelFactory());
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
new file mode 100644
index 0000000000..0b3c329792
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+public class FeiShuParamsConstants {
+
+    private FeiShuParamsConstants() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    static final String WEB_HOOK = "webhook";
+
+    static final String NAME_WEB_HOOK = "webHook";
+
+    public static final String FEI_SHU_PROXY_ENABLE = "isEnableProxy";
+
+    static final String NAME_FEI_SHU_PROXY_ENABLE = "isEnableProxy";
+
+    static final String FEI_SHU_PROXY = "proxy";
+
+    static final String NAME_FEI_SHU_PROXY = "proxy";
+
+    static final String FEI_SHU_PORT = "port";
+
+    static final String NAME_FEI_SHU_PORT = "port";
+
+    static final String FEI_SHU_USER = "user";
+
+    static final String NAME_FEI_SHU_USER = "user";
+
+    static final String FEI_SHU_PASSWORD = "password";
+
+    static final String NAME_FEI_SHU_PASSWORD = "password";
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
new file mode 100644
index 0000000000..4eee390721
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
@@ -0,0 +1,223 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import org.apache.commons.codec.binary.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class FeiShuSender {
+
+    private static final Logger logger = LoggerFactory.getLogger(FeiShuSender.class);
+
+    private String url;
+
+    private Boolean enableProxy;
+
+    private String proxy;
+
+    private Integer port;
+
+    private String user;
+
+    private String password;
+
+    FeiShuSender(Map<String, String> config) {
+        url = config.get(FeiShuParamsConstants.NAME_WEB_HOOK);
+        enableProxy = Boolean.valueOf(config.get(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE));
+        if (Boolean.TRUE.equals(enableProxy)) {
+            port = Integer.parseInt(config.get(FeiShuParamsConstants.NAME_FEI_SHU_PORT));
+            proxy = config.get(FeiShuParamsConstants.NAME_FEI_SHU_PROXY);
+            user = config.get(FeiShuParamsConstants.NAME_FEI_SHU_USER);
+            password = config.get(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD);
+        }
+
+    }
+
+    private static RequestConfig getProxyConfig(String proxy, int port) {
+        HttpHost httpProxy = new HttpHost(proxy, port);
+        return RequestConfig.custom().setProxy(httpProxy).build();
+    }
+
+    private static String textToJsonString(AlertData alertData) {
+
+        Map<String, Object> items = new HashMap<>(2);
+        items.put("msg_type", "text");
+        Map<String, String> textContent = new HashMap<>();
+        byte[] byt = StringUtils.getBytesUtf8(formatContent(alertData));
+        String txt = StringUtils.newStringUtf8(byt);
+        textContent.put("text", txt);
+        items.put("content", textContent);
+        return JSONUtils.toJsonString(items);
+    }
+
+    private static AlertResult checkSendFeiShuSendMsgResult(String result) {
+        AlertResult alertResult = new AlertResult();
+        alertResult.setStatus("false");
+
+        if (org.apache.dolphinscheduler.spi.utils.StringUtils.isBlank(result)) {
+            alertResult.setMessage("send fei shu msg error");
+            logger.info("send fei shu msg error,fei shu server resp is null");
+            return alertResult;
+        }
+        FeiShuSendMsgResponse sendMsgResponse = JSONUtils.parseObject(result, FeiShuSendMsgResponse.class);
+
+        if (null == sendMsgResponse) {
+            alertResult.setMessage("send fei shu msg fail");
+            logger.info("send fei shu msg error,resp error");
+            return alertResult;
+        }
+        if (sendMsgResponse.statusCode == 0) {
+            alertResult.setStatus("true");
+            alertResult.setMessage("send fei shu msg success");
+            return alertResult;
+        }
+        alertResult.setMessage(String.format("alert send fei shu msg error : %s", sendMsgResponse.getStatusMessage()));
+        logger.info("alert send fei shu msg error : {} ,Extra : {} ", sendMsgResponse.getStatusMessage(), sendMsgResponse.getExtra());
+        return alertResult;
+    }
+
+    public static String formatContent(AlertData alertData) {
+        if (alertData.getContent() != null) {
+            List<Map> list;
+            try {
+                list = JSONUtils.toList(alertData.getContent(), Map.class);
+            } catch (Exception e) {
+                logger.error("json format exception", e);
+                return null;
+            }
+
+            StringBuilder contents = new StringBuilder(100);
+            contents.append(String.format("`%s`%n", alertData.getTitle()));
+            for (Map map : list) {
+                Iterator<Entry<String, Object>> entries = map.entrySet().iterator();
+                while (entries.hasNext()) {
+                    Entry<String, Object> entry = entries.next();
+                    String key = entry.getKey();
+                    String value = entry.getValue().toString();
+                    contents.append(key + ":" + value);
+                    contents.append("\n");
+                }
+            }
+            return contents.toString();
+        }
+        return null;
+    }
+
+    public AlertResult sendFeiShuMsg(AlertData alertData) {
+        AlertResult alertResult;
+        try {
+            String resp = sendMsg(alertData);
+            return checkSendFeiShuSendMsgResult(resp);
+        } catch (Exception e) {
+            logger.info("send fei shu alert msg  exception : {}", e.getMessage());
+            alertResult = new AlertResult();
+            alertResult.setStatus("false");
+            alertResult.setMessage("send fei shu alert fail.");
+        }
+        return alertResult;
+    }
+
+    private String sendMsg(AlertData alertData) throws IOException {
+
+        String msgToJson = textToJsonString(alertData);
+
+        HttpPost httpPost = HttpRequestUtil.constructHttpPost(url, msgToJson);
+
+        CloseableHttpClient httpClient;
+
+        httpClient = HttpRequestUtil.getHttpClient(enableProxy, proxy, port, user, password);
+
+        try {
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode != HttpStatus.SC_OK) {
+                logger.error("send feishu message error, return http status code: " + statusCode);
+            }
+            String resp;
+            try {
+                HttpEntity entity = response.getEntity();
+                resp = EntityUtils.toString(entity, "utf-8");
+                EntityUtils.consume(entity);
+            } finally {
+                response.close();
+            }
+            logger.info("Ding Talk send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(), resp);
+            return resp;
+        } finally {
+            httpClient.close();
+        }
+    }
+
+    public static class FeiShuSendMsgResponse {
+        @JsonProperty("Extra")
+        private String extra;
+        @JsonProperty("StatusCode")
+        private Integer statusCode;
+        @JsonProperty("StatusMessage")
+        private String statusMessage;
+
+        public String getExtra() {
+            return extra;
+        }
+
+        public void setExtra(String extra) {
+            this.extra = extra;
+        }
+
+        public Integer getStatusCode() {
+            return statusCode;
+        }
+
+        public void setStatusCode(Integer statusCode) {
+            this.statusCode = statusCode;
+        }
+
+        public String getStatusMessage() {
+            return statusMessage;
+        }
+
+        public void setStatusMessage(String statusMessage) {
+            this.statusMessage = statusMessage;
+        }
+    }
+
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
new file mode 100644
index 0000000000..3d143579d4
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+
+public class HttpRequestUtil {
+
+    public static CloseableHttpClient getHttpClient(boolean enableProxy, String proxy, Integer port, String user, String password) {
+        if (enableProxy) {
+            HttpHost httpProxy = new HttpHost(proxy, port);
+            CredentialsProvider provider = new BasicCredentialsProvider();
+            provider.setCredentials(new AuthScope(httpProxy), new UsernamePasswordCredentials(user, password));
+            return HttpClients.custom().setDefaultCredentialsProvider(provider).build();
+        } else {
+            return HttpClients.createDefault();
+        }
+    }
+
+    public static HttpPost constructHttpPost(String url, String msg) {
+        HttpPost post = new HttpPost(url);
+        StringEntity entity = new StringEntity(msg, ContentType.APPLICATION_JSON);
+        post.setEntity(entity);
+        return post;
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java
new file mode 100644
index 0000000000..d73355dbc0
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.alert.AlertChannel;
+import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FeiShuAlertChannelFactoryTest {
+
+    @Test
+    public void testGetParams() {
+        FeiShuAlertChannelFactory feiShuAlertChannelFactory = new FeiShuAlertChannelFactory();
+        List<PluginParams> params = feiShuAlertChannelFactory.getParams();
+        JSONUtils.toJsonString(params);
+        Assert.assertEquals(6, params.size());
+    }
+
+    @Test
+    public void testCreate() {
+        FeiShuAlertChannelFactory feiShuAlertChannelFactory = new FeiShuAlertChannelFactory();
+        AlertChannel alertChannel = feiShuAlertChannelFactory.create();
+        Assert.assertNotNull(alertChannel);
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
new file mode 100644
index 0000000000..26fac06b35
--- /dev/null
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.alert.feishu;
+
+import org.apache.dolphinscheduler.spi.alert.AlertData;
+import org.apache.dolphinscheduler.spi.alert.AlertResult;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FeiShuSenderTest {
+
+
+    private static Map<String, String> feiShuConfig = new HashMap<>();
+
+    @Before
+    public void initFeiShuConfig() {
+        feiShuConfig.put(FeiShuParamsConstants.WEB_HOOK, "https://open.feishu.cn/open-apis/bot/v2/hook/xxxxx");
+    }
+
+    @Test
+    public void testSend() {
+        AlertData alertData = new AlertData();
+        alertData.setTitle("feishu test title");
+        alertData.setContent("feishu test content");
+        FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
+        AlertResult alertResult = feiShuSender.sendFeiShuMsg(alertData);
+        Assert.assertEquals("false", alertResult.getStatus());
+    }
+
+    @Test
+    public void testFormatContent() {
+        String alertMsg = "[\n"
+                + "  {\n"
+                + "    \"owner\": \"dolphinscheduler\",\n"
+                + "    \"processEndTime\": \"2021-01-29 19:01:11\",\n"
+                + "    \"processHost\": \"10.81.129.4:5678\",\n"
+                + "    \"processId\": 2926,\n"
+                + "    \"processName\": \"3-20210129190038108\",\n"
+                + "    \"processStartTime\": \"2021-01-29 19:00:38\",\n"
+                + "    \"processState\": \"SUCCESS\",\n"
+                + "    \"processType\": \"START_PROCESS\",\n"
+                + "    \"projectId\": 2,\n"
+                + "    \"projectName\": \"testdelproject\",\n"
+                + "    \"recovery\": \"NO\",\n"
+                + "    \"retryTimes\": 0,\n"
+                + "    \"runTimes\": 1,\n"
+                + "    \"taskId\": 0\n"
+                + "  }\n"
+                + "]";
+        AlertData alertData = new AlertData();
+        alertData.setTitle("");
+        alertData.setContent(alertMsg);
+        Assert.assertNotNull(FeiShuSender.formatContent(alertData));
+    }
+}
diff --git a/dolphinscheduler-alert-plugin/pom.xml b/dolphinscheduler-alert-plugin/pom.xml
index ede5051049..d199dc4e2c 100644
--- a/dolphinscheduler-alert-plugin/pom.xml
+++ b/dolphinscheduler-alert-plugin/pom.xml
@@ -35,6 +35,7 @@
         <module>dolphinscheduler-alert-dingtalk</module>
         <module>dolphinscheduler-alert-script</module>
         <module>dolphinscheduler-alert-http</module>
+        <module>dolphinscheduler-alert-feishu</module>
     </modules>
 
 
diff --git a/dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml b/dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml
index 615965cf9a..de3c016977 100644
--- a/dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml
+++ b/dolphinscheduler-dist/src/main/provisio/dolphinscheduler.xml
@@ -64,4 +64,9 @@
             <unpack/>
         </artifact>
     </artifactSet>
+    <artifactSet to="lib/plugin/alert/feishu">
+        <artifact id="${project.groupId}:dolphinscheduler-alert-feishu:zip:${project.version}">
+            <unpack/>
+        </artifact>
+    </artifactSet>
 </runtime>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 214138d9c7..6d7446f8d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -973,6 +973,8 @@
                         <include>**/plugin/alert/script/ScriptSenderTest.java</include>
                         <include>**/plugin/alert/http/HttpAlertChannelFactoryTest.java</include>
                         <include>**/plugin/alert/http/HttpAlertChannelTest.java</include>
+                        <include>**/plugin/alert/feishu/FeiShuAlertChannelFactoryTest.java</include>
+                        <include>**/plugin/alert/feishu/FeiShuSenderTest.java</include>
                         <include>**/plugin/alert/http/HttpAlertPluginTest.java</include>
                         <include>**/plugin/alert/http/HttpSenderTest.java</include>
                         <include>**/spi/params/PluginParamsTransferTest.java</include>

From 09feb5c099ca7ea575cfbdad6deffd5defcc3cef Mon Sep 17 00:00:00 2001
From: Tq <36755957+Tianqi-Dotes@users.noreply.github.com>
Date: Fri, 29 Jan 2021 22:53:52 +0800
Subject: [PATCH 30/87] change DS introduction in the README.md 'multiple
 types' to'various types' (#4632)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d5ce11f0b..f306a398b5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Dolphin Scheduler Official Website
 
 ### Design Features:
 
-DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing multiple types of jobs available `out of the box`. 
+DolphinScheduler is a distributed and extensible workflow scheduler platform with powerful DAG visual interfaces, dedicated to solving complex job dependencies in the data pipeline and providing various types of jobs available `out of the box`. 
 
 Its main objectives are as follows:
 

From 25cbcc171a6cae142ede8fd1cac07fbd8139f8dd Mon Sep 17 00:00:00 2001
From: "felix.wang" <59079269+felix-thinkingdata@users.noreply.github.com>
Date: Sat, 30 Jan 2021 13:02:25 +0800
Subject: [PATCH 31/87] [BUG][Alert]fix alert plugin DingTalkSender (#4629)

* fix DingTalkSender

* optimize context
---
 .../dingtalk/DingTalkParamsConstants.java     |  44 +++---
 .../plugin/alert/dingtalk/DingTalkSender.java | 132 +++++++++---------
 .../alert/dingtalk/DingTalkSenderTest.java    |   2 +-
 3 files changed, 83 insertions(+), 95 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
index c00d13076e..e94da80f20 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
@@ -22,36 +22,24 @@ package org.apache.dolphinscheduler.plugin.alert.dingtalk;
  */
 public class DingTalkParamsConstants {
 
+
+    static final String DING_TALK_PROXY_ENABLE = "isEnableProxy";
+    static final String DING_TALK_WEB_HOOK = "webhook";
+    static final String NAME_DING_TALK_WEB_HOOK = "WebHook";
+    static final String DING_TALK_KEYWORD = "keyword";
+    static final String NAME_DING_TALK_KEYWORD = "Keyword";
+    static final String NAME_DING_TALK_PROXY_ENABLE = "IsEnableProxy";
+    static final String DING_TALK_PROXY = "proxy";
+    static final String NAME_DING_TALK_PROXY = "Proxy";
+    static final String DING_TALK_PORT = "port";
+    static final String NAME_DING_TALK_PORT = "Port";
+    static final String DING_TALK_USER = "user";
+    static final String NAME_DING_TALK_USER = "User";
+    static final String DING_TALK_PASSWORD = "password";
+    static final String NAME_DING_TALK_PASSWORD = "Password";
+
     private DingTalkParamsConstants() {
         throw new IllegalStateException("Utility class");
     }
 
-    static final String DING_TALK_WEB_HOOK = "dingtalk.webhook";
-
-    static final String NAME_DING_TALK_WEB_HOOK = "dingTalkWebHook";
-
-    static final String DING_TALK_KEYWORD = "dingtalk.keyword";
-
-    static final String NAME_DING_TALK_KEYWORD = "dingTalkKeyword";
-
-    public static final String DING_TALK_PROXY_ENABLE = "dingtalk.isEnableProxy";
-
-    static final String NAME_DING_TALK_PROXY_ENABLE = "dingTalkIsEnableProxy";
-
-    static final String DING_TALK_PROXY = "dingtalk.proxy";
-
-    static final String NAME_DING_TALK_PROXY = "dingTalkProxy";
-
-    static final String DING_TALK_PORT = "dingtalk.port";
-
-    static final String NAME_DING_TALK_PORT = "dingTalkPort";
-
-    static final String DING_TALK_USER = "dingtalk.user";
-
-    static final String NAME_DING_TALK_USER = "dingTalkUser";
-
-    static final String DING_TALK_PASSWORD = "dingtalk.password";
-
-    static final String NAME_DING_TALK_PASSWORD = "dingTalkPassword";
-
 }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
index d152bc89cb..0d87e4779a 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
@@ -75,51 +75,6 @@ public class DingTalkSender {
 
     }
 
-    public AlertResult sendDingTalkMsg(String msg, String charset) {
-        AlertResult alertResult;
-        try {
-            String resp = sendMsg(msg, charset);
-            return checkSendDingTalkSendMsgResult(resp);
-        } catch (Exception e) {
-            logger.info("send ding talk alert msg  exception : {}", e.getMessage());
-            alertResult = new AlertResult();
-            alertResult.setStatus("false");
-            alertResult.setMessage("send ding talk alert fail.");
-        }
-        return alertResult;
-    }
-
-    private String sendMsg(String msg, String charset) throws IOException {
-
-        String msgToJson = textToJsonString(msg + "#" + keyword);
-        HttpPost httpPost = constructHttpPost(url, msgToJson, charset);
-
-        CloseableHttpClient httpClient;
-        if (Boolean.TRUE.equals(enableProxy)) {
-            httpClient = getProxyClient(proxy, port, user, password);
-            RequestConfig rcf = getProxyConfig(proxy, port);
-            httpPost.setConfig(rcf);
-        } else {
-            httpClient = getDefaultClient();
-        }
-
-        try {
-            CloseableHttpResponse response = httpClient.execute(httpPost);
-            String resp;
-            try {
-                HttpEntity entity = response.getEntity();
-                resp = EntityUtils.toString(entity, charset);
-                EntityUtils.consume(entity);
-            } finally {
-                response.close();
-            }
-            logger.info("Ding Talk send {}, resp: {}", msg, resp);
-            return resp;
-        } finally {
-            httpClient.close();
-        }
-    }
-
     private static HttpPost constructHttpPost(String url, String msg, String charset) {
         HttpPost post = new HttpPost(url);
         StringEntity entity = new StringEntity(msg, charset);
@@ -155,27 +110,6 @@ public class DingTalkSender {
         return JSONUtils.toJsonString(items);
     }
 
-    public static class DingTalkSendMsgResponse {
-        private Integer errcode;
-        private String errmsg;
-
-        public Integer getErrcode() {
-            return errcode;
-        }
-
-        public void setErrcode(Integer errcode) {
-            this.errcode = errcode;
-        }
-
-        public String getErrmsg() {
-            return errmsg;
-        }
-
-        public void setErrmsg(String errmsg) {
-            this.errmsg = errmsg;
-        }
-    }
-
     private static AlertResult checkSendDingTalkSendMsgResult(String result) {
         AlertResult alertResult = new AlertResult();
         alertResult.setStatus("false");
@@ -201,4 +135,70 @@ public class DingTalkSender {
         return alertResult;
     }
 
+    public AlertResult sendDingTalkMsg(String title, String content) {
+        AlertResult alertResult;
+        try {
+            String resp = sendMsg(title, content);
+            return checkSendDingTalkSendMsgResult(resp);
+        } catch (Exception e) {
+            logger.info("send ding talk alert msg  exception : {}", e.getMessage());
+            alertResult = new AlertResult();
+            alertResult.setStatus("false");
+            alertResult.setMessage("send ding talk alert fail.");
+        }
+        return alertResult;
+    }
+
+    private String sendMsg(String title, String content) throws IOException {
+
+        String msgToJson = textToJsonString(title + content + "#" + keyword);
+        HttpPost httpPost = constructHttpPost(url, msgToJson, "UTF-8");
+
+        CloseableHttpClient httpClient;
+        if (Boolean.TRUE.equals(enableProxy)) {
+            httpClient = getProxyClient(proxy, port, user, password);
+            RequestConfig rcf = getProxyConfig(proxy, port);
+            httpPost.setConfig(rcf);
+        } else {
+            httpClient = getDefaultClient();
+        }
+
+        try {
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+            String resp;
+            try {
+                HttpEntity entity = response.getEntity();
+                resp = EntityUtils.toString(entity, "UTF-8");
+                EntityUtils.consume(entity);
+            } finally {
+                response.close();
+            }
+            logger.info("Ding Talk send title :{},content : {}, resp: {}", title, content, resp);
+            return resp;
+        } finally {
+            httpClient.close();
+        }
+    }
+
+    public static class DingTalkSendMsgResponse {
+        private Integer errcode;
+        private String errmsg;
+
+        public Integer getErrcode() {
+            return errcode;
+        }
+
+        public void setErrcode(Integer errcode) {
+            this.errcode = errcode;
+        }
+
+        public String getErrmsg() {
+            return errmsg;
+        }
+
+        public void setErrmsg(String errmsg) {
+            this.errmsg = errmsg;
+        }
+    }
+
 }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java
index 4512402dc4..bc17d4185b 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-dingtalk/src/test/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSenderTest.java
@@ -50,7 +50,7 @@ public class DingTalkSenderTest {
         dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
         dingTalkConfig.put(DingTalkParamsConstants.NAME_DING_TALK_PROXY_ENABLE, "true");
         dingTalkSender = new DingTalkSender(dingTalkConfig);
-        AlertResult alertResult = dingTalkSender.sendDingTalkMsg("keyWord+Welcome", "UTF-8");
+        AlertResult alertResult = dingTalkSender.sendDingTalkMsg("title", "content test");
         Assert.assertEquals("false",alertResult.getStatus());
     }
 

From fbb77c5cfd9150101a512a5bc342aa8727d2d3d8 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Sat, 30 Jan 2021 13:30:33 +0800
Subject: [PATCH 32/87] merge current

---
 .../plugin/alert/feishu/FeiShuAlertChannel.java            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
index 8a195e08f8..3bbdaa9997 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.spi.alert.AlertChannel;
 import org.apache.dolphinscheduler.spi.alert.AlertData;
 import org.apache.dolphinscheduler.spi.alert.AlertInfo;
 import org.apache.dolphinscheduler.spi.alert.AlertResult;
-import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
 
 import java.util.Map;
 
@@ -30,8 +29,10 @@ public class FeiShuAlertChannel implements AlertChannel {
     public AlertResult process(AlertInfo alertInfo) {
 
         AlertData alertData = alertInfo.getAlertData();
-        String alertParams = alertInfo.getAlertParams();
-        Map<String, String> paramsMap = PluginParamsTransfer.getPluginParamsMap(alertParams);
+        Map<String, String> paramsMap = alertInfo.getAlertParams();
+        if (null == paramsMap) {
+            return new AlertResult("false", "fei shu params is null");
+        }
         return new FeiShuSender(paramsMap).sendFeiShuMsg(alertData);
     }
 }

From 878070888aecd0fad3015b54dd1fd0b50056e1ec Mon Sep 17 00:00:00 2001
From: Kirs <acm_master@163.com>
Date: Sat, 30 Jan 2021 20:25:27 +0800
Subject: [PATCH 33/87] removed issue label (#4623)

---
 .github/ISSUE_TEMPLATE/bug_report.md             | 1 -
 .github/ISSUE_TEMPLATE/feature_request.md        | 1 -
 .github/ISSUE_TEMPLATE/improvement_suggestion.md | 1 -
 .github/ISSUE_TEMPLATE/question.md               | 1 -
 4 files changed, 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0103282ae3..c8c90dc26a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,6 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[Bug][Module Name] Bug title "
-labels: bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4053490497..82d811e880 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,6 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[Feature][Module Name] Feature title"
-labels: new feature
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/improvement_suggestion.md b/.github/ISSUE_TEMPLATE/improvement_suggestion.md
index 9376e20418..544d98eae5 100644
--- a/.github/ISSUE_TEMPLATE/improvement_suggestion.md
+++ b/.github/ISSUE_TEMPLATE/improvement_suggestion.md
@@ -2,7 +2,6 @@
 name: Improvement suggestion
 about: Improvement suggestion for this project
 title: "[Improvement][Module Name] Improvement title"
-labels: improvement
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 6fdb06ea6c..961d82476e 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,6 @@
 name: Question
 about: Have a question wanted to be help
 title: "[Question] Question title"
-labels: question
 assignees: ''
 
 ---

From ab724f6f04206cd7d4f3692ee93ffea9408b309e Mon Sep 17 00:00:00 2001
From: hailin0 <hailin0@yeah.net>
Date: Sat, 30 Jan 2021 20:46:12 +0800
Subject: [PATCH 34/87] [Fix][sql] Postgresql sql script error (#4595)

---
 .../1.3.3_schema/postgresql/dolphinscheduler_ddl.sql |  7 +++++--
 .../1.4.0_schema/postgresql/dolphinscheduler_ddl.sql | 12 ++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql
index 477cb3bf60..50f560aa13 100644
--- a/sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql
@@ -121,6 +121,7 @@ DROP FUNCTION IF EXISTS ct_dolphin_T_t_ds_process_definition_version();
 
 
 --  add t_ds_resources_un
+delimiter d//
 CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_resources_un() RETURNS void AS $$
 BEGIN
     IF NOT EXISTS (
@@ -129,11 +130,13 @@ BEGIN
                     AND CONSTRAINT_NAME = 't_ds_resources_un'
                 )
     THEN
-ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type");
-END IF;
+        ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type");
+    END IF;
 END;
 $$ LANGUAGE plpgsql;
+d//
 
+delimiter ;
 SELECT uc_dolphin_T_t_ds_resources_un();
 DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_resources_un();
 
diff --git a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
index 53a8c47d03..e940cfaad2 100644
--- a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
@@ -52,7 +52,8 @@ BEGIN
           WHERE TABLE_NAME='t_ds_process_definition'
                             AND COLUMN_NAME ='warning_group_id')
       THEN
-         ALTER TABLE t_ds_process_definition ADD COLUMN `warning_group_id` int4 DEFAULT NULL COMMENT 'alert group id' AFTER `connects`;
+         ALTER TABLE t_ds_process_definition ADD COLUMN warning_group_id int4 DEFAULT NULL;
+         COMMENT ON COLUMN t_ds_process_definition.warning_group_id IS 'alert group id';
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -70,7 +71,8 @@ BEGIN
           WHERE TABLE_NAME='t_ds_process_definition_version'
                             AND COLUMN_NAME ='warning_group_id')
       THEN
-         ALTER TABLE t_ds_process_definition_version ADD COLUMN `warning_group_id` int4 DEFAULT NULL COMMENT 'alert group id' AFTER `connects`;
+         ALTER TABLE t_ds_process_definition_version ADD COLUMN warning_group_id int4 DEFAULT NULL;
+         COMMENT ON COLUMN t_ds_process_definition_version.warning_group_id IS 'alert group id';
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -88,7 +90,8 @@ BEGIN
           WHERE TABLE_NAME='t_ds_alertgroup'
                             AND COLUMN_NAME ='alert_instance_ids')
       THEN
-         ALTER TABLE t_ds_alertgroup ADD COLUMN `alert_instance_ids` varchar (255) DEFAULT NULL COMMENT 'alert instance ids' AFTER `id`;
+         ALTER TABLE t_ds_alertgroup ADD COLUMN alert_instance_ids varchar (255) DEFAULT NULL;
+         COMMENT ON COLUMN t_ds_alertgroup.alert_instance_ids IS 'alert instance ids';
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -106,7 +109,8 @@ BEGIN
           WHERE TABLE_NAME='t_ds_alertgroup'
                             AND COLUMN_NAME ='create_user_id')
       THEN
-         ALTER TABLE t_ds_alertgroup ADD COLUMN `create_user_id` int4 DEFAULT NULL COMMENT 'create user id' AFTER `alert_instance_ids`;
+         ALTER TABLE t_ds_alertgroup ADD COLUMN create_user_id int4 DEFAULT NULL;
+         COMMENT ON COLUMN t_ds_alertgroup.create_user_id IS 'create user id';
        END IF;
 END;
 $$ LANGUAGE plpgsql;

From 047b0a312f69a9b884656f53110df791f381f8a8 Mon Sep 17 00:00:00 2001
From: Segun Ogundipe <davephenoms@gmail.com>
Date: Sat, 30 Jan 2021 14:32:13 +0100
Subject: [PATCH 35/87] [Improvement][remote] Refactor remote module to fix
 code smell (#4576)

* chore[remote]: Refactor remote module to fix code smell

* chore[remote]: Add licence header

* chore[remote]: Clean code smell

* chore[remote]: Clean code smell

* chore[remote]: Remove unused import
---
 .../remote/NettyRemotingClient.java           | 150 ++++++++----------
 .../remote/NettyRemotingServer.java           |  64 ++++----
 .../remote/codec/NettyEncoder.java            |  12 +-
 .../command/TaskKillResponseCommand.java      |   6 +-
 .../remote/exceptions/RemoteException.java    |  42 +++++
 .../remote/future/ResponseFuture.java         |  63 ++++----
 .../remote/handler/NettyClientHandler.java    |  34 ++--
 .../remote/handler/NettyServerHandler.java    |  40 ++---
 .../remote/utils/ChannelUtils.java            |  31 ++--
 .../remote/utils/Constants.java               |   4 +
 .../remote/utils/IPUtils.java                 |  25 +--
 .../dolphinscheduler/remote/utils/Pair.java   |   5 +-
 12 files changed, 252 insertions(+), 224 deletions(-)
 create mode 100644 dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/exceptions/RemoteException.java

diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
index c1aea90393..56033730bc 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java
@@ -55,7 +55,6 @@ import org.slf4j.LoggerFactory;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
@@ -84,7 +83,7 @@ public class NettyRemotingClient {
     /**
      * channels
      */
-    private final ConcurrentHashMap<Host, Channel> channels = new ConcurrentHashMap(128);
+    private final ConcurrentHashMap<Host, Channel> channels = new ConcurrentHashMap<>(128);
 
     /**
      * started flag
@@ -130,7 +129,7 @@ public class NettyRemotingClient {
         this.clientConfig = clientConfig;
         if (NettyUtils.useEpoll()) {
             this.workerGroup = new EpollEventLoopGroup(clientConfig.getWorkerThreads(), new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -139,7 +138,7 @@ public class NettyRemotingClient {
             });
         } else {
             this.workerGroup = new NioEventLoopGroup(clientConfig.getWorkerThreads(), new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -148,8 +147,8 @@ public class NettyRemotingClient {
             });
         }
         this.callbackExecutor = new ThreadPoolExecutor(5, 10, 1, TimeUnit.MINUTES,
-            new LinkedBlockingQueue<>(1000), new NamedThreadFactory("CallbackExecutor", 10),
-            new CallerThreadExecutePolicy());
+                new LinkedBlockingQueue<>(1000), new NamedThreadFactory("CallbackExecutor", 10),
+                new CallerThreadExecutePolicy());
         this.clientHandler = new NettyClientHandler(this, callbackExecutor);
 
         this.responseFutureExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("ResponseFutureExecutor"));
@@ -163,40 +162,32 @@ public class NettyRemotingClient {
     private void start() {
 
         this.bootstrap
-            .group(this.workerGroup)
-            .channel(NettyUtils.getSocketChannelClass())
-            .option(ChannelOption.SO_KEEPALIVE, clientConfig.isSoKeepalive())
-            .option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
-            .option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
-            .option(ChannelOption.SO_RCVBUF, clientConfig.getReceiveBufferSize())
-            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientConfig.getConnectTimeoutMillis())
-            .handler(new ChannelInitializer<SocketChannel>() {
-                @Override
-                public void initChannel(SocketChannel ch) {
-                    ch.pipeline()
-                        .addLast("client-idle-handler", new IdleStateHandler(Constants.NETTY_CLIENT_HEART_BEAT_TIME, 0, 0, TimeUnit.MILLISECONDS))
-                        .addLast(new NettyDecoder(), clientHandler, encoder);
-                }
-            });
-        this.responseFutureExecutor.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                ResponseFuture.scanFutureTable();
-            }
-        }, 5000, 1000, TimeUnit.MILLISECONDS);
-        //
+                .group(this.workerGroup)
+                .channel(NettyUtils.getSocketChannelClass())
+                .option(ChannelOption.SO_KEEPALIVE, clientConfig.isSoKeepalive())
+                .option(ChannelOption.TCP_NODELAY, clientConfig.isTcpNoDelay())
+                .option(ChannelOption.SO_SNDBUF, clientConfig.getSendBufferSize())
+                .option(ChannelOption.SO_RCVBUF, clientConfig.getReceiveBufferSize())
+                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientConfig.getConnectTimeoutMillis())
+                .handler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    public void initChannel(SocketChannel ch) {
+                        ch.pipeline()
+                                .addLast("client-idle-handler", new IdleStateHandler(Constants.NETTY_CLIENT_HEART_BEAT_TIME, 0, 0, TimeUnit.MILLISECONDS))
+                                .addLast(new NettyDecoder(), clientHandler, encoder);
+                    }
+                });
+        this.responseFutureExecutor.scheduleAtFixedRate(ResponseFuture::scanFutureTable, 5000, 1000, TimeUnit.MILLISECONDS);
         isStarted.compareAndSet(false, true);
     }
 
     /**
      * async send
      *
-     * @param host           host
-     * @param command        command
-     * @param timeoutMillis  timeoutMillis
+     * @param host host
+     * @param command command
+     * @param timeoutMillis timeoutMillis
      * @param invokeCallback callback function
-     * @throws InterruptedException
-     * @throws RemotingException
      */
     public void sendAsync(final Host host, final Command command,
                           final long timeoutMillis,
@@ -205,53 +196,49 @@ public class NettyRemotingClient {
         if (channel == null) {
             throw new RemotingException("network error");
         }
-        /**
+        /*
          * request unique identification
          */
         final long opaque = command.getOpaque();
-        /**
+        /*
          *  control concurrency number
          */
         boolean acquired = this.asyncSemaphore.tryAcquire(timeoutMillis, TimeUnit.MILLISECONDS);
         if (acquired) {
             final ReleaseSemaphore releaseSemaphore = new ReleaseSemaphore(this.asyncSemaphore);
 
-            /**
+            /*
              *  response future
              */
             final ResponseFuture responseFuture = new ResponseFuture(opaque,
-                timeoutMillis,
-                invokeCallback,
-                releaseSemaphore);
+                    timeoutMillis,
+                    invokeCallback,
+                    releaseSemaphore);
             try {
-                channel.writeAndFlush(command).addListener(new ChannelFutureListener() {
-
-                    @Override
-                    public void operationComplete(ChannelFuture future) throws Exception {
-                        if (future.isSuccess()) {
-                            responseFuture.setSendOk(true);
-                            return;
-                        } else {
-                            responseFuture.setSendOk(false);
-                        }
-                        responseFuture.setCause(future.cause());
-                        responseFuture.putResponse(null);
-                        try {
-                            responseFuture.executeInvokeCallback();
-                        } catch (Throwable ex) {
-                            logger.error("execute callback error", ex);
-                        } finally {
-                            responseFuture.release();
-                        }
+                channel.writeAndFlush(command).addListener(future -> {
+                    if (future.isSuccess()) {
+                        responseFuture.setSendOk(true);
+                        return;
+                    } else {
+                        responseFuture.setSendOk(false);
+                    }
+                    responseFuture.setCause(future.cause());
+                    responseFuture.putResponse(null);
+                    try {
+                        responseFuture.executeInvokeCallback();
+                    } catch (Exception ex) {
+                        logger.error("execute callback error", ex);
+                    } finally {
+                        responseFuture.release();
                     }
                 });
-            } catch (Throwable ex) {
+            } catch (Exception ex) {
                 responseFuture.release();
                 throw new RemotingException(String.format("send command to host: %s failed", host), ex);
             }
         } else {
             String message = String.format("try to acquire async semaphore timeout: %d, waiting thread num: %d, total permits: %d",
-                timeoutMillis, asyncSemaphore.getQueueLength(), asyncSemaphore.availablePermits());
+                    timeoutMillis, asyncSemaphore.getQueueLength(), asyncSemaphore.availablePermits());
             throw new RemotingTooMuchRequestException(message);
         }
     }
@@ -259,12 +246,10 @@ public class NettyRemotingClient {
     /**
      * sync send
      *
-     * @param host          host
-     * @param command       command
+     * @param host host
+     * @param command command
      * @param timeoutMillis timeoutMillis
      * @return command
-     * @throws InterruptedException
-     * @throws RemotingException
      */
     public Command sendSync(final Host host, final Command command, final long timeoutMillis) throws InterruptedException, RemotingException {
         final Channel channel = getChannel(host);
@@ -273,21 +258,18 @@ public class NettyRemotingClient {
         }
         final long opaque = command.getOpaque();
         final ResponseFuture responseFuture = new ResponseFuture(opaque, timeoutMillis, null, null);
-        channel.writeAndFlush(command).addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    responseFuture.setSendOk(true);
-                    return;
-                } else {
-                    responseFuture.setSendOk(false);
-                }
-                responseFuture.setCause(future.cause());
-                responseFuture.putResponse(null);
-                logger.error("send command {} to host {} failed", command, host);
+        channel.writeAndFlush(command).addListener(future -> {
+            if (future.isSuccess()) {
+                responseFuture.setSendOk(true);
+                return;
+            } else {
+                responseFuture.setSendOk(false);
             }
+            responseFuture.setCause(future.cause());
+            responseFuture.putResponse(null);
+            logger.error("send command {} to host {} failed", command, host);
         });
-        /**
+        /*
          * sync wait for result
          */
         Command result = responseFuture.waitResponse();
@@ -304,9 +286,8 @@ public class NettyRemotingClient {
     /**
      * send task
      *
-     * @param host    host
+     * @param host host
      * @param command command
-     * @throws RemotingException
      */
     public void send(final Host host, final Command command) throws RemotingException {
         Channel channel = getChannel(host);
@@ -332,7 +313,7 @@ public class NettyRemotingClient {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
+     * @param processor processor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
         this.registerProcessor(commandType, processor, null);
@@ -342,8 +323,8 @@ public class NettyRemotingClient {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
-     * @param executor    thread executor
+     * @param processor processor
+     * @param executor thread executor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
         this.clientHandler.registerProcessor(commandType, processor, executor);
@@ -351,9 +332,6 @@ public class NettyRemotingClient {
 
     /**
      * get channel
-     *
-     * @param host
-     * @return
      */
     public Channel getChannel(Host host) {
         Channel channel = channels.get(host);
@@ -366,7 +344,7 @@ public class NettyRemotingClient {
     /**
      * create channel
      *
-     * @param host   host
+     * @param host host
      * @param isSync sync flag
      * @return channel
      */
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
index 867cf4dc56..f4a88699ec 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingServer.java
@@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.remote.codec.NettyDecoder;
 import org.apache.dolphinscheduler.remote.codec.NettyEncoder;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.config.NettyServerConfig;
+import org.apache.dolphinscheduler.remote.exceptions.RemoteException;
 import org.apache.dolphinscheduler.remote.handler.NettyServerHandler;
 import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor;
 import org.apache.dolphinscheduler.remote.utils.Constants;
@@ -93,6 +94,11 @@ public class NettyRemotingServer {
      */
     private final AtomicBoolean isStarted = new AtomicBoolean(false);
 
+    /**
+     * Netty server bind fail message
+     */
+    private static final String NETTY_BIND_FAILURE_MSG = "NettyRemotingServer bind %s fail";
+
     /**
      * server init
      *
@@ -102,7 +108,7 @@ public class NettyRemotingServer {
         this.serverConfig = serverConfig;
         if (NettyUtils.useEpoll()) {
             this.bossGroup = new EpollEventLoopGroup(1, new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -111,7 +117,7 @@ public class NettyRemotingServer {
             });
 
             this.workGroup = new EpollEventLoopGroup(serverConfig.getWorkerThread(), new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -120,7 +126,7 @@ public class NettyRemotingServer {
             });
         } else {
             this.bossGroup = new NioEventLoopGroup(1, new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -129,7 +135,7 @@ public class NettyRemotingServer {
             });
 
             this.workGroup = new NioEventLoopGroup(serverConfig.getWorkerThread(), new ThreadFactory() {
-                private AtomicInteger threadIndex = new AtomicInteger(0);
+                private final AtomicInteger threadIndex = new AtomicInteger(0);
 
                 @Override
                 public Thread newThread(Runnable r) {
@@ -145,35 +151,35 @@ public class NettyRemotingServer {
     public void start() {
         if (isStarted.compareAndSet(false, true)) {
             this.serverBootstrap
-                .group(this.bossGroup, this.workGroup)
-                .channel(NettyUtils.getServerSocketChannelClass())
-                .option(ChannelOption.SO_REUSEADDR, true)
-                .option(ChannelOption.SO_BACKLOG, serverConfig.getSoBacklog())
-                .childOption(ChannelOption.SO_KEEPALIVE, serverConfig.isSoKeepalive())
-                .childOption(ChannelOption.TCP_NODELAY, serverConfig.isTcpNoDelay())
-                .childOption(ChannelOption.SO_SNDBUF, serverConfig.getSendBufferSize())
-                .childOption(ChannelOption.SO_RCVBUF, serverConfig.getReceiveBufferSize())
-                .childHandler(new ChannelInitializer<SocketChannel>() {
-
-                    @Override
-                    protected void initChannel(SocketChannel ch) throws Exception {
-                        initNettyChannel(ch);
-                    }
-                });
+                    .group(this.bossGroup, this.workGroup)
+                    .channel(NettyUtils.getServerSocketChannelClass())
+                    .option(ChannelOption.SO_REUSEADDR, true)
+                    .option(ChannelOption.SO_BACKLOG, serverConfig.getSoBacklog())
+                    .childOption(ChannelOption.SO_KEEPALIVE, serverConfig.isSoKeepalive())
+                    .childOption(ChannelOption.TCP_NODELAY, serverConfig.isTcpNoDelay())
+                    .childOption(ChannelOption.SO_SNDBUF, serverConfig.getSendBufferSize())
+                    .childOption(ChannelOption.SO_RCVBUF, serverConfig.getReceiveBufferSize())
+                    .childHandler(new ChannelInitializer<SocketChannel>() {
+
+                        @Override
+                        protected void initChannel(SocketChannel ch) {
+                            initNettyChannel(ch);
+                        }
+                    });
 
             ChannelFuture future;
             try {
                 future = serverBootstrap.bind(serverConfig.getListenPort()).sync();
             } catch (Exception e) {
                 logger.error("NettyRemotingServer bind fail {}, exit", e.getMessage(), e);
-                throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()));
+                throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()));
             }
             if (future.isSuccess()) {
                 logger.info("NettyRemotingServer bind success at port : {}", serverConfig.getListenPort());
             } else if (future.cause() != null) {
-                throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()), future.cause());
+                throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()), future.cause());
             } else {
-                throw new RuntimeException(String.format("NettyRemotingServer bind %s fail", serverConfig.getListenPort()));
+                throw new RemoteException(String.format(NETTY_BIND_FAILURE_MSG, serverConfig.getListenPort()));
             }
         }
     }
@@ -185,17 +191,17 @@ public class NettyRemotingServer {
      */
     private void initNettyChannel(SocketChannel ch) {
         ch.pipeline()
-            .addLast("encoder", encoder)
-            .addLast("decoder", new NettyDecoder())
-            .addLast("server-idle-handle", new IdleStateHandler(0, 0, Constants.NETTY_SERVER_HEART_BEAT_TIME, TimeUnit.MILLISECONDS))
-            .addLast("handler", serverHandler);
+                .addLast("encoder", encoder)
+                .addLast("decoder", new NettyDecoder())
+                .addLast("server-idle-handle", new IdleStateHandler(0, 0, Constants.NETTY_SERVER_HEART_BEAT_TIME, TimeUnit.MILLISECONDS))
+                .addLast("handler", serverHandler);
     }
 
     /**
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
+     * @param processor processor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
         this.registerProcessor(commandType, processor, null);
@@ -205,8 +211,8 @@ public class NettyRemotingServer {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
-     * @param executor    thread executor
+     * @param processor processor
+     * @param executor thread executor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
         this.serverHandler.registerProcessor(commandType, processor, executor);
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyEncoder.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyEncoder.java
index 785ee5aaf2..04487ff686 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyEncoder.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyEncoder.java
@@ -14,16 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.remote.codec;
 
+import org.apache.dolphinscheduler.remote.command.Command;
+import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import org.apache.dolphinscheduler.remote.command.Command;
 
 /**
- *  netty encoder
+ * netty encoder
  */
 @Sharable
 public class NettyEncoder extends MessageToByteEncoder<Command> {
@@ -34,12 +37,11 @@ public class NettyEncoder extends MessageToByteEncoder<Command> {
      * @param ctx channel handler context
      * @param msg command
      * @param out byte buffer
-     * @throws Exception
      */
     @Override
     protected void encode(ChannelHandlerContext ctx, Command msg, ByteBuf out) throws Exception {
-        if(msg == null){
-            throw new Exception("encode msg is null");
+        if (msg == null) {
+            throw new RemotingException("encode msg is null");
         }
         out.writeByte(Command.MAGIC);
         out.writeByte(Command.VERSION);
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
index f77221d2e5..03ad4dd694 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- *  kill task response command
+ * kill task response command
  */
 public class TaskKillResponseCommand implements Serializable {
 
@@ -51,7 +51,7 @@ public class TaskKillResponseCommand implements Serializable {
     /**
      * other resource manager appId , for example : YARN etc
      */
-    protected List<String> appIds;
+    private List<String> appIds;
 
     public int getTaskInstanceId() {
         return taskInstanceId;
@@ -94,7 +94,7 @@ public class TaskKillResponseCommand implements Serializable {
     }
 
     /**
-     *  package request command
+     * package request command
      *
      * @return command
      */
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/exceptions/RemoteException.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/exceptions/RemoteException.java
new file mode 100644
index 0000000000..a13859026d
--- /dev/null
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/exceptions/RemoteException.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.remote.exceptions;
+
+/**
+ * Custom runtime exception
+ */
+public class RemoteException extends RuntimeException {
+
+    /**
+     * Construct a new runtime exception with the detail message
+     *
+     * @param   message  detail message
+     */
+    public RemoteException(String message) {
+        super(message);
+    }
+
+    /**
+     * Construct a new runtime exception with the detail message and cause
+     *
+     * @param   message  detail message
+     */
+    public RemoteException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java
index bbb32c76d1..f9de653d90 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java
@@ -18,14 +18,17 @@
 package org.apache.dolphinscheduler.remote.future;
 
 import org.apache.dolphinscheduler.remote.command.Command;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * response future
@@ -34,25 +37,25 @@ public class ResponseFuture {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResponseFuture.class);
 
-    private static final ConcurrentHashMap<Long,ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
+    private static final ConcurrentHashMap<Long, ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
 
     /**
-     *  request unique identification
+     * request unique identification
      */
     private final long opaque;
 
     /**
-     *  timeout
+     * timeout
      */
     private final long timeoutMillis;
 
     /**
-     *  invokeCallback function
+     * invokeCallback function
      */
     private final InvokeCallback invokeCallback;
 
     /**
-     *  releaseSemaphore
+     * releaseSemaphore
      */
     private final ReleaseSemaphore releaseSemaphore;
 
@@ -61,7 +64,7 @@ public class ResponseFuture {
     private final long beginTimestamp = System.currentTimeMillis();
 
     /**
-     *  response command
+     * response command
      */
     private Command responseCommand;
 
@@ -78,10 +81,9 @@ public class ResponseFuture {
     }
 
     /**
-     *  wait for response
+     * wait for response
      *
      * @return command
-     * @throws InterruptedException
      */
     public Command waitResponse() throws InterruptedException {
         this.latch.await(timeoutMillis, TimeUnit.MILLISECONDS);
@@ -89,7 +91,7 @@ public class ResponseFuture {
     }
 
     /**
-     *  put response
+     * put response
      *
      * @param responseCommand responseCommand
      */
@@ -99,12 +101,13 @@ public class ResponseFuture {
         FUTURE_TABLE.remove(opaque);
     }
 
-    public static ResponseFuture getFuture(long opaque){
+    public static ResponseFuture getFuture(long opaque) {
         return FUTURE_TABLE.get(opaque);
     }
 
     /**
-     *  whether timeout
+     * whether timeout
+     *
      * @return timeout
      */
     public boolean isTimeout() {
@@ -113,7 +116,7 @@ public class ResponseFuture {
     }
 
     /**
-     *  execute invoke callback
+     * execute invoke callback
      */
     public void executeInvokeCallback() {
         if (invokeCallback != null) {
@@ -162,10 +165,10 @@ public class ResponseFuture {
     }
 
     /**
-     *  release
+     * release
      */
     public void release() {
-        if(this.releaseSemaphore != null){
+        if (this.releaseSemaphore != null) {
             this.releaseSemaphore.release();
         }
     }
@@ -173,7 +176,7 @@ public class ResponseFuture {
     /**
      * scan future table
      */
-    public static void scanFutureTable(){
+    public static void scanFutureTable() {
         final List<ResponseFuture> futureList = new LinkedList<>();
         Iterator<Map.Entry<Long, ResponseFuture>> it = FUTURE_TABLE.entrySet().iterator();
         while (it.hasNext()) {
@@ -189,7 +192,7 @@ public class ResponseFuture {
             try {
                 future.release();
                 future.executeInvokeCallback();
-            } catch (Throwable ex) {
+            } catch (Exception ex) {
                 LOGGER.warn("scanFutureTable, execute callback error", ex);
             }
         }
@@ -197,16 +200,16 @@ public class ResponseFuture {
 
     @Override
     public String toString() {
-        return "ResponseFuture{" +
-                "opaque=" + opaque +
-                ", timeoutMillis=" + timeoutMillis +
-                ", invokeCallback=" + invokeCallback +
-                ", releaseSemaphore=" + releaseSemaphore +
-                ", latch=" + latch +
-                ", beginTimestamp=" + beginTimestamp +
-                ", responseCommand=" + responseCommand +
-                ", sendOk=" + sendOk +
-                ", cause=" + cause +
-                '}';
+        return "ResponseFuture{"
+                + "opaque=" + opaque
+                + ", timeoutMillis=" + timeoutMillis
+                + ", invokeCallback=" + invokeCallback
+                + ", releaseSemaphore=" + releaseSemaphore
+                + ", latch=" + latch
+                + ", beginTimestamp=" + beginTimestamp
+                + ", responseCommand=" + responseCommand
+                + ", sendOk=" + sendOk
+                + ", cause=" + cause
+                + '}';
     }
 }
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
index a988acfe17..c057850947 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyClientHandler.java
@@ -74,7 +74,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
     public NettyClientHandler(NettyRemotingClient nettyRemotingClient, ExecutorService callbackExecutor) {
         this.nettyRemotingClient = nettyRemotingClient;
         this.callbackExecutor = callbackExecutor;
-        this.processors = new ConcurrentHashMap();
+        this.processors = new ConcurrentHashMap<>();
     }
 
     /**
@@ -82,10 +82,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
      * the current channel has reached the end of its life cycle
      *
      * @param ctx channel handler context
-     * @throws Exception
      */
     @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+    public void channelInactive(ChannelHandlerContext ctx) {
         nettyRemotingClient.closeChannel(ChannelUtils.toAddress(ctx.channel()));
         ctx.channel().close();
     }
@@ -95,10 +94,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
      *
      * @param ctx channel handler context
      * @param msg message
-     * @throws Exception
      */
     @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+    public void channelRead(ChannelHandlerContext ctx, Object msg) {
         processReceived(ctx.channel(), (Command) msg);
     }
 
@@ -106,7 +104,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
+     * @param processor processor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
         this.registerProcessor(commandType, processor, null);
@@ -116,8 +114,8 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
-     * @param executor    thread executor
+     * @param processor processor
+     * @param executor thread executor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
         ExecutorService executorRef = executor;
@@ -138,12 +136,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
             future.setResponseCommand(command);
             future.release();
             if (future.getInvokeCallback() != null) {
-                this.callbackExecutor.submit(new Runnable() {
-                    @Override
-                    public void run() {
-                        future.executeInvokeCallback();
-                    }
-                });
+                this.callbackExecutor.submit(future::executeInvokeCallback);
             } else {
                 future.putResponse(command);
             }
@@ -158,7 +151,7 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
             Runnable run = () -> {
                 try {
                     pair.getLeft().process(channel, command);
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     logger.error(String.format("process command %s exception", command), e);
                 }
             };
@@ -175,13 +168,12 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
     /**
      * caught exception
      *
-     * @param ctx   channel handler context
+     * @param ctx channel handler context
      * @param cause cause
-     * @throws Exception
      */
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        logger.error("exceptionCaught : {}", cause);
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        logger.error("exceptionCaught : {}", cause.getMessage(), cause);
         nettyRemotingClient.closeChannel(ChannelUtils.toAddress(ctx.channel()));
         ctx.channel().close();
     }
@@ -193,11 +185,11 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
             heartBeat.setType(CommandType.HEART_BEAT);
             heartBeat.setBody(heartBeatData);
             ctx.writeAndFlush(heartBeat)
-                .addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
+                    .addListener(ChannelFutureListener.CLOSE_ON_FAILURE);
 
         } else {
             super.userEventTriggered(ctx, evt);
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
index 09e41e9b54..322dfae9b1 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java
@@ -55,7 +55,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
     /**
      * server processors queue
      */
-    private final ConcurrentHashMap<CommandType, Pair<NettyRequestProcessor, ExecutorService>> processors = new ConcurrentHashMap();
+    private final ConcurrentHashMap<CommandType, Pair<NettyRequestProcessor, ExecutorService>> processors = new ConcurrentHashMap<>();
 
     public NettyServerHandler(NettyRemotingServer nettyRemotingServer) {
         this.nettyRemotingServer = nettyRemotingServer;
@@ -66,10 +66,9 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      * the current channel has reached the end of its life cycle
      *
      * @param ctx channel handler context
-     * @throws Exception
      */
     @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+    public void channelInactive(ChannelHandlerContext ctx) {
         ctx.channel().close();
     }
 
@@ -78,10 +77,9 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      *
      * @param ctx channel handler context
      * @param msg message
-     * @throws Exception
      */
     @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+    public void channelRead(ChannelHandlerContext ctx, Object msg) {
         processReceived(ctx.channel(), (Command) msg);
     }
 
@@ -89,7 +87,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
+     * @param processor processor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor) {
         this.registerProcessor(commandType, processor, null);
@@ -99,8 +97,8 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      * register processor
      *
      * @param commandType command type
-     * @param processor   processor
-     * @param executor    thread executor
+     * @param processor processor
+     * @param executor thread executor
      */
     public void registerProcessor(final CommandType commandType, final NettyRequestProcessor processor, final ExecutorService executor) {
         ExecutorService executorRef = executor;
@@ -114,21 +112,17 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      * process received logic
      *
      * @param channel channel
-     * @param msg     message
+     * @param msg message
      */
     private void processReceived(final Channel channel, final Command msg) {
         final CommandType commandType = msg.getType();
         final Pair<NettyRequestProcessor, ExecutorService> pair = processors.get(commandType);
         if (pair != null) {
-            Runnable r = new Runnable() {
-
-                @Override
-                public void run() {
-                    try {
-                        pair.getLeft().process(channel, msg);
-                    } catch (Throwable ex) {
-                        logger.error("process msg {} error", msg, ex);
-                    }
+            Runnable r = () -> {
+                try {
+                    pair.getLeft().process(channel, msg);
+                } catch (Exception ex) {
+                    logger.error("process msg {} error", msg, ex);
                 }
             };
             try {
@@ -144,9 +138,8 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
     /**
      * caught exception
      *
-     * @param ctx   channel handler context
+     * @param ctx channel handler context
      * @param cause cause
-     * @throws Exception
      */
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
@@ -158,7 +151,6 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
      * channel write changed
      *
      * @param ctx channel handler context
-     * @throws Exception
      */
     @Override
     public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
@@ -168,14 +160,14 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
         if (!ch.isWritable()) {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is not writable, over high water level : {}",
-                    ch, config.getWriteBufferHighWaterMark());
+                        ch, config.getWriteBufferHighWaterMark());
             }
 
             config.setAutoRead(false);
         } else {
             if (logger.isWarnEnabled()) {
                 logger.warn("{} is writable, to low water : {}",
-                    ch, config.getWriteBufferLowWaterMark());
+                        ch, config.getWriteBufferLowWaterMark());
             }
             config.setAutoRead(true);
         }
@@ -189,4 +181,4 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
             super.userEventTriggered(ctx, evt);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/ChannelUtils.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/ChannelUtils.java
index 138a8f0bdf..a1ffb8768e 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/ChannelUtils.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/ChannelUtils.java
@@ -14,43 +14,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.remote.utils;
 
-import io.netty.channel.Channel;
+package org.apache.dolphinscheduler.remote.utils;
 
 import java.net.InetSocketAddress;
 
+import io.netty.channel.Channel;
+
 /**
- *  channel utils
+ * channel utils
  */
 public class ChannelUtils {
 
+    private ChannelUtils() {
+        throw new IllegalStateException(ChannelUtils.class.getName());
+    }
+
     /**
-     *  get local address
+     * get local address
      *
      * @param channel channel
      * @return local address
      */
-    public static String getLocalAddress(Channel channel){
-        return ((InetSocketAddress)channel.localAddress()).getAddress().getHostAddress();
+    public static String getLocalAddress(Channel channel) {
+        return ((InetSocketAddress) channel.localAddress()).getAddress().getHostAddress();
     }
 
     /**
-     *  get remote address
+     * get remote address
+     *
      * @param channel channel
      * @return remote address
      */
-    public static String getRemoteAddress(Channel channel){
-        return ((InetSocketAddress)channel.remoteAddress()).getAddress().getHostAddress();
+    public static String getRemoteAddress(Channel channel) {
+        return ((InetSocketAddress) channel.remoteAddress()).getAddress().getHostAddress();
     }
 
     /**
-     *  channel to address
+     * channel to address
+     *
      * @param channel channel
      * @return address
      */
-    public static Host toAddress(Channel channel){
-        InetSocketAddress socketAddress = ((InetSocketAddress)channel.remoteAddress());
+    public static Host toAddress(Channel channel) {
+        InetSocketAddress socketAddress = ((InetSocketAddress) channel.remoteAddress());
         return new Host(socketAddress.getAddress().getHostAddress(), socketAddress.getPort());
     }
 
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Constants.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Constants.java
index 866ebb6c2b..e5156ba5b3 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Constants.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Constants.java
@@ -25,6 +25,10 @@ import java.nio.charset.StandardCharsets;
  */
 public class Constants {
 
+    private Constants() {
+        throw new IllegalStateException(Constants.class.getName());
+    }
+
     public static final String COMMA = ",";
 
     public static final String SLASH = "/";
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/IPUtils.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/IPUtils.java
index 2fa82fd5ba..91f61f852d 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/IPUtils.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/IPUtils.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dolphinscheduler.remote.utils;
 
+import org.apache.dolphinscheduler.remote.exceptions.RemoteException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,22 +30,24 @@ import java.util.regex.Pattern;
 
 public class IPUtils {
 
-    private static final Logger logger = LoggerFactory.getLogger(IPUtils.class);
+    private IPUtils() {
+        throw new IllegalStateException(IPUtils.class.getName());
+    }
 
-    private static String IP_REGEX = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
+    private static final Logger logger = LoggerFactory.getLogger(IPUtils.class);
 
-    private static String LOCAL_HOST = "unknown";
+    private static String localHost = "unknown";
 
     static {
         String host = System.getenv("HOSTNAME");
         if (isNotEmpty(host)) {
-            LOCAL_HOST = host;
+            localHost = host;
         } else {
 
             try {
                 String hostName = InetAddress.getLocalHost().getHostName();
                 if (isNotEmpty(hostName)) {
-                    LOCAL_HOST = hostName;
+                    localHost = hostName;
                 }
             } catch (UnknownHostException e) {
                 logger.error("get hostName error!", e);
@@ -52,7 +56,7 @@ public class IPUtils {
     }
 
     public static String getLocalHost() {
-        return LOCAL_HOST;
+        return localHost;
     }
 
 
@@ -100,7 +104,7 @@ public class IPUtils {
 
             return addresses;
         } catch (SocketException e) {
-            throw new RuntimeException(e.getMessage(), e);
+            throw new RemoteException(e.getMessage(), e);
         }
     }
 
@@ -131,12 +135,11 @@ public class IPUtils {
             return false;
         }
 
-        Pattern pat = Pattern.compile(IP_REGEX);
+        String ipRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
+        Pattern pat = Pattern.compile(ipRegex);
 
         Matcher mat = pat.matcher(addr);
 
-        boolean ipAddress = mat.find();
-
-        return ipAddress;
+        return mat.find();
     }
 }
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Pair.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Pair.java
index 33bf8ca7c3..57cec4bbe7 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Pair.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/utils/Pair.java
@@ -17,7 +17,6 @@
 
 package org.apache.dolphinscheduler.remote.utils;
 
-
 /**
  * key value pair
  *
@@ -51,7 +50,7 @@ public class Pair<L, R> {
         this.right = right;
     }
 
-    public static <L, R> Pair of(L left, R right){
-        return new Pair(left, right);
+    public static <L, R> Pair<L, R> of(L left, R right) {
+        return new Pair<>(left, right);
     }
 }

From a3bbfdb652d2404130901b3631ad280430141ed3 Mon Sep 17 00:00:00 2001
From: CalvinKirs <kirs@apache.org>
Date: Sat, 30 Jan 2021 22:41:48 +0800
Subject: [PATCH 36/87] Capture when the alarm is abnormal

---
 .../dolphinscheduler/alert/runner/AlertSender.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index 7ab29e1001..114d01a845 100644
--- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -157,7 +157,14 @@ public class AlertSender {
         alertInfo.setAlertData(alertData);
         Map<String, String> paramsMap = JSONUtils.toMap(instance.getPluginInstanceParams());
         alertInfo.setAlertParams(paramsMap);
-        AlertResult alertResult = alertChannel.process(alertInfo);
+        AlertResult alertResult;
+        try {
+            alertResult = alertChannel.process(alertInfo);
+        } catch (Exception e) {
+            alertResult = new AlertResult("false", e.getMessage());
+            logger.error("send alert error alert data id :{},", alertData.getId(), e);
+        }
+
 
         if (alertResult == null) {
             String message = String.format("Alert Plugin %s send error : return alertResult value is null", pluginInstanceName);

From e05d93aa335d872730fb55ece75e093c051ea600 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Sun, 31 Jan 2021 21:04:03 +0800
Subject: [PATCH 37/87] fix ui warningInstance title support
 internationalization.

---
 .../warningInstance/_source/createWarningInstance.vue  | 10 +++++-----
 .../pages/security/pages/warningInstance/index.vue     |  6 +++---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js |  2 ++
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
index c41af3db42..b46e477803 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
@@ -39,7 +39,7 @@
           <template slot="content">
             <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" disabled="true" v-if="item.id">
               <el-option
-                      v-for="items in pulginInstance"
+                      v-for="items in pluginInstance"
                       :key="items.id"
                       :value="items.id"
                       :label="items.pluginName">
@@ -47,7 +47,7 @@
             </el-select>
             <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" v-else>
               <el-option
-                      v-for="items in pulginInstance"
+                      v-for="items in pluginInstance"
                       :key="items.id"
                       :value="items.id"
                       :label="items.pluginName">
@@ -83,7 +83,7 @@
     },
     props: {
       item: Object,
-      pulginInstance: Array
+      pluginInstance: Array
     },
     methods: {
       _ok () {
@@ -121,7 +121,7 @@
           this.rule = JSON.parse(res.pluginParams)
           this.rule.forEach(item => {
             if (item.title.indexOf('$t') !== -1) {
-              item.title = $t(item.field)
+              item.title = this.$t(item.field)
             }
           })
         }).catch(e => {
@@ -163,7 +163,7 @@
         this.pluginDefineId = this.item.pluginDefineId
         JSON.parse(this.item.pluginInstanceParams).forEach(item => {
           if (item.title.indexOf('$t') !== -1) {
-            item.title = $t(item.field)
+            item.title = this.$t(item.field)
           }
           pluginInstanceParams.push(item)
         })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
index a0623ab2e0..c4619f986f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
@@ -25,7 +25,7 @@
             v-if="createWarningDialog"
             :visible.sync="createWarningDialog"
             width="auto">
-            <m-create-warning-instance :item="item" :pulginInstance="pulginInstance" @onUpdate="onUpdate" @close="close"></m-create-warning-instance>
+            <m-create-warning-instance :item="item" :pluginInstance="pluginInstance" @onUpdate="onUpdate" @close="close"></m-create-warning-instance>
           </el-dialog>
         </template>
       </m-conditions>
@@ -86,7 +86,7 @@
         isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER',
         createWarningDialog: false,
         item: {},
-        pulginInstance: []
+        pluginInstance: []
       }
     },
     mixins: [listUrlParamHandle],
@@ -114,7 +114,7 @@
       },
       _create (item) {
         this.getPlugins({ pluginType: 'ALERT' }).then(res => {
-          this.pulginInstance = res
+          this.pluginInstance = res
         }).catch(e => {
           this.$message.error(e.msg)
         })
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 168258a9f6..9038e21fa7 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -400,6 +400,8 @@ export default {
   'Please select a notification group': 'Please select a notification group',
   Recipient: 'Recipient',
   Cc: 'Cc',
+  receivers: 'receivers',
+  receiverCcs: 'receiverCcs',
   'Whether it is a complement process?': 'Whether it is a complement process?',
   'Schedule date': 'Schedule date',
   'Mode of execution': 'Mode of execution',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index fb3bd3fb5b..61174ae867 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -400,6 +400,8 @@ export default {
   'Please select a notification group': '请选择通知组',
   Recipient: '收件人',
   Cc: '抄送人',
+  receivers: '收件人',
+  receiverCcs: '抄送人',
   'Whether it is a complement process?': '是否补数',
   'Schedule date': '调度日期',
   'Mode of execution': '执行方式',

From c1875e80d5dba2aea98e796e1a611ca765f859e7 Mon Sep 17 00:00:00 2001
From: enoughwell <43284848+enoughwell@users.noreply.github.com>
Date: Sun, 31 Jan 2021 22:13:52 +0800
Subject: [PATCH 38/87] [Feature-4596] Add a description for the system env
 path in common.properties (#4638)

* add a description for the system env path in common.properties

* Update common.properties

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 dolphinscheduler-common/src/main/resources/common.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
index b8c21c853b..1ff62a20c3 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -62,7 +62,7 @@ yarn.application.status.address=http://ds1:8088/ws/v1/cluster/apps/%s
 # job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)
 yarn.job.history.status.address=http://ds1:19888/ws/v1/history/mapreduce/jobs/%s
 
-# system env path
+# system env path, If you want to set your own path, you need to set this env file to an absolute path
 #dolphinscheduler.env.path=env/dolphinscheduler_env.sh
 development.state=false
 

From b912c98b1b5a352eefdbd7c921b468eacc015c4a Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 10:34:09 +0800
Subject: [PATCH 39/87] fix

---
 .../pages/dag/_source/formModel/tasks/sql.vue | 62 +------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 169ebf87de..dff7f3f97d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -30,16 +30,7 @@
       <div slot="text">{{$t('SQL Type')}}</div>
       <div slot="content">
         <div style="display: inline-block;">
-          <m-sql-type
-                  @on-sqlType="_onSqlType"
-                  :sql-type="sqlType">
-          </m-sql-type>
-        </div>
-        <div v-if="sqlType==0" style="display: inline-block;padding-left: 10px;margin-top: 2px;">
-          <el-checkbox-group v-model="showType" size="small">
-            <el-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('TableMode')}}</el-checkbox>
-            <el-checkbox :label="'ATTACHMENT'" :disabled="isDetails">{{$t('Attachment')}}</el-checkbox>
-          </el-checkbox-group>
+          <m-sql-type :sql-type="sqlType"></m-sql-type>
         </div>
       </div>
     </m-list-box>
@@ -175,8 +166,6 @@
         sqlType: '0',
         // Email title
         title: '',
-        // Form/attachment
-        showType: ['TABLE'],
         // Sql parameter
         connParams: '',
         // Pre statements
@@ -201,15 +190,6 @@
       getSriptBoxValue (val) {
         editor.setValue(val)
       },
-      /**
-       * return sqlType
-       */
-      _onSqlType (a) {
-        this.sqlType = a
-        if (a === 0) {
-          this.showType = ['TABLE']
-        }
-      },
       /**
        * return udfs
        */
@@ -254,10 +234,6 @@
         if (!this.$refs.refDs._verifDatasource()) {
           return false
         }
-        if (this.sqlType === '0' && !this.showType.length) {
-          this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`)
-          return false
-        }
         if (this.sqlType === '0' && !this.title) {
           this.$message.warning(`${i18n.$t('Mail subject required')}`)
           return false
@@ -297,18 +273,6 @@
           sqlType: this.sqlType,
           title: this.title,
           groupId: this.groupId,
-          showType: (() => {
-            /**
-             * Special processing return order TABLE,ATTACHMENT
-             * Handling checkout sequence
-             */
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,
@@ -358,14 +322,6 @@
           sqlType: this.sqlType,
           title: this.title,
           groupId: this.groupId,
-          showType: (() => {
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,
@@ -383,9 +339,6 @@
     watch: {
       // Listening to sqlType
       sqlType (val) {
-        if (val === 0) {
-          this.showType = []
-        }
         if (val !== 0) {
           this.title = ''
           this.groupId = null
@@ -415,11 +368,6 @@
         this.sqlType = o.params.sqlType
         this.connParams = o.params.connParams || ''
         this.localParams = o.params.localParams || []
-        if (o.params.showType === '') {
-          this.showType = []
-        } else {
-          this.showType = o.params.showType.split(',') || []
-        }
         this.preStatements = o.params.preStatements || []
         this.postStatements = o.params.postStatements || []
         this.title = o.params.title || ''
@@ -450,14 +398,6 @@
           sqlType: this.sqlType,
           title: this.title,
           groupId: this.groupId,
-          showType: (() => {
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,

From 54c0ec09b027b9bce8f0943744e13960cee01356 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 10:40:05 +0800
Subject: [PATCH 40/87] fix

---
 .../conf/home/pages/dag/_source/formModel/tasks/sql.vue   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index dff7f3f97d..5f58d29021 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -30,7 +30,7 @@
       <div slot="text">{{$t('SQL Type')}}</div>
       <div slot="content">
         <div style="display: inline-block;">
-          <m-sql-type :sql-type="sqlType"></m-sql-type>
+          <m-sql-type @on-sqlType="_onSqlType" :sql-type="sqlType"></m-sql-type>
         </div>
       </div>
     </m-list-box>
@@ -190,6 +190,12 @@
       getSriptBoxValue (val) {
         editor.setValue(val)
       },
+      /**
+       * return sqlType
+       */
+      _onSqlType (a) {
+        this.sqlType = a
+      },
       /**
        * return udfs
        */

From 7db8ca239365abaccfcf83b677b639f8003efd57 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Mon, 1 Feb 2021 13:08:35 +0800
Subject: [PATCH 41/87] imp ui alert groups description add filter null.

---
 .../pages/security/pages/warningGroups/_source/list.vue     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index c3c0a9e343..914c46b66a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -20,7 +20,11 @@
       <el-table :data="list" size="mini" style="width: 100%">
         <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="groupName" :label="$t('Group Name')"></el-table-column>
-        <el-table-column prop="description" :label="$t('Remarks')" width="200"></el-table-column>
+        <el-table-column prop="description" :label="$t('Remarks')" width="200">
+          <template slot-scope="scope">
+            <span>{{scope.row.description | filterNull}}</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('Create Time')" width="140">
           <template slot-scope="scope">
             <span>{{scope.row.createTime | formatDate}}</span>

From ef0def3108c093b665eb54581ef95df0340e5b80 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 13:28:53 +0800
Subject: [PATCH 42/87] [Feature-3826]sql node adds alarm group field (#4602)

* [Feature-3826]sql node adds alarm group field
---
 .../formModel/tasks/_source/warningGroups.vue | 76 ++++++++++++++++++
 .../pages/dag/_source/formModel/tasks/sql.vue | 80 +++++--------------
 .../pages/dag/_source/startingParam/index.vue |  2 +-
 .../conf/home/pages/dag/definitionDetails.vue |  4 +-
 .../src/js/conf/home/pages/dag/index.vue      |  4 +-
 .../conf/home/pages/dag/instanceDetails.vue   |  4 +-
 .../definition/pages/list/_source/list.vue    |  1 +
 .../definition/pages/list/_source/start.vue   |  6 +-
 .../js/conf/home/store/security/actions.js    | 13 +++
 .../src/js/conf/home/store/security/state.js  |  1 +
 .../src/js/module/i18n/locale/en_US.js        |  2 +
 .../src/js/module/i18n/locale/zh_CN.js        |  2 +
 12 files changed, 128 insertions(+), 67 deletions(-)
 create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue
new file mode 100644
index 0000000000..30bcc522fb
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/warningGroups.vue
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+  <el-select
+          clearable
+          @change="_onChange"
+          v-model="selectedValue"
+          size="small"
+          style="width: 100%">
+    <el-option
+            v-for="item in alarmGroupsList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.groupName">
+    </el-option>
+  </el-select>
+</template>
+<script>
+  import disabledState from '@/module/mixin/disabledState'
+  export default {
+    name: 'form-warning-group',
+    data () {
+      return {
+        selectedValue: this.value,
+        workerGroupsList: []
+      }
+    },
+    mixins: [disabledState],
+    props: {
+      value: {
+        type: Number,
+        default: null
+      }
+    },
+    model: {
+      prop: 'value',
+      event: 'warningGroupsEvent'
+    },
+    methods: {
+      _onChange (o) {
+        this.$emit('warningGroupsEvent', o)
+      }
+    },
+    watch: {
+      value (val) {
+        this.selectedValue = val
+      }
+    },
+    created () {
+      let stateAlarmGroupsList = this.store.state.security.alarmGroupsListAll || []
+      if (stateAlarmGroupsList.length) {
+        this.alarmGroupsList = stateAlarmGroupsList
+      } else {
+        this.store.dispatch('security/getAlarmGroupsAll').then(res => {
+          this.$nextTick(() => {
+            this.alarmGroupsList = res
+          })
+        })
+      }
+    }
+  }
+</script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 706edcda6a..5f58d29021 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -30,16 +30,7 @@
       <div slot="text">{{$t('SQL Type')}}</div>
       <div slot="content">
         <div style="display: inline-block;">
-          <m-sql-type
-                  @on-sqlType="_onSqlType"
-                  :sql-type="sqlType">
-          </m-sql-type>
-        </div>
-        <div v-if="sqlType==0" style="display: inline-block;padding-left: 10px;margin-top: 2px;">
-          <el-checkbox-group v-model="showType" size="small">
-            <el-checkbox :label="'TABLE'" :disabled="isDetails">{{$t('TableMode')}}</el-checkbox>
-            <el-checkbox :label="'ATTACHMENT'" :disabled="isDetails">{{$t('Attachment')}}</el-checkbox>
-          </el-checkbox-group>
+          <m-sql-type @on-sqlType="_onSqlType" :sql-type="sqlType"></m-sql-type>
         </div>
       </div>
     </m-list-box>
@@ -51,10 +42,17 @@
             type="input"
             size="small"
             v-model="title"
+            :disabled="isDetails"
             :placeholder="$t('Please enter the title of email')">
           </el-input>
         </div>
       </m-list-box>
+      <m-list-box>
+        <div slot="text"><strong class='requiredIcon'>*</strong>{{$t('Alarm group')}}</div>
+        <div slot="content">
+          <m-warning-groups v-model="groupId"></m-warning-groups>
+        </div>
+      </m-list-box>
     </template>
     <m-list-box v-show="type === 'HIVE'">
       <div slot="text">{{$t('SQL Parameter')}}</div>
@@ -142,6 +140,7 @@
   import mDatasource from './_source/datasource'
   import mLocalParams from './_source/localParams'
   import mStatementList from './_source/statementList'
+  import mWarningGroups from './_source/warningGroups'
   import disabledState from '@/module/mixin/disabledState'
   import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
 
@@ -167,8 +166,6 @@
         sqlType: '0',
         // Email title
         title: '',
-        // Form/attachment
-        showType: ['TABLE'],
         // Sql parameter
         connParams: '',
         // Pre statements
@@ -176,7 +173,8 @@
         // Post statements
         postStatements: [],
         item: '',
-        scriptBoxDialog: false
+        scriptBoxDialog: false,
+        groupId: null
       }
     },
     mixins: [disabledState],
@@ -197,9 +195,6 @@
        */
       _onSqlType (a) {
         this.sqlType = a
-        if (a === 0) {
-          this.showType = ['TABLE']
-        }
       },
       /**
        * return udfs
@@ -245,16 +240,12 @@
         if (!this.$refs.refDs._verifDatasource()) {
           return false
         }
-        if (this.sqlType === 0 && !this.showType.length) {
-          this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`)
-          return false
-        }
-        if (this.sqlType === 0 && !this.title) {
+        if (this.sqlType === '0' && !this.title) {
           this.$message.warning(`${i18n.$t('Mail subject required')}`)
           return false
         }
-        if (this.sqlType === 0 && !this.receivers.length) {
-          this.$message.warning(`${i18n.$t('Recipient required')}`)
+        if (this.sqlType === '0' && (this.groupId === '' || this.groupId === null)) {
+          this.$message.warning(`${i18n.$t('Alarm group required')}`)
           return false
         }
         // udfs Subcomponent verification Verification only if the data type is HIVE
@@ -287,18 +278,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
-          showType: (() => {
-            /**
-             * Special processing return order TABLE,ATTACHMENT
-             * Handling checkout sequence
-             */
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
+          groupId: this.groupId,
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,
@@ -347,14 +327,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
-          showType: (() => {
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
+          groupId: this.groupId,
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,
@@ -372,11 +345,9 @@
     watch: {
       // Listening to sqlType
       sqlType (val) {
-        if (val === 0) {
-          this.showType = []
-        }
         if (val !== 0) {
           this.title = ''
+          this.groupId = null
         }
       },
       // Listening data source
@@ -403,14 +374,10 @@
         this.sqlType = o.params.sqlType
         this.connParams = o.params.connParams || ''
         this.localParams = o.params.localParams || []
-        if (o.params.showType === '') {
-          this.showType = []
-        } else {
-          this.showType = o.params.showType.split(',') || []
-        }
         this.preStatements = o.params.preStatements || []
         this.postStatements = o.params.postStatements || []
         this.title = o.params.title || ''
+        this.groupId = o.params.groupId
       }
     },
     mounted () {
@@ -436,14 +403,7 @@
           udfs: this.udfs,
           sqlType: this.sqlType,
           title: this.title,
-          showType: (() => {
-            let showType = this.showType
-            if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
-              return [showType[1], showType[0]].join(',')
-            } else {
-              return showType.join(',')
-            }
-          })(),
+          groupId: this.groupId,
           localParams: this.localParams,
           connParams: this.connParams,
           preStatements: this.preStatements,
@@ -451,6 +411,6 @@
         }
       }
     },
-    components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mStatementList, mScriptBox }
+    components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mStatementList, mScriptBox, mWarningGroups }
   }
 </script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
index bcc91524ff..de42199a1a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
@@ -26,7 +26,7 @@
            <li><span class="tab">{{$t('Process priority')}}：</span><span class="content">{{startupParam.processInstancePriority}}</span></li>
            <li><span class="tab">{{$t('Worker group')}}：</span><span class="content" v-if="workerGroupList.length">{{startupParam.workerGroup}}</span></li>
            <li><span class="tab">{{$t('Notification strategy')}}：</span><span class="content">{{_rtWarningType(startupParam.warningType)}}</span></li>
-           <li><span class="tab">{{$t('Notification group')}}：</span><span class="content" v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
+           <li><span class="tab">{{$t('Alarm group')}}：</span><span class="content" v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
          </ul>
        </div>
     </template>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
index d9acb38453..65510bf69b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
@@ -42,7 +42,7 @@
     methods: {
       ...mapMutations('dag', ['resetParams', 'setIsDetails']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -64,6 +64,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           let item = data[0]
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
index d232e2dd86..81d129a47e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
@@ -41,7 +41,7 @@
     methods: {
       ...mapMutations('dag', ['resetParams']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -63,6 +63,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           this.isLoading = false
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index 0727d12eed..f9561bd52c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -44,7 +44,7 @@
     methods: {
       ...mapMutations('dag', ['setIsDetails', 'resetParams']),
       ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
-      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
+      ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
        */
@@ -66,6 +66,8 @@
           this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
+          // get alarm group list
+          this.getAlarmGroupsAll(),
           this.getTenantList()
         ]).then((data) => {
           let item = data[0]
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 64c3f880b5..32612213ac 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -129,6 +129,7 @@
     </el-drawer>
     <el-dialog
       :title="$t('Please set the parameters before starting')"
+      v-if="startDialog"
       :visible.sync="startDialog"
       width="auto">
       <m-start :startData= "startData" @onUpdateStart="onUpdateStart" @closeStart="closeStart"></m-start>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index e2ab711528..e9f615d340 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -78,15 +78,16 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('Notification group')}}
+        {{$t('Alarm group')}}
       </div>
       <div class="cont">
         <el-select
            style="width: 200px;"
+           clearable
            size="small"
            v-model="warningGroupId"
           :disabled="!notifyGroupList.length">
-          <el-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a notification group')" size="small" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = ''">
+          <el-input slot="trigger" slot-scope="{ selectedModel }" readonly size="small" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = ''">
             <em slot="suffix" class="el-icon-error" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId"></em>
             <em slot="suffix" class="el-icon-bottom" style="font-size: 12px;" v-show="!warningGroupId"></em>
           </el-input>
@@ -263,7 +264,6 @@
         })
       },
       _getGlobalParams () {
-        this.setIsDetails(true)
         this.store.dispatch('dag/getProcessDetails', this.startData.id).then(res => {
           this.definitionGlobalParams = _.cloneDeep(this.store.state.dag.globalParams)
           this.udpList = _.cloneDeep(this.store.state.dag.globalParams)
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index 9405d264a4..97df05d7bc 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -600,6 +600,19 @@ export default {
       })
     })
   },
+  /**
+   * get alarm groups all
+   */
+  getAlarmGroupsAll ({ state }, payload) {
+    return new Promise((resolve, reject) => {
+      io.get('alert-group/list', payload, res => {
+        state.alarmGroupsListAll = res.data
+        resolve(res)
+      }).catch(e => {
+        reject(e)
+      })
+    })
+  },
   saveWorkerGroups ({ state }, payload) {
     return new Promise((resolve, reject) => {
       io.post('worker-group/save', payload, res => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/state.js b/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
index f3533265a9..a959d9431f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/state.js
@@ -16,5 +16,6 @@
  */
 export default {
   workerGroupsListAll: [],
+  alarmGroupsListAll: [],
   tenantAllList: []
 }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 168258a9f6..34145e7132 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -207,6 +207,8 @@ export default {
   'UDF resources': 'UDF resources',
   'UDF resources directory': 'UDF resources directory',
   'Please select UDF resources directory': 'Please select UDF resources directory',
+  'Alarm group': 'Alarm group',
+  'Alarm group required': 'Alarm group required',
   'Edit alarm group': 'Edit alarm group',
   'Create alarm group': 'Create alarm group',
   'Create Alarm Instance': 'Create Alarm Instance',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index fb3bd3fb5b..7cafa9dec1 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -207,6 +207,8 @@ export default {
   'UDF resources': 'UDF资源',
   'UDF resources directory': 'UDF资源目录',
   'Please select UDF resources directory': '请选择UDF资源目录',
+  'Alarm group': '告警组',
+  'Alarm group required': '告警组必填',
   'Edit alarm group': '编辑告警组',
   'Create alarm group': '创建告警组',
   'Create Alarm Instance': '创建告警实例',

From 5acf718384dac161e077ed9d138f70c2ef045a14 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 13:34:40 +0800
Subject: [PATCH 43/87] [Improvement-3878][ui] Fixed the problem that custom
 parameters could not be edited and zk displayed abnormally when the workflow
 started

---
 .../dag/_source/formModel/tasks/_source/localParams.vue   | 2 +-
 .../pages/servers/_source/zookeeperDirectories.vue        | 8 ++------
 .../js/conf/home/pages/monitor/pages/servers/worker.vue   | 2 +-
 .../pages/definition/pages/list/_source/timing.vue        | 7 ++++---
 .../home/pages/projects/pages/definition/timing/index.vue | 4 +++-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
index 3f8c6e889c..c8a600b699 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
@@ -79,7 +79,7 @@
         </a>
       </span>
     </div>
-    <span class="add-dp" v-if="!localParamsList.length" v-show="!isStartProcess">
+    <span class="add-dp" v-if="!localParamsList.length" v-show="isStartProcess">
       <a href="javascript:" @click="!isDetails && _addUdp()" >
         <em class="iconfont el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
       </a>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
index ca4f6ad728..088063b01e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
@@ -15,13 +15,9 @@
 * limitations under the License.
 */
 <template>
-  <div class="container">
-    <div class="title-box">
-      <span class="name">{{$t('zkDirectory')}}</span>
-    </div>
-
+  <div>
     <div class="table-box" v-if="zkDirectories.length > 0">
-      <el-table :data="zkDirectories" size="mini" style="width: 100%">
+      <el-table :data="zkDirectories" size="mini" style="width: 100%;">
         <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="zkDirectory" :label="$t('zkDirectory')"></el-table-column>
       </el-table>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
index 8c22adce8f..91bae2b41f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
@@ -94,6 +94,7 @@
     methods: {
       ...mapActions('monitor', ['getWorkerData']),
       _showZkDirectories (item) {
+        this.zkDirectories = []
         item.zkDirectories.forEach(zkDirectory => {
           this.zkDirectories.push({
             zkDirectory: zkDirectory
@@ -104,7 +105,6 @@
     },
     watch: {},
     created () {
-
     },
     mounted () {
       this.isLoading = true
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 526abfb16e..8d19505482 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class="clearfix list">
-      <el-button type="info"  style="margin-left:20px" size="small" round :loading="spinnerLoading" @click="preview()">{{$t('Execute time')}}</el-button>
+      <el-button type="primary"  style="margin-left:20px" size="small" round :loading="spinnerLoading" @click="preview()">{{$t('Execute time')}}</el-button>
       <div class="text">
         {{$t('Timing')}}
       </div>
@@ -115,15 +115,16 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('Notification group')}}
+        {{$t('Alarm group')}}
       </div>
       <div class="cont">
         <el-select
           style="width: 200px;"
+          clearable
           size="small"
           :disabled="!notifyGroupList.length"
           v-model="warningGroupId">
-          <el-input slot="trigger" readonly slot-scope="{ selectedModel }" :placeholder="$t('Please select a notification group')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
+          <el-input slot="trigger" readonly slot-scope="{ selectedModel }" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
             <em slot="suffix" class="el-icon-error" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId.id"></em>
             <em slot="suffix" class="el-icon-bottom" style="font-size: 12px;" v-show="!warningGroupId.id"></em>
           </el-input>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
index 0540a32851..d38434510f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
@@ -18,7 +18,9 @@
   <m-list-construction :title="$t('Cron Manage')">
     <template slot="operation">
       <span style=" float: right; padding-right:50px">
-        <em class="el-icon-circle-close" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
+        <el-tooltip :content="$t('Return')" placement="top">
+          <el-button type="primary" icon="el-icon-back" size="mini" @click="_close()"></el-button>
+        </el-tooltip>
       </span>
     </template>
     <template slot="content">

From 3a3abddd9c5cc2bae79272fc642054bde8459e66 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Mon, 1 Feb 2021 13:51:19 +0800
Subject: [PATCH 44/87] remove abandoned fields.

---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 3 ---
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 9038e21fa7..cffac67e1e 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -133,7 +133,6 @@ export default {
   'Please enter a SQL Statement(required)': 'Please enter a SQL Statement(required)',
   'Please enter a JSON Statement(required)': 'Please enter a JSON Statement(required)',
   'One form or attachment must be selected': 'One form or attachment must be selected',
-  'Recipient required': 'Recipient required',
   'Mail subject required': 'Mail subject required',
   'Child Node': 'Child Node',
   'Please select a sub-Process': 'Please select a sub-Process',
@@ -398,8 +397,6 @@ export default {
   'Notification strategy': 'Notification strategy',
   'Notification group': 'Notification group',
   'Please select a notification group': 'Please select a notification group',
-  Recipient: 'Recipient',
-  Cc: 'Cc',
   receivers: 'receivers',
   receiverCcs: 'receiverCcs',
   'Whether it is a complement process?': 'Whether it is a complement process?',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 61174ae867..84d1553140 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -133,7 +133,6 @@ export default {
   'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
   'Please enter a JSON Statement(required)': '请输入json语句(必填)',
   'One form or attachment must be selected': '表格、附件必须勾选一个',
-  'Recipient required': '收件人邮箱必填',
   'Mail subject required': '邮件主题必填',
   'Child Node': '子节点',
   'Please select a sub-Process': '请选择子工作流',
@@ -398,8 +397,6 @@ export default {
   'Notification strategy': '通知策略',
   'Notification group': '通知组',
   'Please select a notification group': '请选择通知组',
-  Recipient: '收件人',
-  Cc: '抄送人',
   receivers: '收件人',
   receiverCcs: '抄送人',
   'Whether it is a complement process?': '是否补数',

From 3c461fb785a9583ff948f3f8b237417234a3a204 Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Mon, 1 Feb 2021 17:20:22 +0800
Subject: [PATCH 45/87] [Improvement][UI] Support more file types in file
 detail page

---
 .../pages/resource/pages/file/pages/_source/common.js  |  2 +-
 .../pages/resource/pages/file/pages/details/index.vue  | 10 +++++-----
 .../pages/resource/pages/file/pages/edit/index.vue     | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
index 595217397e..8ddb75fed3 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
@@ -18,6 +18,6 @@
 /**
  * Create file type
  */
-const filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties']
+const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js', 'css', 'html']
 
 export { filtTypeArr }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
index e3df62b8cf..c91b555548 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
@@ -28,7 +28,7 @@
             &nbsp;&nbsp;
           </div>
         </h2>
-        <template v-if="isNoType">
+        <template v-if="isViewType">
 
           <div class="code-mirror-model" v-if="!msg">
             <textarea id="code-details-mirror" name="code-details-mirror"></textarea>
@@ -37,7 +37,7 @@
           <m-no-data :msg="msg" v-if="msg"></m-no-data>
 
         </template>
-        <template v-if="!isNoType">
+        <template v-if="!isViewType">
           <m-no-type></m-no-type>
         </template>
       </div>
@@ -67,7 +67,7 @@
     data () {
       return {
         name: '',
-        isNoType: true,
+        isViewType: true,
         isLoading: false,
         filtTypeArr: filtTypeArr,
         loadingIndex: 0,
@@ -197,10 +197,10 @@
       let a = fileName.substring(i, fileName.length)
       this.mode = handlerSuffix[a]
       this.size = bytesToSize(parseInt(fileSize))
-      this.isNoType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
+      this.isViewType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
     },
     mounted () {
-      if (this.isNoType) {
+      if (this.isViewType) {
         // get data
         this._getViewResources()
       }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
index 428d7aaf85..e4c7586419 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
@@ -21,7 +21,7 @@
         <h2>
           <span>{{name}}</span>
         </h2>
-        <template v-show="isNoType">
+        <template v-show="isViewType">
           <template v-if="!msg">
             <div class="code-mirror-model">
               <textarea id="code-edit-mirror" name="code-edit-mirror"></textarea>
@@ -34,7 +34,7 @@
           <m-no-data :msg="msg" v-if="msg"></m-no-data>
 
         </template>
-        <template v-if="!isNoType">
+        <template v-if="!isViewType">
           <m-no-type></m-no-type>
         </template>
       </div>
@@ -64,7 +64,7 @@
     data () {
       return {
         name: '',
-        isNoType: true,
+        isViewType: true,
         isLoading: false,
         filtTypeArr: filtTypeArr,
         loadingIndex: 0,
@@ -165,10 +165,10 @@
       let a = fileName.substring(i, fileName.length)
       this.mode = handlerSuffix[a]
       this.size = bytesToSize(parseInt(fileSize))
-      this.isNoType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
+      this.isViewType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
     },
     mounted () {
-      if (this.isNoType) {
+      if (this.isViewType) {
         // get data
         this._getViewResources()
       }

From 3d3796ed06155a860ada6b6e23c7ff4f1260c9b2 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 17:31:48 +0800
Subject: [PATCH 46/87] fix

---
 .../tasks/_source/dependItemList.vue          | 30 +++++++++----------
 .../dag/_source/formModel/tasks/dependent.vue |  1 -
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index abadc2c36b..1ff180f1fe 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -16,26 +16,21 @@
  */
 <template>
   <div class="dep-list-model">
-    <div v-for="(el,$index) in dependItemList" :key='$index' class="list" @click="itemIndex = $index">
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.projectId" @change="_onChangeProjectId" size="small">
-        <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+    <div v-for="(el,$index) in dependItemList" :key='$index' @click="itemIndex = $index">
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.projectId" @change="_onChangeProjectId" size="small">
+        <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
-        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
+        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.depTasks" size="small">
-        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.depTasks" size="small">
+        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item"></el-option>
       </el-select>
-      <el-select style="width: 150px;" v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle">
-        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle" size="small">
+        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select style="width: 116px;" v-model="el.dateValue" :disabled="isDetails">
-        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.dateValue" :disabled="isDetails" size="small">
+        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
       <template v-if="isInstance">
         <span class="instance-state">
@@ -55,6 +50,7 @@
     </div>
   </div>
 </template>
+
 <script>
   import _ from 'lodash'
   import { cycleList, dateValueList } from './commcon'
@@ -109,6 +105,7 @@
        * remove task
        */
       _remove (i) {
+        this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this._removeTip()
         if (!this.dependItemList.length || this.dependItemList.length === 0) {
           this.$emit('on-delete-all', {
@@ -294,6 +291,7 @@
     .list {
       margin-bottom: 6px;
       .operation {
+        width: 80px;
         padding-left: 4px;
         a {
           i {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 978142891e..220ec99f46 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -97,7 +97,6 @@
         $('body').find('.tooltip.fade.top.in').remove()
       },
       _onDeleteAll (i) {
-        this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this.dependTaskList.map((item, i) => {
           if (item.dependItemList.length === 0) {
             this.dependTaskList.splice(i, 1)

From a150d7a76f02296d92786c3caf7b54a60d0cbc34 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 17:42:22 +0800
Subject: [PATCH 47/87] fix

---
 .../dag/_source/formModel/tasks/_source/dependItemList.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index 1ff180f1fe..fd8a2b8955 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -105,7 +105,7 @@
        * remove task
        */
       _remove (i) {
-        this.dependTaskList[this.index].dependItemList.splice(i, 1)
+        // this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this._removeTip()
         if (!this.dependItemList.length || this.dependItemList.length === 0) {
           this.$emit('on-delete-all', {

From 1a3fcc2e0a99c6e6d6a46ae6c8dfa1a16817a308 Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Mon, 1 Feb 2021 19:29:12 +0800
Subject: [PATCH 48/87] [Fix-4648][UI] Fix TypeError: Cannot read property 'id'
 of undefined in createUser

---
 .../pages/users/_source/createUser.vue        | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 1ff5550f9b..882a54c230 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -239,7 +239,9 @@
               }
             })
             this.$nextTick(() => {
-              this.tenantId = this.tenantList[0].id
+              if (this.tenantList.length) {
+                this.tenantId = this.tenantList[0].id
+              }
             })
             resolve()
           })
@@ -291,9 +293,14 @@
             this.email = this.item.email
             this.phone = this.item.phone
             this.userState = this.item.state + '' || '1'
-            this.tenantId = this.item.tenantId
+            if (this.item.tenantName) {
+              this.tenantId = this.item.tenantId
+            }
             this.$nextTick(() => {
-              this.queueName = _.find(this.queueList, ['code', this.item.queue]).id || ''
+              let queue = _.find(this.queueList, ['code', this.item.queue])
+              if (queue) {
+                this.queueName = queue.id || ''
+              }
             })
           }
         })
@@ -304,9 +311,14 @@
           this.email = this.item.email
           this.phone = this.item.phone
           this.userState = this.state + '' || '1'
-          this.tenantId = this.item.tenantId
+          if (this.item.tenantName) {
+            this.tenantId = this.item.tenantId
+          }
           if (this.queueList.length > 0) {
-            this.queueName = _.find(this.queueList, ['code', this.item.queue]).id
+            let queue = _.find(this.queueList, ['code', this.item.queue])
+            if (queue) {
+              this.queueName = queue.id || ''
+            }
           } else {
             this.queueName = ''
           }

From 6a49d8163e333b27ce941cabdd3957aeb1779e14 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Mon, 1 Feb 2021 22:53:50 +0800
Subject: [PATCH 49/87] [Fix-4566][worker] worker-server logback partial logs
 are not printed (#4567)

* fix worker-server partial logs are not printed.

* comment all ThresholdFilter configurations.
---
 .../src/main/resources/logback-master.xml                | 4 ++--
 .../src/main/resources/logback-worker.xml                | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-server/src/main/resources/logback-master.xml b/dolphinscheduler-server/src/main/resources/logback-master.xml
index 2b986ddad2..a61d891b10 100644
--- a/dolphinscheduler-server/src/main/resources/logback-master.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-master.xml
@@ -32,9 +32,9 @@
     <conversionRule conversionWord="messsage"
                     converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
     <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
+        </filter> -->
         <filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
         <Discriminator class="org.apache.dolphinscheduler.server.log.TaskLogDiscriminator">
             <key>taskAppId</key>
diff --git a/dolphinscheduler-server/src/main/resources/logback-worker.xml b/dolphinscheduler-server/src/main/resources/logback-worker.xml
index a09202fb7e..31719d5b53 100644
--- a/dolphinscheduler-server/src/main/resources/logback-worker.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-worker.xml
@@ -33,9 +33,9 @@
     <conversionRule conversionWord="messsage"
                     converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
     <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
+        </filter> -->
         <filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
         <Discriminator class="org.apache.dolphinscheduler.server.log.TaskLogDiscriminator">
             <key>taskAppId</key>
@@ -56,10 +56,9 @@
     </appender>
     <appender name="WORKERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-worker.log</file>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
-        <filter class="org.apache.dolphinscheduler.server.log.WorkerLogFilter"/>
+        </filter> -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
             <maxHistory>168</maxHistory>

From 1c4343ae296bea6fe23739a7612acaad04ac6304 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Tue, 2 Feb 2021 13:10:52 +0800
Subject: [PATCH 50/87] fix ui local param plugin do not display input.

---
 .../_source/formModel/tasks/_source/localParams.vue  | 12 ++++--------
 .../pages/definition/pages/list/_source/start.vue    |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
index c8a600b699..c001a20176 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
@@ -59,7 +59,7 @@
         </el-select>
       </template>
       <el-input
-              :disabled="isDetails && !isStartProcess"
+              :disabled="isDetails"
               type="text"
               size="small"
               v-model="localParamsList[$index].value"
@@ -68,18 +68,18 @@
               @blur="_handleValue()"
               :style="inputStyle">
       </el-input>
-      <span class="lt-add" v-show="!isStartProcess">
+      <span class="lt-add">
         <a href="javascript:" style="color:red;" @click="!isDetails && _removeUdp($index)" >
           <em class="el-icon-delete" :class="_isDetails" data-toggle="tooltip" :title="$t('delete')" ></em>
         </a>
       </span>
-      <span class="add" v-if="$index === (localParamsList.length - 1)" v-show="!isStartProcess">
+      <span class="add" v-if="$index === (localParamsList.length - 1)">
         <a href="javascript:" @click="!isDetails && _addUdp()" >
           <em class="el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
         </a>
       </span>
     </div>
-    <span class="add-dp" v-if="!localParamsList.length" v-show="isStartProcess">
+    <span class="add-dp" v-if="!localParamsList.length">
       <a href="javascript:" @click="!isDetails && _addUdp()" >
         <em class="iconfont el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
       </a>
@@ -112,10 +112,6 @@
       hide: {
         type: Boolean,
         default: true
-      },
-      isStartProcess: {
-        type: Boolean,
-        default: false
       }
     },
     methods: {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index e9f615d340..d6aeaf9cd9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -120,8 +120,7 @@
                   ref="refLocalParams"
                   @on-local-params="_onLocalParams"
                   :udp-list="udpList"
-                  :hide="false"
-                  :isStartProcess="true">
+                  :hide="false">
           </m-local-params>
         </div>
       </div>

From 14d49bc584685a33e2952573a0cb6e88377ab9f9 Mon Sep 17 00:00:00 2001
From: zt-1997 <41983395+zt-1997@users.noreply.github.com>
Date: Tue, 2 Feb 2021 16:07:37 +0800
Subject: [PATCH 51/87] [FIX-2101]It solves the problem that the name of the
 branch will not change after the name of the branch is changed in the
 workflow page and instance page. (#4555)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: zt-1997 <“18841012545@163.com”>
---
 .../api/service/ProcessInstanceService.java   |  10 +-
 .../impl/ProcessDefinitionServiceImpl.java    |   4 +-
 .../task/conditions/ConditionsParameters.java |  10 +-
 .../service/process/ProcessService.java       |  58 ++++++++++
 .../service/process/ProcessServiceTest.java   | 107 ++++++++++++++++++
 5 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
index 1d6169b06e..b41ff71f5d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
@@ -428,10 +428,9 @@ public class ProcessInstanceService extends BaseService {
             return result;
         }
         Date schedule = null;
+        schedule = processInstance.getScheduleTime();
         if (scheduleTime != null) {
             schedule = DateUtils.getScheduleDate(scheduleTime);
-        } else {
-            schedule = processInstance.getScheduleTime();
         }
         processInstance.setScheduleTime(schedule);
         processInstance.setLocations(locations);
@@ -460,13 +459,18 @@ public class ProcessInstanceService extends BaseService {
             if (tenant != null) {
                 processInstance.setTenantCode(tenant.getTenantCode());
             }
+            // get the processinstancejson before saving,and then save the name and taskid
+            String oldJson = processInstance.getProcessInstanceJson();
+            if (StringUtils.isNotEmpty(oldJson)) {
+                processInstanceJson = processService.changeJson(processData,oldJson);
+            }
             processInstance.setProcessInstanceJson(processInstanceJson);
             processInstance.setGlobalParams(globalParams);
         }
 
         int update = processService.updateProcessInstance(processInstance);
         int updateDefine = 1;
-        if (Boolean.TRUE.equals(syncDefine) && StringUtils.isNotEmpty(processInstanceJson)) {
+        if (Boolean.TRUE.equals(syncDefine)) {
             processDefinition.setProcessDefinitionJson(processInstanceJson);
             processDefinition.setGlobalParams(originDefParams);
             processDefinition.setLocations(locations);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 9810674863..123e2a3a91 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -433,7 +433,9 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
                 return result;
             }
         }
-
+        // get the processdefinitionjson before saving,and then save the name and taskid
+        String oldJson = processDefine.getProcessDefinitionJson();
+        processDefinitionJson = processService.changeJson(processData,oldJson);
         Date now = new Date();
 
         processDefine.setId(id);
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/conditions/ConditionsParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/conditions/ConditionsParameters.java
index 094620aee5..b136ae295d 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/conditions/ConditionsParameters.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/conditions/ConditionsParameters.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.common.task.conditions;
 
 import org.apache.dolphinscheduler.common.enums.DependentRelation;
@@ -36,7 +37,6 @@ public class ConditionsParameters extends AbstractParameters {
     // node list to run when failed
     private List<String> failedNode;
 
-
     @Override
     public boolean checkParameters() {
         return true;
@@ -78,4 +78,12 @@ public class ConditionsParameters extends AbstractParameters {
     public void setFailedNode(List<String> failedNode) {
         this.failedNode = failedNode;
     }
+
+    public String getConditionResult() {
+        return "{"
+            + "\"successNode\": [\"" + successNode.get(0)
+            + "\"],\"failedNode\": [\"" + failedNode.get(0)
+            + "\"]}";
+    }
+
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 7c305097ff..b9065eca3e 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -37,10 +37,12 @@ import org.apache.dolphinscheduler.common.enums.FailureStrategy;
 import org.apache.dolphinscheduler.common.enums.Flag;
 import org.apache.dolphinscheduler.common.enums.ResourceType;
 import org.apache.dolphinscheduler.common.enums.TaskDependType;
+import org.apache.dolphinscheduler.common.enums.TaskType;
 import org.apache.dolphinscheduler.common.enums.WarningType;
 import org.apache.dolphinscheduler.common.model.DateInterval;
 import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.process.Property;
+import org.apache.dolphinscheduler.common.task.conditions.ConditionsParameters;
 import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
@@ -1997,4 +1999,60 @@ public class ProcessService {
                 taskInstance.getId());
     }
 
+    /**
+     * solve the branch rename bug
+     *
+     * @param processData
+     * @param oldJson
+     * @return String
+     */
+    public String changeJson(ProcessData processData, String oldJson) {
+        ProcessData oldProcessData = JSONUtils.parseObject(oldJson, ProcessData.class);
+        HashMap<String, String> oldNameTaskId = new HashMap<>();
+        List<TaskNode> oldTasks = oldProcessData.getTasks();
+        for (int i = 0; i < oldTasks.size(); i++) {
+            TaskNode taskNode = oldTasks.get(i);
+            String oldName = taskNode.getName();
+            String oldId = taskNode.getId();
+            oldNameTaskId.put(oldName, oldId);
+        }
+
+        // take the processdefinitionjson saved this time, and then save the taskid and name
+        HashMap<String, String> newNameTaskId = new HashMap<>();
+        List<TaskNode> newTasks = processData.getTasks();
+        for (int i = 0; i < newTasks.size(); i++) {
+            TaskNode taskNode = newTasks.get(i);
+            String newId = taskNode.getId();
+            String newName = taskNode.getName();
+            newNameTaskId.put(newId, newName);
+        }
+
+        // replace the previous conditionresult with a new one
+        List<TaskNode> tasks = processData.getTasks();
+        for (int i = 0; i < tasks.size(); i++) {
+            TaskNode taskNode = newTasks.get(i);
+            String type = taskNode.getType();
+            if (TaskType.CONDITIONS.getDescp().equalsIgnoreCase(type)) {
+                ConditionsParameters conditionsParameters = JSONUtils.parseObject(taskNode.getConditionResult(), ConditionsParameters.class);
+                String oldSuccessNodeName = conditionsParameters.getSuccessNode().get(0);
+                String oldFailedNodeName = conditionsParameters.getFailedNode().get(0);
+                String newSuccessNodeName = newNameTaskId.get(oldNameTaskId.get(oldSuccessNodeName));
+                String newFailedNodeName = newNameTaskId.get(oldNameTaskId.get(oldFailedNodeName));
+                if (newSuccessNodeName != null) {
+                    ArrayList<String> successNode = new ArrayList<>();
+                    successNode.add(newSuccessNodeName);
+                    conditionsParameters.setSuccessNode(successNode);
+                }
+                if (newFailedNodeName != null) {
+                    ArrayList<String> failedNode = new ArrayList<>();
+                    failedNode.add(newFailedNodeName);
+                    conditionsParameters.setFailedNode(failedNode);
+                }
+                String conditionResultStr = conditionsParameters.getConditionResult();
+                taskNode.setConditionResult(conditionResultStr);
+                tasks.set(i, taskNode);
+            }
+        }
+        return JSONUtils.toJsonString(processData);
+    }
 }
diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
index db83e71725..551c9bb09c 100644
--- a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
+++ b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
@@ -25,9 +25,12 @@ import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.CommandType;
 import org.apache.dolphinscheduler.common.enums.Flag;
 import org.apache.dolphinscheduler.common.enums.WarningType;
+import org.apache.dolphinscheduler.common.model.TaskNode;
+import org.apache.dolphinscheduler.common.task.conditions.ConditionsParameters;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.entity.ProcessData;
 import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
@@ -335,4 +338,108 @@ public class ProcessServiceTest {
         processService.recurseFindSubProcessId(parentId, ids);
 
     }
+
+    @Test
+    public void testChangeJson() {
+
+        ProcessData oldProcessData = new ProcessData();
+        ConditionsParameters conditionsParameters = new ConditionsParameters();
+        ArrayList<TaskNode> tasks = new ArrayList<>();
+        TaskNode taskNode = new TaskNode();
+        TaskNode taskNode11 = new TaskNode();
+        TaskNode taskNode111 = new TaskNode();
+        ArrayList<String> successNode = new ArrayList<>();
+        ArrayList<String> faildNode = new ArrayList<>();
+
+        taskNode.setName("bbb");
+        taskNode.setType("SHELL");
+        taskNode.setId("222");
+
+        taskNode11.setName("vvv");
+        taskNode11.setType("CONDITIONS");
+        taskNode11.setId("444");
+        successNode.add("bbb");
+        faildNode.add("ccc");
+
+        taskNode111.setName("ccc");
+        taskNode111.setType("SHELL");
+        taskNode111.setId("333");
+
+        conditionsParameters.setSuccessNode(successNode);
+        conditionsParameters.setFailedNode(faildNode);
+        taskNode11.setConditionResult(conditionsParameters.getConditionResult());
+        tasks.add(taskNode);
+        tasks.add(taskNode11);
+        tasks.add(taskNode111);
+        oldProcessData.setTasks(tasks);
+
+        ProcessData newProcessData = new ProcessData();
+        ConditionsParameters conditionsParameters2 = new ConditionsParameters();
+        TaskNode taskNode2 = new TaskNode();
+        TaskNode taskNode22 = new TaskNode();
+        TaskNode taskNode222 = new TaskNode();
+        ArrayList<TaskNode> tasks2 = new ArrayList<>();
+        ArrayList<String> successNode2 = new ArrayList<>();
+        ArrayList<String> faildNode2 = new ArrayList<>();
+
+        taskNode2.setName("bbbchange");
+        taskNode2.setType("SHELL");
+        taskNode2.setId("222");
+
+        taskNode22.setName("vv");
+        taskNode22.setType("CONDITIONS");
+        taskNode22.setId("444");
+        successNode2.add("bbb");
+        faildNode2.add("ccc");
+
+        taskNode222.setName("ccc");
+        taskNode222.setType("SHELL");
+        taskNode222.setId("333");
+
+        conditionsParameters2.setSuccessNode(successNode2);
+        conditionsParameters2.setFailedNode(faildNode2);
+        taskNode22.setConditionResult(conditionsParameters2.getConditionResult());
+        tasks2.add(taskNode2);
+        tasks2.add(taskNode22);
+        tasks2.add(taskNode222);
+
+        newProcessData.setTasks(tasks2);
+
+        ProcessData exceptProcessData = new ProcessData();
+        ConditionsParameters conditionsParameters3 = new ConditionsParameters();
+        TaskNode taskNode3 = new TaskNode();
+        TaskNode taskNode33 = new TaskNode();
+        TaskNode taskNode333 = new TaskNode();
+        ArrayList<TaskNode> tasks3 = new ArrayList<>();
+        ArrayList<String> successNode3 = new ArrayList<>();
+        ArrayList<String> faildNode3 = new ArrayList<>();
+
+        taskNode3.setName("bbbchange");
+        taskNode3.setType("SHELL");
+        taskNode3.setId("222");
+
+        taskNode33.setName("vv");
+        taskNode33.setType("CONDITIONS");
+        taskNode33.setId("444");
+        successNode3.add("bbbchange");
+        faildNode3.add("ccc");
+
+        taskNode333.setName("ccc");
+        taskNode333.setType("SHELL");
+        taskNode333.setId("333");
+
+        conditionsParameters3.setSuccessNode(successNode3);
+        conditionsParameters3.setFailedNode(faildNode3);
+        taskNode33.setConditionResult(conditionsParameters3.getConditionResult());
+        tasks3.add(taskNode3);
+        tasks3.add(taskNode33);
+        tasks3.add(taskNode333);
+        exceptProcessData.setTasks(tasks3);
+
+        String expect = JSONUtils.toJsonString(exceptProcessData);
+        String oldJson = JSONUtils.toJsonString(oldProcessData);
+
+        Assert.assertEquals(expect, processService.changeJson(newProcessData,oldJson));
+
+    }
 }

From 6df87b89d7b0ec013c5a2bfdfb92fa3ff1496c40 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Wed, 3 Feb 2021 14:20:16 +0800
Subject: [PATCH 52/87] [Fix-4641][Alert] Sending the email to the following
 server failed :null:null (#4642)

* fix alert-server email send error.

* update mail util test class.
---
 .../alert/email/MailParamsConstants.java      | 20 +++++++++----------
 .../plugin/alert/email/MailUtilsTest.java     |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
index 0bbbe103f0..9b49b4705b 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
@@ -33,33 +33,33 @@ public class MailParamsConstants {
     public static final String NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS = "receiverCcs";
 
     public static final String MAIL_PROTOCOL = "transport.protocol";
-    public static final String NAME_MAIL_PROTOCOL = "protocol";
+    public static final String NAME_MAIL_PROTOCOL = "mail.protocol";
 
-    public static final String MAIL_SMTP_HOST = "smtp.host";
+    public static final String MAIL_SMTP_HOST = "mail.smtp.host";
     public static final String NAME_MAIL_SMTP_HOST = "serverHost";
 
-    public static final String MAIL_SMTP_PORT = "smtp.port";
+    public static final String MAIL_SMTP_PORT = "mail.smtp.port";
     public static final String NAME_MAIL_SMTP_PORT = "serverPort";
 
-    public static final String MAIL_SENDER = "sender";
+    public static final String MAIL_SENDER = "mail.sender";
     public static final String NAME_MAIL_SENDER = "sender";
 
-    public static final String MAIL_SMTP_AUTH = "smtp.auth";
+    public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
     public static final String NAME_MAIL_SMTP_AUTH = "enableSmtpAuth";
 
-    public static final String MAIL_USER = "user";
+    public static final String MAIL_USER = "mail.user";
     public static final String NAME_MAIL_USER = "user";
 
-    public static final String MAIL_PASSWD = "passwd";
+    public static final String MAIL_PASSWD = "mail.passwd";
     public static final String NAME_MAIL_PASSWD = "passwd";
 
-    public static final String MAIL_SMTP_STARTTLS_ENABLE = "smtp.starttls.enable";
+    public static final String MAIL_SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
     public static final String NAME_MAIL_SMTP_STARTTLS_ENABLE = "starttlsEnable";
 
-    public static final String MAIL_SMTP_SSL_ENABLE = "smtp.ssl.enable";
+    public static final String MAIL_SMTP_SSL_ENABLE = "mail.smtp.ssl.enable";
     public static final String NAME_MAIL_SMTP_SSL_ENABLE = "sslEnable";
 
-    public static final String MAIL_SMTP_SSL_TRUST = "smtp.ssl.trust";
+    public static final String MAIL_SMTP_SSL_TRUST = "mail.smtp.ssl.trust";
     public static final String NAME_MAIL_SMTP_SSL_TRUST = "smtpSslTrust";
 
 }
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
index e19c819dae..5b0b084d72 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/test/java/org/apache/dolphinscheduler/plugin/alert/email/MailUtilsTest.java
@@ -53,6 +53,7 @@ public class MailUtilsTest {
         emailConfig.put(MailParamsConstants.NAME_MAIL_SENDER, "xxx1.xxx.com");
         emailConfig.put(MailParamsConstants.NAME_MAIL_USER, "xxx2.xxx.com");
         emailConfig.put(MailParamsConstants.NAME_MAIL_PASSWD, "111111");
+        emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_AUTH, "true");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE, "true");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE, "false");
         emailConfig.put(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST, "false");

From c3f6f962ca0aacef410a74760b6e40f23fecca7d Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:07:51 +0800
Subject: [PATCH 53/87] [Improvement-4568][API] When the workflow definition
 name validation API fails, the system prompts that the workflow definition
 name already exists (#4569)

* fix dev definition api error prompt.

* imp api definition name verify message prompt.
---
 .../java/org/apache/dolphinscheduler/api/enums/Status.java    | 3 ++-
 .../api/service/impl/ProcessDefinitionServiceImpl.java        | 4 ++--
 .../api/controller/ProcessDefinitionControllerTest.java       | 4 ++--
 .../api/service/ProcessDefinitionServiceTest.java             | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index 6605154e42..895a3ded59 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -133,7 +133,7 @@ public enum Status {
     QUERY_TASK_INSTANCE_LOG_ERROR(10103, "view task instance log error", "查询任务实例日志错误"),
     DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR(10104, "download task instance log file error", "下载任务日志文件错误"),
     CREATE_PROCESS_DEFINITION(10105, "create process definition", "创建工作流错误"),
-    VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106, "verify process definition name unique error", "工作流定义名称已存在"),
+    VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106, "verify process definition name unique error", "工作流定义名称验证错误"),
     UPDATE_PROCESS_DEFINITION_ERROR(10107, "update process definition error", "更新工作流定义错误"),
     RELEASE_PROCESS_DEFINITION_ERROR(10108, "release process definition error", "上线工作流错误"),
     QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR(10109, "query datail of process definition error", "查询工作流详细信息错误"),
@@ -199,6 +199,7 @@ public enum Status {
     FORCE_TASK_SUCCESS_ERROR(10165, "force task success error", "强制成功任务实例错误"),
     TASK_INSTANCE_STATE_OPERATION_ERROR(10166, "the status of task instance {0} is {1},Cannot perform force success operation", "任务实例[{0}]的状态是[{1}]，无法执行强制成功操作"),
     DATASOURCE_TYPE_NOT_EXIST(10167, "data source type not exist", "数据源类型不存在"),
+    PROCESS_DEFINITION_NAME_EXIST(10168, "process definition name {0} already exists", "工作流定义名称[{0}]已存在"),
 
     UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found", "UDF函数不存在"),
     UDF_FUNCTION_EXISTS(20002, "UDF function already exists", "UDF函数已存在"),
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 123e2a3a91..af91ed2674 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -429,7 +429,7 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
             // check whether the new process define name exist
             ProcessDefinition definition = processDefineMapper.verifyByDefineName(project.getId(), name);
             if (definition != null) {
-                putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR, name);
+                putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name);
                 return result;
             }
         }
@@ -497,7 +497,7 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
         if (processDefinition == null) {
             putMsg(result, Status.SUCCESS);
         } else {
-            putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR, name);
+            putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name);
         }
         return result;
     }
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
index 9719448ad8..e44fad8151 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
@@ -117,14 +117,14 @@ public class ProcessDefinitionControllerTest {
     public void testVerifyProcessDefinitionName() throws Exception {
 
         Map<String, Object> result = new HashMap<>();
-        putMsg(result, Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR);
+        putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST);
         String projectName = "test";
         String name = "dag_test";
 
         Mockito.when(processDefinitionService.verifyProcessDefinitionName(user, projectName, name)).thenReturn(result);
 
         Result response = processDefinitionController.verifyProcessDefinitionName(user, projectName, name);
-        Assert.assertEquals(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getCode(), response.getCode().intValue());
+        Assert.assertEquals(Status.PROCESS_DEFINITION_NAME_EXIST.getCode(), response.getCode().intValue());
 
     }
 
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 4db533838c..7ebb40ecb0 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -657,7 +657,7 @@ public class ProcessDefinitionServiceTest {
         Mockito.when(processDefineMapper.verifyByDefineName(project.getId(), "test_pdf")).thenReturn(getProcessDefinition());
         Map<String, Object> processExistRes = processDefinitionService.verifyProcessDefinitionName(loginUser,
                 "project_test1", "test_pdf");
-        Assert.assertEquals(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR, processExistRes.get(Constants.STATUS));
+        Assert.assertEquals(Status.PROCESS_DEFINITION_NAME_EXIST, processExistRes.get(Constants.STATUS));
     }
 
     @Test

From 424497ecbab6fc07e3919fe7f2543679de3c54c7 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Wed, 3 Feb 2021 22:09:31 +0800
Subject: [PATCH 54/87] [Improvement][Api] Use WebUtils.getCookie instead of
 BaseService.getCookie (#4559)

---
 .../interceptor/LocaleChangeInterceptor.java  |  4 ++--
 .../api/service/BaseService.java              | 21 -------------------
 .../api/service/impl/SessionServiceImpl.java  |  3 ++-
 .../api/service/BaseServiceTest.java          | 14 -------------
 4 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
index 3fe236e065..2ed4e6f24b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LocaleChangeInterceptor.java
@@ -17,7 +17,6 @@
 
 package org.apache.dolphinscheduler.api.interceptor;
 
-import org.apache.dolphinscheduler.api.service.BaseService;
 import org.apache.dolphinscheduler.common.Constants;
 
 import java.util.Locale;
@@ -30,12 +29,13 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.util.WebUtils;
 
 public class LocaleChangeInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        Cookie cookie = BaseService.getCookie(request, Constants.LOCALE_LANGUAGE);
+        Cookie cookie = WebUtils.getCookie(request, Constants.LOCALE_LANGUAGE);
         if (cookie != null) {
             // Proceed in cookie
             return true;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
index c61cd1eeb5..55826bf3d2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
@@ -113,27 +113,6 @@ public class BaseService {
         return false;
     }
 
-
-    /**
-     * get cookie info by name
-     *
-     * @param request request
-     * @param name 'sessionId'
-     * @return get cookie info
-     */
-    public static Cookie getCookie(HttpServletRequest request, String name) {
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null && cookies.length > 0) {
-            for (Cookie cookie : cookies) {
-                if (StringUtils.isNotEmpty(name) && name.equalsIgnoreCase(cookie.getName())) {
-                    return cookie;
-                }
-            }
-        }
-
-        return null;
-    }
-
     /**
      * create tenant dir if not exists
      *
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
index 8aaefdadff..917ebdf3a8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.WebUtils;
 
 /**
  * session service implement
@@ -60,7 +61,7 @@ public class SessionServiceImpl extends BaseService implements SessionService {
         String sessionId = request.getHeader(Constants.SESSION_ID);
 
         if (StringUtils.isBlank(sessionId)) {
-            Cookie cookie = getCookie(request, Constants.SESSION_ID);
+            Cookie cookie = WebUtils.getCookie(request, Constants.SESSION_ID);
 
             if (cookie != null) {
                 sessionId = cookie.getValue();
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
index 95083dd51b..968dd470f6 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
@@ -94,20 +94,6 @@ public class BaseServiceTest {
         baseService.putMsg(result,Status.PROJECT_NOT_FOUNT,"test");
     }
     @Test
-    public void testGetCookie(){
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockCookie mockCookie = new MockCookie("userId","1");
-        request.setCookies(mockCookie);
-        //cookie is not null
-        Cookie cookie = BaseService.getCookie(request,"userId");
-        Assert.assertNotNull(cookie);
-        //cookie is null
-        cookie = BaseService.getCookie(request,"userName");
-        Assert.assertNull(cookie);
-
-    }
-    @Test
     public void testCreateTenantDirIfNotExists(){
 
         PowerMockito.mockStatic(HadoopUtils.class);

From 66b8288d1f4ef301a20c5c8fcffb241605251816 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Wed, 3 Feb 2021 22:12:14 +0800
Subject: [PATCH 55/87] [Improvement][Dao] Remove duplicated mysql
 configurations (#4558)

---
 .../src/main/resources/datasource.properties               | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/datasource.properties b/dolphinscheduler-dao/src/main/resources/datasource.properties
index fa07c6a6d3..535b7493ce 100644
--- a/dolphinscheduler-dao/src/main/resources/datasource.properties
+++ b/dolphinscheduler-dao/src/main/resources/datasource.properties
@@ -14,12 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-        
-# mysql
-#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://localhost:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
-#spring.datasource.username=root
-#spring.datasource.password=123456
 
 # postgresql
 spring.datasource.driver-class-name=org.postgresql.Driver
@@ -33,7 +27,6 @@ spring.datasource.password=test
 #spring.datasource.username=xxxx
 #spring.datasource.password=xxxx
 
-
 # connection configuration
 #spring.datasource.initialSize=5
 # min connection number

From 6e713a3832fcf7d3180c20dffd19c9646f170b23 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Thu, 4 Feb 2021 23:16:51 +0800
Subject: [PATCH 56/87] fix sed command execution abnormal in the install file.
 (#4685)

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 7991275a01..723ee908e8 100755
--- a/install.sh
+++ b/install.sh
@@ -53,7 +53,7 @@ sed -i ${txt} "s#java.security.krb5.conf.path.*#java.security.krb5.conf.path=${k
 sed -i ${txt} "s#login.user.keytab.username.*#login.user.keytab.username=${keytabUserName}#g" conf/common.properties
 sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g" conf/common.properties
 sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/zookeeper.properties
-sed -i ${txt} "s\#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/zookeeper.properties
+sed -i ${txt} "s#\#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/zookeeper.properties
 sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties
 sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/alert.properties
 sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties

From b3bb84631ec268a9ab7e19ebb6c6bfa3c092f7f5 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Thu, 4 Feb 2021 23:21:44 +0800
Subject: [PATCH 57/87] [Fix][Flink] Fix flink -yn option missing after
 upgrading (#4682)

---
 .../apache/dolphinscheduler/server/utils/FlinkArgsUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
index 2431eedd16..519ddf205c 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
@@ -64,9 +64,9 @@ public class FlinkArgsUtils {
                 args.add(ArgsUtils.escape(appName));
             }
 
-            // judge flink version,from flink1.10,the parameter -yn removed
+            // judge flink version, the parameter -yn has removed from flink 1.10
             String flinkVersion = param.getFlinkVersion();
-            if (FLINK_VERSION_BEFORE_1_10.equals(flinkVersion)) {
+            if (flinkVersion == null || FLINK_VERSION_BEFORE_1_10.equals(flinkVersion)) {
                 int taskManager = param.getTaskManager();
                 if (taskManager != 0) {                        //-yn
                     args.add(Constants.FLINK_TASK_MANAGE);

From 9a3853424ba66f411e99e1954ba596fcc1d1a370 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Fri, 5 Feb 2021 11:27:19 +0800
Subject: [PATCH 58/87] Improvement/UI no #3725 (#4316)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 工作流定义，工作流实例，任务实例的编号设置为id

* Change the no to taskinstance, processinstance, processdefinition id
---
 .../pages/projects/pages/definition/pages/list/_source/list.vue | 2 +-
 .../pages/projects/pages/instance/pages/list/_source/list.vue   | 2 +-
 .../home/pages/projects/pages/taskInstance/_source/list.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 32612213ac..e148119b98 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -19,7 +19,7 @@
     <div class="table-box">
       <el-table :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange">
         <el-table-column type="selection" width="50" :selectable="selectable"></el-table-column>
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column :label="$t('Process Name')" min-width="200">
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 01b7574689..cc0e51345a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -19,7 +19,7 @@
     <div class="table-box">
       <el-table class="fixed" :data="list" size="mini" style="width: 100%" @selection-change="_arrDelChange">
         <el-table-column type="selection" width="50"></el-table-column>
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column :label="$t('Process Name')" min-width="200">
           <template slot-scope="scope">
             <el-popover trigger="hover" placement="top">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index 75ec49d6bd..8aa387afc6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -18,7 +18,7 @@
   <div class="list-model">
     <div class="table-box">
       <el-table :data="list" size="mini" style="width: 100%">
-        <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
+        <el-table-column prop="id" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="name" :label="$t('Name')"></el-table-column>
         <el-table-column :label="$t('Process Instance')" min-width="200">
           <template slot-scope="scope">

From e3902bf340c23a1dea4065b832dee8ad99244307 Mon Sep 17 00:00:00 2001
From: lisen <Ylisen10@163.com>
Date: Fri, 5 Feb 2021 11:33:00 +0800
Subject: [PATCH 59/87] [Fix-4640][UI] Fixed a 404 error when the project name
 contains "http" (#4688)

this closes #4640  #4672
---
 dolphinscheduler-ui/src/js/module/io/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js
index d1b6a1af62..2d7894828a 100644
--- a/dolphinscheduler-ui/src/js/module/io/index.js
+++ b/dolphinscheduler-ui/src/js/module/io/index.js
@@ -22,7 +22,7 @@ const apiPrefix = '/dolphinscheduler'
 const reSlashPrefix = /^\/+/
 
 const resolveURL = (url) => {
-  if (url.indexOf('http') !== -1) {
+  if (url.indexOf('http') === 0) {
     return url
   }
   if (url.charAt(0) !== '/') {

From 24ddd4f7076256342cab1509afd3487cd4e423d9 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 11:52:11 +0800
Subject: [PATCH 60/87] [Improvement][UI] Improve parameter (#4673)

---
 .../dag/_source/formModel/tasks/flink.vue     | 38 +++++----
 .../pages/dag/_source/formModel/tasks/mr.vue  | 16 ++--
 .../dag/_source/formModel/tasks/spark.vue     | 78 +++++++++++--------
 .../src/js/module/i18n/locale/en_US.js        | 34 ++++----
 .../src/js/module/i18n/locale/zh_CN.js        | 44 +++++------
 5 files changed, 118 insertions(+), 92 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index 1fe8ca9137..d0dfdf6d97 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -35,7 +35,7 @@
     </m-list-box>
 
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -47,7 +47,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -137,7 +137,7 @@
       </div>
     </m-list-4-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
                 :autosize="{minRows:2}"
@@ -145,12 +145,12 @@
                 type="textarea"
                 size="small"
                 v-model="mainArgs"
-                :placeholder="$t('Please enter Command-line parameters')">
+                :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -158,7 +158,7 @@
                 type="textarea"
                 size="small"
                 v-model="others"
-                :placeholder="$t('Please enter other parameters')">
+                :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -213,19 +213,19 @@
         cacheResourceList: [],
         // Custom function
         localParams: [],
-        // Driver Number of cores
+        // Slot number
         slot: 1,
-        // Driver Number of memory
+        // TaskManager mumber
         taskManager: '2',
-        // jobManager Memory
+        // JobManager memory
         jobManagerMemory: '1G',
-        // taskManager Memory
+        // TaskManager memory
         taskManagerMemory: '2G',
-        // Flink Job Name
+        // Flink app name
         appName: '',
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'SCALA',
@@ -310,11 +310,21 @@
           return false
         }
 
-        if (!_.isNumber(parseInt(this.taskManagerMemory))) {
+        if (!Number.isInteger(parseInt(this.taskManagerMemory))) {
           this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
           return false
         }
 
+        if (!Number.isInteger(parseInt(this.slot))) {
+          this.$message.warning(`${i18n.$t('Please enter Slot number')}`)
+          return false
+        }
+
+        if (this.flinkVersion === '<1.10' && !Number.isInteger(parseInt(this.taskManager))) {
+          this.$message.warning(`${i18n.$t('Please enter TaskManager number')}`)
+          return false
+        }
+
         // noRes
         if (this.noRes.length > 0) {
           this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index 356eefd65a..adef5989e0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -30,7 +30,7 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -42,7 +42,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -50,7 +50,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
                 :autosize="{minRows:2}"
@@ -58,12 +58,12 @@
                 type="textarea"
                 size="small"
                 v-model="mainArgs"
-                :placeholder="$t('Please enter Command-line parameters')">
+                :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
                 :disabled="isDetails"
@@ -71,7 +71,7 @@
                 type="textarea"
                 size="small"
                 v-model="others"
-                :placeholder="$t('Please enter other parameters')">
+                :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -122,9 +122,9 @@
         cacheResourceList: [],
         // Custom parameter
         localParams: [],
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'JAVA',
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index efeb7e9e36..a2192399a5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -51,7 +51,7 @@
       </div>
     </m-list-box>
     <m-list-box v-if="programType !== 'PYTHON'">
-      <div slot="text">{{$t('Main class')}}</div>
+      <div slot="text">{{$t('Main Class')}}</div>
       <div slot="content">
         <el-input
             :disabled="isDetails"
@@ -63,7 +63,7 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main jar package')}}</div>
+      <div slot="text">{{$t('Main Jar Package')}}</div>
       <div slot="content">
         <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
@@ -81,7 +81,7 @@
       </div>
     </m-list-box>
     <m-list-4-box>
-      <div slot="text">{{$t('Driver cores')}}</div>
+      <div slot="text">{{$t('Driver Cores')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -91,7 +91,7 @@
           :placeholder="$t('Please enter Driver cores')">
         </el-input>
       </div>
-      <div slot="text-2">{{$t('Driver memory')}}</div>
+      <div slot="text-2">{{$t('Driver Memory')}}</div>
       <div slot="content-2">
         <el-input
           :disabled="isDetails"
@@ -113,7 +113,7 @@
           :placeholder="$t('Please enter Executor number')">
         </el-input>
       </div>
-      <div slot="text-2">{{$t('Executor memory')}}</div>
+      <div slot="text-2">{{$t('Executor Memory')}}</div>
       <div slot="content-2">
         <el-input
           :disabled="isDetails"
@@ -125,7 +125,7 @@
       </div>
     </m-list-4-box>
     <m-list-4-box>
-      <div slot="text">{{$t('Executor cores')}}</div>
+      <div slot="text">{{$t('Executor Cores')}}</div>
       <div slot="content">
         <el-input
           :disabled="isDetails"
@@ -137,7 +137,7 @@
       </div>
     </m-list-4-box>
     <m-list-box>
-      <div slot="text">{{$t('Command-line parameters')}}</div>
+      <div slot="text">{{$t('Main Arguments')}}</div>
       <div slot="content">
         <el-input
             :autosize="{minRows:2}"
@@ -145,12 +145,12 @@
             type="textarea"
             size="small"
             v-model="mainArgs"
-            :placeholder="$t('Please enter Command-line parameters')">
+            :placeholder="$t('Please enter main arguments')">
         </el-input>
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Other parameters')}}</div>
+      <div slot="text">{{$t('Option Parameters')}}</div>
       <div slot="content">
         <el-input
             :disabled="isDetails"
@@ -158,7 +158,7 @@
             type="textarea"
             size="small"
             v-model="others"
-            :placeholder="$t('Please enter other parameters')">
+            :placeholder="$t('Please enter option parameters')">
         </el-input>
       </div>
     </m-list-box>
@@ -213,19 +213,19 @@
         cacheResourceList: [],
         // Custom function
         localParams: [],
-        // Driver Number of cores
+        // Driver cores
         driverCores: 1,
-        // Driver Number of memory
+        // Driver memory
         driverMemory: '512M',
-        // Executor Number
+        // Executor number
         numExecutors: 2,
-        // Executor Number of memory
+        // Executor memory
         executorMemory: '2G',
-        // Executor Number of cores
+        // Executor cores
         executorCores: 2,
-        // Command line argument
+        // Main arguments
         mainArgs: '',
-        // Other parameters
+        // Option parameters
         others: '',
         // Program type
         programType: 'SCALA',
@@ -367,24 +367,33 @@
           return false
         }
 
-        if (!this.numExecutors) {
-          this.$message.warning(`${i18n.$t('Please enter Executor number')}`)
+        if (!this.driverCores) {
+          this.$message.warning(`${i18n.$t('Please enter Driver cores')}`)
           return false
         }
 
-        // noRes
-        if (this.noRes.length > 0) {
-          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+        if (!Number.isInteger(parseInt(this.driverCores))) {
+          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
           return false
         }
 
-        if (!Number.isInteger(parseInt(this.numExecutors))) {
-          this.$message.warning(`${i18n.$t('The Executor Number should be a positive integer')}`)
+        if (!this.driverMemory) {
+          this.$message.warning(`${i18n.$t('Please enter Driver memory')}`)
           return false
         }
 
-        if (!this.executorMemory) {
-          this.$message.warning(`${i18n.$t('Please enter Executor memory')}`)
+        if (!Number.isInteger(parseInt(this.driverMemory))) {
+          this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
+          return false
+        }
+
+        if (!this.executorCores) {
+          this.$message.warning(`${i18n.$t('Please enter Executor cores')}`)
+          return false
+        }
+
+        if (!Number.isInteger(parseInt(this.executorCores))) {
+          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
           return false
         }
 
@@ -393,20 +402,27 @@
           return false
         }
 
-        if (!_.isNumber(parseInt(this.executorMemory))) {
+        if (!Number.isInteger(parseInt(this.executorMemory))) {
           this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
           return false
         }
 
-        if (!this.executorCores) {
-          this.$message.warning(`${i18n.$t('Please enter Executor cores')}`)
+        if (!this.numExecutors) {
+          this.$message.warning(`${i18n.$t('Please enter Executor number')}`)
           return false
         }
 
-        if (!Number.isInteger(parseInt(this.executorCores))) {
-          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
+        if (!Number.isInteger(parseInt(this.numExecutors))) {
+          this.$message.warning(`${i18n.$t('The Executor number should be a positive integer')}`)
+          return false
+        }
+
+        // noRes
+        if (this.noRes.length > 0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
           return false
         }
+
         // localParams Subcomponent verification
         if (!this.$refs.refLocalParams._verifProp()) {
           return false
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index cb330e9fd8..adbcfda238 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -86,14 +86,14 @@ export default {
   'Please choose': 'Please choose',
   'Please enter a positive integer': 'Please enter a positive integer',
   'Program Type': 'Program Type',
-  'Main class': 'Main class',
-  'Main jar package': 'Main jar package',
+  'Main Class': 'Main Class',
+  'Main Jar Package': 'Main Jar Package',
   'Please enter main jar package': 'Please enter main jar package',
   'Please enter main class': 'Please enter main class',
-  'Command-line parameters': 'Command-line parameters',
-  'Please enter Command-line parameters': 'Please enter Command-line parameters',
-  'Other parameters': 'Other parameters',
-  'Please enter other parameters': 'Please enter other parameters',
+  'Main Arguments': 'Main Arguments',
+  'Please enter main arguments': 'Please enter main arguments',
+  'Option Parameters': 'Option Parameters',
+  'Please enter option parameters': 'Please enter option parameters',
   Resources: 'Resources',
   'Custom Parameters': 'Custom Parameters',
   'Custom template': 'Custom template',
@@ -103,23 +103,29 @@ export default {
   Script: 'Script',
   'Please enter script(required)': 'Please enter script(required)',
   'Deploy Mode': 'Deploy Mode',
-  'Driver cores': 'Driver cores',
+  'Driver Cores': 'Driver Cores',
   'Please enter Driver cores': 'Please enter Driver cores',
-  'Driver memory': 'Driver memory',
+  'Driver Memory': 'Driver Memory',
   'Please enter Driver memory': 'Please enter Driver memory',
   'Executor Number': 'Executor Number',
   'Please enter Executor number': 'Please enter Executor number',
-  'Executor memory': 'Executor memory',
+  'The Executor number should be a positive integer': 'The Executor number should be a positive integer',
+  'Executor Memory': 'Executor Memory',
   'Please enter Executor memory': 'Please enter Executor memory',
-  'Executor cores': 'Executor cores',
+  'Executor Cores': 'Executor Cores',
   'Please enter Executor cores': 'Please enter Executor cores',
-  'The Executor Number should be a positive integer': 'The Executor Number should be a positive integer',
   'Memory should be a positive integer': 'Memory should be a positive integer',
   'Core number should be positive integer': 'Core number should be positive integer',
+  'Flink Version': 'Flink Version',
+  'JobManager Memory': 'JobManager Memory',
   'Please enter JobManager memory': 'Please enter JobManager memory',
+  'TaskManager Memory': 'TaskManager Memory',
   'Please enter TaskManager memory': 'Please enter TaskManager memory',
+  'Slot Number': 'Slot Number',
   'Please enter Slot number': 'Please enter Slot number',
+  'TaskManager Number': 'TaskManager Number',
   'Please enter TaskManager number': 'Please enter TaskManager number',
+  'App Name': 'App Name',
   'Please enter app name(optional)': 'Please enter app name(optional)',
   'SQL Type': 'SQL Type',
   Title: 'Title',
@@ -543,12 +549,6 @@ export default {
   'Next five execution times': 'Next five execution times',
   'Execute time': 'Execute time',
   'Complement range': 'Complement range',
-  'Flink Version': 'Flink Version',
-  'Slot Number': 'Slot Number',
-  'TaskManager Number': 'TaskManager Number',
-  'JobManager Memory': 'JobManager Memory',
-  'TaskManager Memory': 'TaskManager Memory',
-  'App Name': 'App Name',
   'Http Url': 'Http Url',
   'Http Method': 'Http Method',
   'Http Parameters': 'Http Parameters',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index d957a6a0cc..440f38c0ff 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -86,14 +86,14 @@ export default {
   'Please choose': '请选择',
   'Please enter a positive integer': '请输入正整数',
   'Program Type': '程序类型',
-  'Main class': '主函数的class',
-  'Main jar package': '主jar包',
-  'Please enter main jar package': '请选择主jar包',
-  'Please enter main class': '请填写主函数的class',
-  'Command-line parameters': '命令行参数',
-  'Please enter Command-line parameters': '请输入命令行参数',
-  'Other parameters': '其他参数',
-  'Please enter other parameters': '请输入其他参数',
+  'Main Class': '主函数的Class',
+  'Main Jar Package': '主Jar包',
+  'Please enter main jar package': '请选择主Jar包',
+  'Please enter main class': '请填写主函数的Class',
+  'Main Arguments': '主程序参数',
+  'Please enter main arguments': '请输入主程序参数',
+  'Option Parameters': '选项参数',
+  'Please enter option parameters': '请输入选项参数',
   Resources: '资源',
   'Custom Parameters': '自定义参数',
   'Custom template': '自定义模版',
@@ -103,23 +103,29 @@ export default {
   Script: '脚本',
   'Please enter script(required)': '请输入脚本(必填)',
   'Deploy Mode': '部署方式',
-  'Driver cores': 'Driver内核数',
-  'Please enter Driver cores': '请输入Driver内核数',
-  'Driver memory': 'Driver内存数',
+  'Driver Cores': 'Driver核心数',
+  'Please enter Driver cores': '请输入Driver核心数',
+  'Driver Memory': 'Driver内存数',
   'Please enter Driver memory': '请输入Driver内存数',
   'Executor Number': 'Executor数量',
   'Please enter Executor number': '请输入Executor数量',
-  'Executor memory': 'Executor内存数',
+  'The Executor number should be a positive integer': 'Executor数量为正整数',
+  'Executor Memory': 'Executor内存数',
   'Please enter Executor memory': '请输入Executor内存数',
-  'Executor cores': 'Executor内核数',
-  'Please enter Executor cores': '请输入Executor内核数',
-  'The Executor Number should be a positive integer': 'Executor数量为正整数',
+  'Executor Cores': 'Executor核心数',
+  'Please enter Executor cores': '请输入Executor核心数',
   'Memory should be a positive integer': '内存数为数字',
-  'Core number should be positive integer': '内核数为正整数',
+  'Core number should be positive integer': '核心数为正整数',
+  'Flink Version': 'Flink版本',
+  'JobManager Memory': 'JobManager内存数',
   'Please enter JobManager memory': '请输入JobManager内存数',
+  'TaskManager Memory': 'TaskManager内存数',
   'Please enter TaskManager memory': '请输入TaskManager内存数',
+  'Slot Number': 'Slot数量',
   'Please enter Slot number': '请输入Slot数量',
+  'TaskManager Number': 'TaskManager数量',
   'Please enter TaskManager number': '请输入TaskManager数量',
+  'App Name': '任务名称',
   'Please enter app name(optional)': '请输入任务名称(选填)',
   'SQL Type': 'sql类型',
   Title: '主题',
@@ -543,12 +549,6 @@ export default {
   'Next five execution times': '接下来五次执行时间',
   'Execute time': '执行时间',
   'Complement range': '补数范围',
-  'Flink Version': 'Flink版本',
-  'Slot Number': 'Slot数量',
-  'TaskManager Number': 'TaskManager数量',
-  'JobManager Memory': 'JobManager内存数',
-  'TaskManager Memory': 'TaskManager内存数',
-  'App Name': '任务名称',
   'Http Url': '请求地址',
   'Http Method': '请求类型',
   'Http Parameters': '请求参数',

From 143fca1b61c7050e7ea26d5358c61d229ef2bba9 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Fri, 5 Feb 2021 11:55:39 +0800
Subject: [PATCH 61/87] [dev][cherry-pick-4660][ui]Fix too many resources to
 display (#4664)

---
 .../src/js/module/components/transfer/resource.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index d7df3fa79c..959142cb4f 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -24,10 +24,10 @@
                 <el-button size="mini" value="udfResource" @click="_ckUDf">{{$t('UDF resources')}}</el-button>
             </el-button-group>
         </div>
-        <treeselect v-show="checkedValue=='fileResource'" v-model="selectFileSource" :multiple="true"  maxHeight="200" :options="fileList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-show="checkedValue=='fileResource'" v-model="selectFileSource" :multiple="true"  maxHeight="260" :options="fileList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
-        <treeselect v-show="checkedValue=='udfResource'" v-model="selectUdfSource" :multiple="true" maxHeight="200" :options="udfList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-show="checkedValue=='udfResource'" v-model="selectUdfSource" :multiple="true" maxHeight="260" :options="udfList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -302,4 +302,11 @@
       float: left;
     }
   }
+  .vue-treeselect__menu {
+    max-height: 200px!important;
+  }
+  .vue-treeselect__multi-value {
+    max-height: 260px!important;
+    overflow-y: auto!important;
+  }
 </style>

From 03c7e1f368e1fc995155140b2b4d3960b4475c96 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 14:09:02 +0800
Subject: [PATCH 62/87] [Fix][UDF] Fix udf jar path not exist when fs.defaultFS
 starts with file:/// (#4692)

---
 .../org/apache/dolphinscheduler/server/utils/UDFUtils.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
index 1bc79ab94e..71234f5539 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
@@ -73,13 +73,11 @@ public class UDFUtils {
         String resourceFullName;
         Set<Map.Entry<UdfFunc,String>> entries = udfFuncTenantCodeMap.entrySet();
         for (Map.Entry<UdfFunc,String> entry:entries){
+            String prefixPath = defaultFS.startsWith("file://") ? "file://" : defaultFS;
             String uploadPath = HadoopUtils.getHdfsUdfDir(entry.getValue());
-            if (!uploadPath.startsWith("hdfs:")) {
-                uploadPath = defaultFS + uploadPath;
-            }
             resourceFullName = entry.getKey().getResourceName();
             resourceFullName = resourceFullName.startsWith("/") ? resourceFullName : String.format("/%s",resourceFullName);
-            sqls.add(String.format("add jar %s%s", uploadPath, resourceFullName));
+            sqls.add(String.format("add jar %s%s%s", prefixPath, uploadPath, resourceFullName));
         }
 
     }

From 369ff6fd0367d619630c5ba985b29a64f222dfe3 Mon Sep 17 00:00:00 2001
From: Yibo-Liu <812072237@qq.com>
Date: Fri, 5 Feb 2021 21:47:10 +0800
Subject: [PATCH 63/87] first PR (#4699)

---
 .../server/master/runner/MasterTaskExecThread.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
index 1ed2aaabf9..e22462c60a 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
@@ -52,7 +52,9 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
      */
     private TaskInstanceCacheManager taskInstanceCacheManager;
 
-
+    /**
+     *  netty executor manager
+     */
     private NettyExecutorManager nettyExecutorManager;
 
 

From 773909efe2fd2f2a6c8aceab923565f7c60f7d5e Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Fri, 5 Feb 2021 22:17:51 +0800
Subject: [PATCH 64/87] [Improvement][Common] Add more resource suffix (#4683)

---
 .../main/java/org/apache/dolphinscheduler/common/Constants.java | 2 +-
 dolphinscheduler-common/src/main/resources/common.properties    | 2 +-
 .../conf/home/pages/resource/pages/file/pages/_source/common.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index f0c7c40c49..1252311b97 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -146,7 +146,7 @@ public final class Constants {
      */
     public static final String RESOURCE_VIEW_SUFFIXS = "resource.view.suffixs";
 
-    public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties";
+    public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js";
 
     /**
      * development.state
diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
index 1ff62a20c3..ed9a02739d 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -37,7 +37,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM
 login.user.keytab.path=/opt/hdfs.headless.keytab
 
 #resource.view.suffixs
-#resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
+#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
 
 # if resource.storage.type=HDFS, the user need to have permission to create directories under the HDFS root path
 hdfs.root.user=hdfs
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
index 8ddb75fed3..9bc68af081 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
@@ -18,6 +18,6 @@
 /**
  * Create file type
  */
-const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js', 'css', 'html']
+const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js']
 
 export { filtTypeArr }

From 03a2c6b7b7ba896befa7925dc9a5cc94e304c67d Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Sat, 6 Feb 2021 16:57:59 +0800
Subject: [PATCH 65/87] [Improvement-4450][datasource] Hive/Spark data sources
 do not support multi-tenancy when Kerberos authentication is enabled (#4593)

* hive/spark jdbc add kerberos paramter.

* update datasource vue paramter placeholder.

* update code style.

* add datasource ApiImplicitParam in the kerberos paramter.

* update constants class code style.

* add code test and code style.

* update BaseDataSourceTest code style.

* update BaseDataSourceTest class code style.

* update DataSourceController class code style.

* update DataSourceController ApiImplicitParam

* update ui create data source vue.
---
 .../api/controller/DataSourceController.java  |  42 ++-
 .../api/service/DataSourceService.java        |   9 +-
 .../main/resources/i18n/messages.properties   |   4 +
 .../resources/i18n/messages_en_US.properties  |   4 +
 .../resources/i18n/messages_zh_CN.properties  |   4 +
 .../api/service/DataSourceServiceTest.java    |  26 +-
 .../dolphinscheduler/common/Constants.java    |   4 +-
 .../common/utils/CommonUtils.java             |  19 +-
 .../common/utils/StringUtils.java             |   4 +
 .../common/utils/StringUtilsTest.java         |  18 ++
 .../dao/datasource/BaseDataSource.java        |  38 +++
 .../dao/datasource/HiveDataSource.java        |   2 +-
 .../dao/datasource/SparkDataSource.java       |   2 +-
 .../dao/datasource/BaseDataSourceTest.java    | 269 +++++++++---------
 .../server/worker/task/sql/SqlTask.java       |  43 +--
 .../pages/list/_source/createDataSource.vue   |  56 +++-
 .../src/js/module/i18n/locale/en_US.js        |   3 +
 .../src/js/module/i18n/locale/zh_CN.js        |   3 +
 18 files changed, 343 insertions(+), 207 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
index a67ade2ba7..9fbe8f4e0a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
@@ -96,10 +96,14 @@ public class DataSourceController extends BaseController {
             @ApiImplicitParam(name = "host", value = "DATA_SOURCE_HOST", required = true, dataType = "String"),
             @ApiImplicitParam(name = "port", value = "DATA_SOURCE_PORT", required = true, dataType = "String"),
             @ApiImplicitParam(name = "database", value = "DATABASE_NAME", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "principal", value = "DATA_SOURCE_PRINCIPAL", dataType = "String"),
             @ApiImplicitParam(name = "userName", value = "USER_NAME", required = true, dataType = "String"),
             @ApiImplicitParam(name = "password", value = "PASSWORD", dataType = "String"),
             @ApiImplicitParam(name = "connectType", value = "CONNECT_TYPE", dataType = "DbConnectType"),
-            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String")
+            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String"),
+            @ApiImplicitParam(name = "javaSecurityKrb5Conf", value = "DATA_SOURCE_KERBEROS_KRB5_CONF", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabUsername", value = "DATA_SOURCE_KERBEROS_KEYTAB_USERNAME", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabPath", value = "DATA_SOURCE_KERBEROS_KEYTAB_PATH", dataType = "String")
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
@@ -115,10 +119,14 @@ public class DataSourceController extends BaseController {
                                    @RequestParam(value = "userName") String userName,
                                    @RequestParam(value = "password") String password,
                                    @RequestParam(value = "connectType") DbConnectType connectType,
-                                   @RequestParam(value = "other") String other) {
+                                   @RequestParam(value = "other") String other,
+                                   @RequestParam(value = "javaSecurityKrb5Conf", required = false) String javaSecurityKrb5Conf,
+                                   @RequestParam(value = "loginUserKeytabUsername", required = false) String loginUserKeytabUsername,
+                                   @RequestParam(value = "loginUserKeytabPath", required = false) String loginUserKeytabPath) {
         logger.info("login user {} create datasource name: {}, note: {}, type: {}, host: {}, port: {}, database : {}, principal: {}, userName : {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, host, port, database, principal, userName, connectType, other);
-        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other);
+        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other,
+                javaSecurityKrb5Conf, loginUserKeytabUsername, loginUserKeytabPath);
         return dataSourceService.createDataSource(loginUser, name, note, type, parameter);
     }
 
@@ -149,10 +157,14 @@ public class DataSourceController extends BaseController {
             @ApiImplicitParam(name = "host", value = "DATA_SOURCE_HOST", required = true, dataType = "String"),
             @ApiImplicitParam(name = "port", value = "DATA_SOURCE_PORT", required = true, dataType = "String"),
             @ApiImplicitParam(name = "database", value = "DATABASE_NAME", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "principal", value = "DATA_SOURCE_PRINCIPAL", dataType = "String"),
             @ApiImplicitParam(name = "userName", value = "USER_NAME", required = true, dataType = "String"),
             @ApiImplicitParam(name = "password", value = "PASSWORD", dataType = "String"),
             @ApiImplicitParam(name = "connectType", value = "CONNECT_TYPE", dataType = "DbConnectType"),
-            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String")
+            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String"),
+            @ApiImplicitParam(name = "javaSecurityKrb5Conf", value = "DATA_SOURCE_KERBEROS_KRB5_CONF", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabUsername", value = "DATA_SOURCE_KERBEROS_KEYTAB_USERNAME", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabPath", value = "DATA_SOURCE_KERBEROS_KEYTAB_PATH", dataType = "String")
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
@@ -169,10 +181,14 @@ public class DataSourceController extends BaseController {
                                    @RequestParam(value = "userName") String userName,
                                    @RequestParam(value = "password") String password,
                                    @RequestParam(value = "connectType") DbConnectType connectType,
-                                   @RequestParam(value = "other") String other) {
+                                   @RequestParam(value = "other") String other,
+                                   @RequestParam(value = "javaSecurityKrb5Conf", required = false) String javaSecurityKrb5Conf,
+                                   @RequestParam(value = "loginUserKeytabUsername", required = false) String loginUserKeytabUsername,
+                                   @RequestParam(value = "loginUserKeytabPath", required = false) String loginUserKeytabPath) {
         logger.info("login user {} updateProcessInstance datasource name: {}, note: {}, type: {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
-        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other);
+        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other,
+                javaSecurityKrb5Conf, loginUserKeytabUsername, loginUserKeytabPath);
         return dataSourceService.updateDataSource(id, loginUser, name, note, type, parameter);
     }
 
@@ -274,10 +290,14 @@ public class DataSourceController extends BaseController {
             @ApiImplicitParam(name = "host", value = "DATA_SOURCE_HOST", required = true, dataType = "String"),
             @ApiImplicitParam(name = "port", value = "DATA_SOURCE_PORT", required = true, dataType = "String"),
             @ApiImplicitParam(name = "database", value = "DATABASE_NAME", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "principal", value = "DATA_SOURCE_PRINCIPAL", dataType = "String"),
             @ApiImplicitParam(name = "userName", value = "USER_NAME", required = true, dataType = "String"),
             @ApiImplicitParam(name = "password", value = "PASSWORD", dataType = "String"),
             @ApiImplicitParam(name = "connectType", value = "CONNECT_TYPE", dataType = "DbConnectType"),
-            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String")
+            @ApiImplicitParam(name = "other", value = "DATA_SOURCE_OTHER", dataType = "String"),
+            @ApiImplicitParam(name = "javaSecurityKrb5Conf", value = "DATA_SOURCE_KERBEROS_KRB5_CONF", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabUsername", value = "DATA_SOURCE_KERBEROS_KEYTAB_USERNAME", dataType = "String"),
+            @ApiImplicitParam(name = "loginUserKeytabPath", value = "DATA_SOURCE_KERBEROS_KEYTAB_PATH", dataType = "String")
     })
     @PostMapping(value = "/connect")
     @ResponseStatus(HttpStatus.OK)
@@ -293,10 +313,14 @@ public class DataSourceController extends BaseController {
                                     @RequestParam(value = "userName") String userName,
                                     @RequestParam(value = "password") String password,
                                     @RequestParam(value = "connectType") DbConnectType connectType,
-                                    @RequestParam(value = "other") String other) {
+                                    @RequestParam(value = "other") String other,
+                                    @RequestParam(value = "javaSecurityKrb5Conf", required = false) String javaSecurityKrb5Conf,
+                                    @RequestParam(value = "loginUserKeytabUsername", required = false) String loginUserKeytabUsername,
+                                    @RequestParam(value = "loginUserKeytabPath", required = false) String loginUserKeytabPath) {
         logger.info("login user {}, connect datasource: {}, note: {}, type: {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
-        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other);
+        String parameter = dataSourceService.buildParameter(type, host, port, database, principal, userName, password, connectType, other,
+                javaSecurityKrb5Conf, loginUserKeytabUsername, loginUserKeytabPath);
         return dataSourceService.checkConnection(type, parameter);
     }
 
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
index 58bb657c6f..2ca9cbea6a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
@@ -267,6 +267,9 @@ public class DataSourceService extends BaseService {
         map.put(HOST, host);
         map.put(PORT, port);
         map.put(PRINCIPAL, datasourceForm.getPrincipal());
+        map.put(Constants.KERBEROS_KRB5_CONF_PATH, datasourceForm.getJavaSecurityKrb5Conf());
+        map.put(Constants.KERBEROS_KEY_TAB_USERNAME, datasourceForm.getLoginUserKeytabUsername());
+        map.put(Constants.KERBEROS_KEY_TAB_PATH, datasourceForm.getLoginUserKeytabPath());
         map.put(DATABASE, database);
         map.put(USER_NAME, datasourceForm.getUser());
         map.put(OTHER, otherMap);
@@ -424,7 +427,8 @@ public class DataSourceService extends BaseService {
      */
     public String buildParameter(DbType type, String host,
                                  String port, String database, String principal, String userName,
-                                 String password, DbConnectType connectType, String other) {
+                                 String password, DbConnectType connectType, String other,
+                                 String javaSecurityKrb5Conf, String loginUserKeytabUsername, String loginUserKeytabPath) {
 
         String address = buildAddress(type, host, port, connectType);
         Map<String, Object> parameterMap = new LinkedHashMap<String, Object>(6);
@@ -467,6 +471,9 @@ public class DataSourceService extends BaseService {
         if (CommonUtils.getKerberosStartupState()
                 && (type == DbType.HIVE || type == DbType.SPARK)) {
             parameterMap.put(Constants.PRINCIPAL, principal);
+            parameterMap.put(Constants.KERBEROS_KRB5_CONF_PATH, javaSecurityKrb5Conf);
+            parameterMap.put(Constants.KERBEROS_KEY_TAB_USERNAME, loginUserKeytabUsername);
+            parameterMap.put(Constants.KERBEROS_KEY_TAB_PATH, loginUserKeytabPath);
         }
 
         Map<String, String> map = JSONUtils.toMap(other);
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages.properties b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
index cae8e5fa59..62d3615664 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
@@ -125,6 +125,10 @@ TENANT_CODE=os tenant code
 QUEUE_NAME=queue name
 PASSWORD=password
 DATA_SOURCE_OTHER=jdbc connection params, format:{"key1":"value1",...}
+DATA_SOURCE_PRINCIPAL=principal
+DATA_SOURCE_KERBEROS_KRB5_CONF=the kerberos authentication parameter java.security.krb5.conf
+DATA_SOURCE_KERBEROS_KEYTAB_USERNAME=the kerberos authentication parameter login.user.keytab.username
+DATA_SOURCE_KERBEROS_KEYTAB_PATH=the kerberos authentication parameter login.user.keytab.path
 PROJECT_TAG=project related operation
 CREATE_PROJECT_NOTES=create project 
 PROJECT_DESC=project description
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
index 18b7a10885..74fc4d01b0 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
@@ -125,6 +125,10 @@ TENANT_CODE=os tenant code
 QUEUE_NAME=queue name
 PASSWORD=password
 DATA_SOURCE_OTHER=jdbc connection params, format:{"key1":"value1",...}
+DATA_SOURCE_PRINCIPAL=principal
+DATA_SOURCE_KERBEROS_KRB5_CONF=the kerberos authentication parameter java.security.krb5.conf
+DATA_SOURCE_KERBEROS_KEYTAB_USERNAME=the kerberos authentication parameter login.user.keytab.username
+DATA_SOURCE_KERBEROS_KEYTAB_PATH=the kerberos authentication parameter login.user.keytab.path
 PROJECT_TAG=project related operation
 CREATE_PROJECT_NOTES=create project 
 PROJECT_DESC=project description
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
index a333ef1fa5..f1e8ebefc3 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -119,6 +119,10 @@ TENANT_CODE=操作系统租户
 QUEUE_NAME=队列名
 PASSWORD=密码
 DATA_SOURCE_OTHER=jdbc连接参数，格式为:{"key1":"value1",...}
+DATA_SOURCE_PRINCIPAL=principal
+DATA_SOURCE_KERBEROS_KRB5_CONF=kerberos认证参数 java.security.krb5.conf
+DATA_SOURCE_KERBEROS_KEYTAB_USERNAME=kerberos认证参数 login.user.keytab.username
+DATA_SOURCE_KERBEROS_KEYTAB_PATH=kerberos认证参数 login.user.keytab.path
 PROJECT_TAG=项目相关操作
 CREATE_PROJECT_NOTES=创建项目
 PROJECT_DESC=项目描述
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
index 84ccd2e0a3..13eb1b9c2e 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
@@ -23,6 +23,7 @@ import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.DbConnectType;
 import org.apache.dolphinscheduler.common.enums.DbType;
 import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.common.utils.CommonUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.common.utils.PropertyUtils;
 import org.apache.dolphinscheduler.dao.datasource.BaseDataSource;
@@ -51,7 +52,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore({"sun.security.*", "javax.net.*"})
-@PrepareForTest({DataSourceFactory.class})
+@PrepareForTest({DataSourceFactory.class, CommonUtils.class})
 public class DataSourceServiceTest {
 
 
@@ -68,7 +69,7 @@ public class DataSourceServiceTest {
         String dataSourceName = "dataSource01";
         String dataSourceDesc = "test dataSource";
         DbType dataSourceType = DbType.POSTGRESQL;
-        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null);
+        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null, null, null, null);
 
         // data source exits
         List<DataSource> dataSourceList = new ArrayList<>();
@@ -110,7 +111,7 @@ public class DataSourceServiceTest {
         String dataSourceName = "dataSource01";
         String dataSourceDesc = "test dataSource";
         DbType dataSourceType = DbType.POSTGRESQL;
-        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null);
+        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null, null, null,  null);
 
         // data source not exits
         PowerMockito.when(dataSourceMapper.selectById(dataSourceId)).thenReturn(null);
@@ -274,24 +275,35 @@ public class DataSourceServiceTest {
     @Test
     public void buildParameter() {
         String param = dataSourceService.buildParameter(DbType.ORACLE, "192.168.9.1", "1521", "im"
-                , "", "test", "test", DbConnectType.ORACLE_SERVICE_NAME, "");
+                , "", "test", "test", DbConnectType.ORACLE_SERVICE_NAME, "", "", "","");
         String expected = "{\"connectType\":\"ORACLE_SERVICE_NAME\",\"type\":\"ORACLE_SERVICE_NAME\",\"address\":\"jdbc:oracle:thin:@//192.168.9.1:1521\",\"database\":\"im\","
                 + "\"jdbcUrl\":\"jdbc:oracle:thin:@//192.168.9.1:1521/im\",\"user\":\"test\",\"password\":\"test\"}";
         Assert.assertEquals(expected, param);
+
+        PowerMockito.mockStatic(CommonUtils.class);
+        PowerMockito.when(CommonUtils.getKerberosStartupState()).thenReturn(true);
+        PowerMockito.when(CommonUtils.encodePassword(Mockito.anyString())).thenReturn("test");
+        param = dataSourceService.buildParameter(DbType.HIVE, "192.168.9.1", "10000", "im"
+                , "hive/hdfs-mycluster@ESZ.COM", "test", "test", null, "", "/opt/krb5.conf", "test2/hdfs-mycluster@ESZ.COM", "/opt/hdfs.headless.keytab");
+        expected = "{\"type\":null,\"address\":\"jdbc:hive2://192.168.9.1:10000\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:hive2://192.168.9.1:10000/im;principal=hive/hdfs-mycluster@ESZ.COM\","
+                + "\"user\":\"test\",\"password\":\"test\",\"principal\":\"hive/hdfs-mycluster@ESZ.COM\",\"javaSecurityKrb5Conf\":\"/opt/krb5.conf\","
+                + "\"loginUserKeytabUsername\":\"test2/hdfs-mycluster@ESZ.COM\",\"loginUserKeytabPath\":\"/opt/hdfs.headless.keytab\"}";
+        Assert.assertEquals(expected, param);
+
     }
 
     @Test
     public void buildParameterWithDecodePassword() {
         PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE, "true");
         String param = dataSourceService.buildParameter(DbType.MYSQL, "192.168.9.1", "1521", "im"
-                , "", "test", "123456", null, "");
+                , "", "test", "123456", null, "", "", "", "");
         String expected = "{\"type\":null,\"address\":\"jdbc:mysql://192.168.9.1:1521\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:mysql://192.168.9.1:1521/im\","
                 + "\"user\":\"test\",\"password\":\"IUAjJCVeJipNVEl6TkRVMg==\"}";
         Assert.assertEquals(expected, param);
 
         PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE, "false");
         param = dataSourceService.buildParameter(DbType.MYSQL, "192.168.9.1", "1521", "im"
-                , "", "test", "123456", null, "");
+                , "", "test", "123456", null, "", "", "", "");
         expected = "{\"type\":null,\"address\":\"jdbc:mysql://192.168.9.1:1521\",\"database\":\"im\",\"jdbcUrl\":\"jdbc:mysql://192.168.9.1:1521/im\",\"user\":\"test\",\"password\":\"123456\"}";
         Assert.assertEquals(expected, param);
     }
@@ -316,7 +328,7 @@ public class DataSourceServiceTest {
     @Test
     public void testCheckConnection() throws Exception {
         DbType dataSourceType = DbType.POSTGRESQL;
-        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null);
+        String parameter = dataSourceService.buildParameter(dataSourceType, "172.16.133.200", "5432", "dolphinscheduler", null, "postgres", "", null, null, null, null, null);
 
         PowerMockito.mockStatic(DataSourceFactory.class);
         PowerMockito.when(DataSourceFactory.getDatasource(Mockito.any(), Mockito.anyString())).thenReturn(null);
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 1252311b97..0520520621 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -956,7 +956,9 @@ public final class Constants {
     public static final String PRINCIPAL = "principal";
     public static final String OTHER = "other";
     public static final String ORACLE_DB_CONNECT_TYPE = "connectType";
-
+    public static final String KERBEROS_KRB5_CONF_PATH = "javaSecurityKrb5Conf";
+    public static final String KERBEROS_KEY_TAB_USERNAME = "loginUserKeytabUsername";
+    public static final String KERBEROS_KEY_TAB_PATH = "loginUserKeytabPath";
 
     /**
      * session timeout
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java
index 45c5aa2c93..cf307b402f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java
@@ -86,13 +86,26 @@ public class CommonUtils {
      * @throws Exception errors
      */
     public static void loadKerberosConf() throws Exception {
+        loadKerberosConf(PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH),
+                PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME),
+                PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH));
+    }
+
+    /**
+     * load kerberos configuration
+     * @param javaSecurityKrb5Conf javaSecurityKrb5Conf
+     * @param loginUserKeytabUsername loginUserKeytabUsername
+     * @param loginUserKeytabPath loginUserKeytabPath
+     * @throws Exception errors
+     */
+    public static void loadKerberosConf(String javaSecurityKrb5Conf, String loginUserKeytabUsername, String loginUserKeytabPath) throws Exception {
         if (CommonUtils.getKerberosStartupState()) {
-            System.setProperty(Constants.JAVA_SECURITY_KRB5_CONF, PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH));
+            System.setProperty(Constants.JAVA_SECURITY_KRB5_CONF, StringUtils.defaultIfBlank(javaSecurityKrb5Conf, PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)));
             Configuration configuration = new Configuration();
             configuration.set(Constants.HADOOP_SECURITY_AUTHENTICATION, Constants.KERBEROS);
             UserGroupInformation.setConfiguration(configuration);
-            UserGroupInformation.loginUserFromKeytab(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME),
-                    PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH));
+            UserGroupInformation.loginUserFromKeytab(StringUtils.defaultIfBlank(loginUserKeytabUsername, PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME)),
+                    StringUtils.defaultIfBlank(loginUserKeytabPath, PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH)));
         }
     }
 
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
index 362c6130f4..6bed928e14 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
@@ -62,6 +62,10 @@ public class StringUtils {
         return str == null ? null : str.trim();
     }
 
+    public static String defaultIfBlank(String str, String defaultStr) {
+        return isBlank(str) ? defaultStr : str;
+    }
+
     public static boolean equalsIgnoreCase(String str1, String str2) {
         return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
     }
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java
index f67e89e7e2..74b96aff02 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringUtilsTest.java
@@ -77,4 +77,22 @@ public class StringUtilsTest {
         String result4 = StringUtils.replaceNRTtoUnderline(null);
         Assert.assertNull(result4);
     }
+
+    @Test
+    public void testTrim() {
+        String trim = StringUtils.trim(null);
+        Assert.assertNull(trim);
+
+        trim = StringUtils.trim(" test ");
+        Assert.assertEquals("test", trim);
+    }
+
+    @Test
+    public void testDefaultIfBlank() {
+        String defaultStr = StringUtils.defaultIfBlank("", "defaultStr");
+        Assert.assertEquals("defaultStr", defaultStr);
+
+        defaultStr = StringUtils.defaultIfBlank("test", "defaultStr");
+        Assert.assertEquals("test", defaultStr);
+    }
 }
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java
index bb3825fbf9..9bbbf32a6f 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java
@@ -64,6 +64,21 @@ public abstract class BaseDataSource {
      */
     private String principal;
 
+    /**
+     * java.security.krb5.conf
+     */
+    private String javaSecurityKrb5Conf;
+
+    /**
+     * login.user.keytab.username
+     */
+    private String loginUserKeytabUsername;
+
+    /**
+     * login.user.keytab.path
+     */
+    private String loginUserKeytabPath;
+
     public String getPrincipal() {
         return principal;
     }
@@ -211,4 +226,27 @@ public abstract class BaseDataSource {
         this.other = other;
     }
 
+    public String getJavaSecurityKrb5Conf() {
+        return javaSecurityKrb5Conf;
+    }
+
+    public void setJavaSecurityKrb5Conf(String javaSecurityKrb5Conf) {
+        this.javaSecurityKrb5Conf = javaSecurityKrb5Conf;
+    }
+
+    public String getLoginUserKeytabUsername() {
+        return loginUserKeytabUsername;
+    }
+
+    public void setLoginUserKeytabUsername(String loginUserKeytabUsername) {
+        this.loginUserKeytabUsername = loginUserKeytabUsername;
+    }
+
+    public String getLoginUserKeytabPath() {
+        return loginUserKeytabPath;
+    }
+
+    public void setLoginUserKeytabPath(String loginUserKeytabPath) {
+        this.loginUserKeytabPath = loginUserKeytabPath;
+    }
 }
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java
index 3c087e7f31..bcf1cdf3d2 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java
@@ -96,7 +96,7 @@ public class HiveDataSource extends BaseDataSource {
      */
     @Override
     public Connection getConnection() throws Exception {
-        CommonUtils.loadKerberosConf();
+        CommonUtils.loadKerberosConf(getJavaSecurityKrb5Conf(), getLoginUserKeytabUsername(), getLoginUserKeytabPath());
         return super.getConnection();
     }
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java
index 207ed43942..df17bb564c 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java
@@ -52,7 +52,7 @@ public class SparkDataSource extends BaseDataSource {
      */
     @Override
     public Connection getConnection() throws Exception {
-        CommonUtils.loadKerberosConf();
+        CommonUtils.loadKerberosConf(getJavaSecurityKrb5Conf(), getLoginUserKeytabUsername(), getLoginUserKeytabPath());
         return super.getConnection();
     }
 }
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSourceTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSourceTest.java
index 9250e500d1..1d02fd4fe3 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSourceTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSourceTest.java
@@ -14,151 +14,148 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.DbType;
 import org.apache.dolphinscheduler.common.utils.PropertyUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 public class BaseDataSourceTest {
 
-  @Test
-  public void testDriverClassSelector() {
-    String mysqlDriverClass = new MySQLDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.COM_MYSQL_JDBC_DRIVER, mysqlDriverClass);
-
-    String clickHouseDriverClass = new ClickHouseDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.COM_CLICKHOUSE_JDBC_DRIVER, clickHouseDriverClass);
-
-    String db2ServerDriverClass = new DB2ServerDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.COM_DB2_JDBC_DRIVER, db2ServerDriverClass);
-
-    String oracleDriverClass = new OracleDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.COM_ORACLE_JDBC_DRIVER, oracleDriverClass);
-
-    String postgreDriverClass = new PostgreDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.ORG_POSTGRESQL_DRIVER, postgreDriverClass);
-
-    String sqlServerDriverClass = new SQLServerDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.COM_SQLSERVER_JDBC_DRIVER, sqlServerDriverClass);
-
-    String hiveDriverClass = new HiveDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, hiveDriverClass);
-
-    String sparkDriverClass = new SparkDataSource().driverClassSelector();
-    Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, sparkDriverClass);
-  }
-
-  @Test
-  public void testGetJdbcUrl() {
-    BaseDataSource hiveDataSource = new HiveDataSource();
-    hiveDataSource.setAddress("jdbc:hive2://127.0.0.1:10000");
-    hiveDataSource.setDatabase("test");
-    hiveDataSource.setPassword("123456");
-    hiveDataSource.setUser("test");
-    Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test", hiveDataSource.getJdbcUrl());
-    //set principal
-    hiveDataSource.setPrincipal("hive/test.com@TEST.COM");
-    Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM",
-        hiveDataSource.getJdbcUrl());
-    //set fake other
-    hiveDataSource.setOther("charset=UTF-8");
-    Assert.assertEquals(
-        "jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM;charset=UTF-8",
-        hiveDataSource.getJdbcUrl());
-
-    BaseDataSource clickHouseDataSource = new ClickHouseDataSource();
-    clickHouseDataSource.setAddress("jdbc:clickhouse://127.0.0.1:8123");
-    clickHouseDataSource.setDatabase("test");
-    clickHouseDataSource.setPassword("123456");
-    clickHouseDataSource.setUser("test");
-    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
-    //set fake principal
-    clickHouseDataSource.setPrincipal("fake principal");
-    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
-    //set fake other
-    clickHouseDataSource.setOther("charset=UTF-8");
-    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test?charset=UTF-8",
-        clickHouseDataSource.getJdbcUrl());
-
-    BaseDataSource sqlServerDataSource = new SQLServerDataSource();
-    sqlServerDataSource.setAddress("jdbc:sqlserver://127.0.0.1:1433");
-    sqlServerDataSource.setDatabase("test");
-    sqlServerDataSource.setPassword("123456");
-    sqlServerDataSource.setUser("test");
-    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
-        sqlServerDataSource.getJdbcUrl());
-    //set fake principal
-    sqlServerDataSource.setPrincipal("fake principal");
-    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
-        sqlServerDataSource.getJdbcUrl());
-    //set fake other
-    sqlServerDataSource.setOther("charset=UTF-8");
-    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test;charset=UTF-8",
-        sqlServerDataSource.getJdbcUrl());
-
-    BaseDataSource db2DataSource = new DB2ServerDataSource();
-    db2DataSource.setAddress("jdbc:db2://127.0.0.1:50000");
-    db2DataSource.setDatabase("test");
-    db2DataSource.setPassword("123456");
-    db2DataSource.setUser("test");
-    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
-    //set fake principal
-    db2DataSource.setPrincipal("fake principal");
-    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
-    //set fake other
-    db2DataSource.setOther("charset=UTF-8");
-    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test:charset=UTF-8", db2DataSource.getJdbcUrl());
-
-
-  }
-
-  @Test
-  public void testGetPassword() {
-    BaseDataSource dataSource = new BaseDataSource() {
-      @Override
-      public String driverClassSelector() {
-        return null;
-      }
-
-      @Override
-      public DbType dbTypeSelector() {
-        return null;
-      }
-    };
-
-    String password= "";
-    dataSource.setPassword(password);
-    Assert.assertEquals("", dataSource.getPassword());
-    password= "IUAjJCVeJipNVEl6TkRVMg==";
-    dataSource.setPassword(password);
-    Assert.assertNotNull(dataSource.getPassword());
-    Assert.assertNotNull(dataSource.getPassword());
-
-    dataSource.setPassword(password);
-    PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE,"true");
-    Assert.assertEquals("123456", dataSource.getPassword());
-
-    dataSource.setPassword(password);
-    Assert.assertEquals("123456", dataSource.getPassword());
-    Assert.assertEquals("123456", dataSource.getPassword());
-    Assert.assertEquals("123456", dataSource.getPassword());
-
-    dataSource.setPassword(password);
-    PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE,"false");
-    Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
-
-    dataSource.setPassword(password);
-    Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
-    Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
-    Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
-
-
-  }
-
-
-
+    @Test
+    public void testDriverClassSelector() {
+        String mysqlDriverClass = new MySQLDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.COM_MYSQL_JDBC_DRIVER, mysqlDriverClass);
+
+        String clickHouseDriverClass = new ClickHouseDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.COM_CLICKHOUSE_JDBC_DRIVER, clickHouseDriverClass);
+
+        String db2ServerDriverClass = new DB2ServerDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.COM_DB2_JDBC_DRIVER, db2ServerDriverClass);
+
+        String oracleDriverClass = new OracleDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.COM_ORACLE_JDBC_DRIVER, oracleDriverClass);
+
+        String postgreDriverClass = new PostgreDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.ORG_POSTGRESQL_DRIVER, postgreDriverClass);
+
+        String sqlServerDriverClass = new SQLServerDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.COM_SQLSERVER_JDBC_DRIVER, sqlServerDriverClass);
+
+        String hiveDriverClass = new HiveDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, hiveDriverClass);
+
+        String sparkDriverClass = new SparkDataSource().driverClassSelector();
+        Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, sparkDriverClass);
+    }
+
+    @Test
+    public void testGetJdbcUrl() {
+        BaseDataSource hiveDataSource = new HiveDataSource();
+        hiveDataSource.setAddress("jdbc:hive2://127.0.0.1:10000");
+        hiveDataSource.setDatabase("test");
+        hiveDataSource.setPassword("123456");
+        hiveDataSource.setUser("test");
+        Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test", hiveDataSource.getJdbcUrl());
+        //set principal
+        hiveDataSource.setPrincipal("hive/test.com@TEST.COM");
+        Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM",
+                hiveDataSource.getJdbcUrl());
+        //set fake other
+        hiveDataSource.setOther("charset=UTF-8");
+        Assert.assertEquals(
+                "jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM;charset=UTF-8",
+                hiveDataSource.getJdbcUrl());
+
+        BaseDataSource clickHouseDataSource = new ClickHouseDataSource();
+        clickHouseDataSource.setAddress("jdbc:clickhouse://127.0.0.1:8123");
+        clickHouseDataSource.setDatabase("test");
+        clickHouseDataSource.setPassword("123456");
+        clickHouseDataSource.setUser("test");
+        Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
+        //set fake principal
+        clickHouseDataSource.setPrincipal("fake principal");
+        Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
+        //set fake other
+        clickHouseDataSource.setOther("charset=UTF-8");
+        Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test?charset=UTF-8",
+                clickHouseDataSource.getJdbcUrl());
+
+        BaseDataSource sqlServerDataSource = new SQLServerDataSource();
+        sqlServerDataSource.setAddress("jdbc:sqlserver://127.0.0.1:1433");
+        sqlServerDataSource.setDatabase("test");
+        sqlServerDataSource.setPassword("123456");
+        sqlServerDataSource.setUser("test");
+        Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
+                sqlServerDataSource.getJdbcUrl());
+        //set fake principal
+        sqlServerDataSource.setPrincipal("fake principal");
+        Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
+                sqlServerDataSource.getJdbcUrl());
+        //set fake other
+        sqlServerDataSource.setOther("charset=UTF-8");
+        Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test;charset=UTF-8",
+                sqlServerDataSource.getJdbcUrl());
+
+        BaseDataSource db2DataSource = new DB2ServerDataSource();
+        db2DataSource.setAddress("jdbc:db2://127.0.0.1:50000");
+        db2DataSource.setDatabase("test");
+        db2DataSource.setPassword("123456");
+        db2DataSource.setUser("test");
+        Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
+        //set fake principal
+        db2DataSource.setPrincipal("fake principal");
+        Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
+        //set fake other
+        db2DataSource.setOther("charset=UTF-8");
+        Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test:charset=UTF-8", db2DataSource.getJdbcUrl());
+
+    }
+
+    @Test
+    public void testGetPassword() {
+        BaseDataSource dataSource = new BaseDataSource() {
+            @Override
+            public String driverClassSelector() {
+                return null;
+            }
+
+            @Override
+            public DbType dbTypeSelector() {
+                return null;
+            }
+        };
+
+        String password = "";
+        dataSource.setPassword(password);
+        Assert.assertEquals("", dataSource.getPassword());
+        password = "IUAjJCVeJipNVEl6TkRVMg==";
+        dataSource.setPassword(password);
+        Assert.assertNotNull(dataSource.getPassword());
+        Assert.assertNotNull(dataSource.getPassword());
+
+        dataSource.setPassword(password);
+        PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE,"true");
+        Assert.assertEquals("123456", dataSource.getPassword());
+
+        dataSource.setPassword(password);
+        Assert.assertEquals("123456", dataSource.getPassword());
+        Assert.assertEquals("123456", dataSource.getPassword());
+        Assert.assertEquals("123456", dataSource.getPassword());
+
+        dataSource.setPassword(password);
+        PropertyUtils.setValue(Constants.DATASOURCE_ENCRYPTION_ENABLE,"false");
+        Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
+
+        dataSource.setPassword(password);
+        Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
+        Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
+        Assert.assertEquals("IUAjJCVeJipNVEl6TkRVMg==", dataSource.getPassword());
+
+    }
 
 }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 7aabfce49d..4c328edbe0 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -17,12 +17,6 @@
 
 package org.apache.dolphinscheduler.server.worker.task.sql;
 
-import static org.apache.dolphinscheduler.common.Constants.HIVE_CONF;
-import static org.apache.dolphinscheduler.common.Constants.PASSWORD;
-import static org.apache.dolphinscheduler.common.Constants.SEMICOLON;
-import static org.apache.dolphinscheduler.common.Constants.USER;
-import static org.apache.dolphinscheduler.common.enums.DbType.HIVE;
-
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.CommandType;
 import org.apache.dolphinscheduler.common.enums.DbType;
@@ -33,7 +27,6 @@ import org.apache.dolphinscheduler.common.task.sql.SqlBinds;
 import org.apache.dolphinscheduler.common.task.sql.SqlParameters;
 import org.apache.dolphinscheduler.common.task.sql.SqlType;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
-import org.apache.dolphinscheduler.common.utils.CommonUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.common.utils.ParameterUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
@@ -50,7 +43,6 @@ import org.apache.dolphinscheduler.service.alert.AlertClientService;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -61,7 +53,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -135,8 +126,6 @@ public class SqlTask extends AbstractTask {
                 sqlParameters.getConnParams());
         try {
             SQLTaskExecutionContext sqlTaskExecutionContext = taskExecutionContext.getSqlTaskExecutionContext();
-            // load class
-            DataSourceFactory.loadClass(DbType.valueOf(sqlParameters.getType()));
 
             // get datasource
             baseDataSource = DataSourceFactory.getDatasource(DbType.valueOf(sqlParameters.getType()),
@@ -253,10 +242,8 @@ public class SqlTask extends AbstractTask {
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
         try {
-            // if upload resource is HDFS and kerberos startup
-            CommonUtils.loadKerberosConf();
             // create connection
-            connection = createConnection();
+            connection = baseDataSource.getConnection();
             // create temp function
             if (CollectionUtils.isNotEmpty(createFuncs)) {
                 createTempFunction(connection, createFuncs);
@@ -364,34 +351,6 @@ public class SqlTask extends AbstractTask {
         }
     }
 
-    /**
-     * create connection
-     *
-     * @return connection
-     * @throws Exception Exception
-     */
-    private Connection createConnection() throws Exception {
-        // if hive , load connection params if exists
-        Connection connection = null;
-        if (HIVE == DbType.valueOf(sqlParameters.getType())) {
-            Properties paramProp = new Properties();
-            paramProp.setProperty(USER, baseDataSource.getUser());
-            paramProp.setProperty(PASSWORD, baseDataSource.getPassword());
-            Map<String, String> connParamMap = CollectionUtils.stringToMap(sqlParameters.getConnParams(),
-                    SEMICOLON,
-                    HIVE_CONF);
-            paramProp.putAll(connParamMap);
-
-            connection = DriverManager.getConnection(baseDataSource.getJdbcUrl(),
-                    paramProp);
-        } else {
-            connection = DriverManager.getConnection(baseDataSource.getJdbcUrl(),
-                    baseDataSource.getUser(),
-                    baseDataSource.getPassword());
-        }
-        return connection;
-    }
-
     /**
      * close jdbc resource
      *
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
index b329831269..d188b9381c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
@@ -84,6 +84,39 @@
             </el-input>
           </template>
         </m-list-box-f>
+        <m-list-box-f :class="{hidden:showPrincipal}">
+          <template slot="name">krb5.conf</template>
+          <template slot="content">
+            <el-input
+              type="input"
+              v-model="javaSecurityKrb5Conf"
+              size="small"
+              :placeholder="$t('Please enter the kerberos authentication parameter java.security.krb5.conf')">
+            </el-input>
+          </template>
+        </m-list-box-f>
+        <m-list-box-f :class="{hidden:showPrincipal}">
+          <template slot="name">keytab.username</template>
+          <template slot="content">
+            <el-input
+              type="input"
+              v-model="loginUserKeytabUsername"
+              size="small"
+              :placeholder="$t('Please enter the kerberos authentication parameter login.user.keytab.username')">
+            </el-input>
+          </template>
+        </m-list-box-f>
+        <m-list-box-f :class="{hidden:showPrincipal}">
+          <template slot="name">keytab.path</template>
+          <template slot="content">
+            <el-input
+              type="input"
+              v-model="loginUserKeytabPath"
+              size="small"
+              :placeholder="$t('Please enter the kerberos authentication parameter login.user.keytab.path')">
+            </el-input>
+          </template>
+        </m-list-box-f>
         <m-list-box-f>
           <template slot="name"><strong>*</strong>{{$t('User Name')}}</template>
           <template slot="content">
@@ -108,7 +141,7 @@
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><strong :class="{hidden:showdDatabase}">*</strong>{{$t('Database Name')}}</template>
+          <template slot="name"><strong :class="{hidden:showDatabase}">*</strong>{{$t('Database Name')}}</template>
           <template slot="content">
             <el-input
                     type="input"
@@ -176,6 +209,12 @@
         database: '',
         // principal
         principal: '',
+        // java.security.krb5.conf
+        javaSecurityKrb5Conf: '',
+        // login.user.keytab.username
+        loginUserKeytabUsername: '',
+        // login.user.keytab.path
+        loginUserKeytabPath: '',
         // database username
         userName: '',
         // Database password
@@ -187,7 +226,7 @@
         // btn test loading
         testLoading: false,
         showPrincipal: true,
-        showdDatabase: false,
+        showDatabase: false,
         showConnectType: false,
         isShowPrincipal: true,
         prePortMapper: {},
@@ -267,6 +306,9 @@
           port: this.port,
           database: this.database,
           principal: this.principal,
+          javaSecurityKrb5Conf: this.javaSecurityKrb5Conf,
+          loginUserKeytabUsername: this.loginUserKeytabUsername,
+          loginUserKeytabPath: this.loginUserKeytabPath,
           userName: this.userName,
           password: this.password,
           connectType: this.connectType,
@@ -328,7 +370,7 @@
           return false
         }
 
-        if (!this.database && this.showdDatabase === false) {
+        if (!this.database && this.showDatabase === false) {
           this.$message.warning(`${i18n.$t('Please enter database name')}`)
           return false
         }
@@ -338,7 +380,6 @@
             return false
           }
         }
-
         return true
       },
       /**
@@ -376,6 +417,9 @@
           }, 0)
 
           this.principal = res.principal
+          this.javaSecurityKrb5Conf = res.javaSecurityKrb5Conf
+          this.loginUserKeytabUsername = res.loginUserKeytabUsername
+          this.loginUserKeytabPath = res.loginUserKeytabPath
           this.database = res.database
           this.userName = res.userName
           this.password = res.password
@@ -450,9 +494,9 @@
     watch: {
       type (value) {
         if (value === 'POSTGRESQL') {
-          this.showdDatabase = true
+          this.showDatabase = true
         } else {
-          this.showdDatabase = false
+          this.showDatabase = false
         }
 
         if (value === 'ORACLE' && !this.item.id) {
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index adbcfda238..c7c2b7299c 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -542,6 +542,9 @@ export default {
   statistics: 'Statistics',
   'select tenant': 'select tenant',
   'Please enter Principal': 'Please enter Principal',
+  'Please enter the kerberos authentication parameter java.security.krb5.conf': 'Please enter the kerberos authentication parameter java.security.krb5.conf',
+  'Please enter the kerberos authentication parameter login.user.keytab.username': 'Please enter the kerberos authentication parameter login.user.keytab.username',
+  'Please enter the kerberos authentication parameter login.user.keytab.path': 'Please enter the kerberos authentication parameter login.user.keytab.path',
   'The start time must not be the same as the end': 'The start time must not be the same as the end',
   'Startup parameter': 'Startup parameter',
   'Startup type': 'Startup type',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 440f38c0ff..aa7792094d 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -542,6 +542,9 @@ export default {
   statistics: '统计',
   'select tenant': '选择租户',
   'Please enter Principal': '请输入Principal',
+  'Please enter the kerberos authentication parameter java.security.krb5.conf': '请输入kerberos认证参数 java.security.krb5.conf',
+  'Please enter the kerberos authentication parameter login.user.keytab.username': '请输入kerberos认证参数 login.user.keytab.username',
+  'Please enter the kerberos authentication parameter login.user.keytab.path': '请输入kerberos认证参数 login.user.keytab.path',
   'The start time must not be the same as the end': '开始时间和结束时间不能相同',
   'Startup parameter': '启动参数',
   'Startup type': '启动类型',

From 7c07900ea6c118f5f4bd61b826ef090198d69cf0 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Sat, 6 Feb 2021 22:12:35 +0800
Subject: [PATCH 66/87] [Improvement][install] alert-server properties make
 adjustments in the Install script (#4709)

* imp alert-server alert.properties install config.

* add alert plugin dir param in the install_config.conf
---
 .../src/main/resources/alert.properties       |  2 +-
 .../main/resources/config/install_config.conf | 31 ++-----------------
 install.sh                                    | 10 ++----
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/resources/alert.properties b/dolphinscheduler-alert/src/main/resources/alert.properties
index 1e26d27fec..80ea87c2cd 100644
--- a/dolphinscheduler-alert/src/main/resources/alert.properties
+++ b/dolphinscheduler-alert/src/main/resources/alert.properties
@@ -21,7 +21,7 @@
 #eg : Alert Server Listener port
 
 #alert.plugin.dir config the Alert Plugin dir . AlertServer while find and load the Alert Plugin Jar from this dir when deploy and start AlertServer on the server .
-#eg :alert.plugin.dir=/opt/soft/spi/lib/plugin/alert
+alert.plugin.dir=./lib/plugin/alert
 
 #maven.local.repository=/Users/gaojun/Documents/jianguoyun/localRepository
 
diff --git a/dolphinscheduler-server/src/main/resources/config/install_config.conf b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index a20fa66087..f3ed554a88 100755
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -48,35 +48,10 @@ installPath="/data1_1T/dolphinscheduler"
 # Note: the deployment user needs to have sudo privileges and permissions to operate hdfs. If hdfs is enabled, the root directory needs to be created by itself
 deployUser="dolphinscheduler"
 
-
 # alert config
-# mail server host
-mailServerHost="smtp.exmail.qq.com"
-
-# mail server port
-# note: Different protocols and encryption methods correspond to different ports, when SSL/TLS is enabled, make sure the port is correct.
-mailServerPort="25"
-
-# sender
-mailSender="xxxxxxxxxx"
-
-# user
-mailUser="xxxxxxxxxx"
-
-# sender password
-# note: The mail.passwd is email service authorization code, not the email login password.
-mailPassword="xxxxxxxxxx"
-
-# TLS mail protocol support
-starttlsEnable="true"
-
-# SSL mail protocol support
-# only one of TLS and SSL can be in the true state.
-sslEnable="false"
-
-#note: sslTrust is the same as mailServerHost
-sslTrust="smtp.exmail.qq.com"
-
+# alert plugin dir
+# Note: find and load the Alert Plugin Jar from this dir.
+alertPluginDir="/data1_1T/dolphinscheduler/lib/plugin/alert"
 
 # resource storage type：HDFS,S3,NONE
 resourceStorageType="NONE"
diff --git a/install.sh b/install.sh
index 723ee908e8..9de49748c2 100755
--- a/install.sh
+++ b/install.sh
@@ -55,14 +55,8 @@ sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g
 sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/zookeeper.properties
 sed -i ${txt} "s#\#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/zookeeper.properties
 sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties
-sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/alert.properties
-sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties
-sed -i ${txt} "s#mail.sender.*#mail.sender=${mailSender}#g" conf/alert.properties
-sed -i ${txt} "s#mail.user.*#mail.user=${mailUser}#g" conf/alert.properties
-sed -i ${txt} "s#mail.passwd.*#mail.passwd=${mailPassword}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.starttls.enable.*#mail.smtp.starttls.enable=${starttlsEnable}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.ssl.trust.*#mail.smtp.ssl.trust=${sslTrust}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.ssl.enable.*#mail.smtp.ssl.enable=${sslEnable}#g" conf/alert.properties
+
+sed -i ${txt} "s#alert.plugin.dir.*#alert.plugin.dir=${alertPluginDir}#g" conf/alert.properties
 
 sed -i ${txt} "s#alert.listen.host.*#alert.listen.host=${alertServer}#g" conf/worker.properties
 

From a5443f1173e083f4159bf53ffd544d3fc60cde32 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Sat, 6 Feb 2021 22:20:25 +0800
Subject: [PATCH 67/87] [fix-4128][worker] Dolphin executes the command using
 sudo to specify the -u parameter (#4217)

* update sudo cmd.

* update sudo cmd.

* update OSUtils code style.

* add OSUtils test method.
---
 .../apache/dolphinscheduler/common/utils/OSUtils.java  | 10 ++++++++++
 .../dolphinscheduler/common/utils/OSUtilsTest.java     |  7 +++++++
 .../dolphinscheduler/server/utils/ProcessUtils.java    |  9 +++------
 .../server/worker/processor/TaskKillProcessor.java     |  4 ++--
 .../server/worker/task/AbstractCommandExecutor.java    |  9 +++++----
 .../server/utils/ProcessUtilsTest.java                 |  3 ++-
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
index b48f2d30cc..768c0f654a 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
@@ -389,6 +389,16 @@ public class OSUtils {
         return null;
     }
 
+    /**
+     *  get sudo command
+     * @param tenantCode tenantCode
+     * @param command command
+     * @return result of sudo execute command
+     */
+    public static String getSudoCmd(String tenantCode, String command) {
+        return StringUtils.isEmpty(tenantCode) ? command : "sudo -u " + tenantCode + " " + command;
+    }
+
     /**
      * Execute the corresponding command of Linux or Windows
      *
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
index 8f40bccdc8..d005010f93 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
@@ -75,6 +75,13 @@ public class OSUtilsTest {
         }
     }
 
+    @Test
+    public void testGetSudoCmd() {
+        String cmd = "kill -9 1234";
+        String sudoCmd = OSUtils.getSudoCmd("test123", cmd);
+        Assert.assertEquals("sudo -u test123 " + cmd, sudoCmd);
+    }
+
     @Test
     public void exeCmd() {
         if(OSUtils.isMacOS() || !OSUtils.isWindows()){
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
index 6c54c790fb..3f60140e9d 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java
@@ -344,10 +344,7 @@ public class ProcessUtils {
             }
 
             String runCmd = String.format("%s %s", Constants.SH, commandFile);
-            if (StringUtils.isNotEmpty(tenantCode)) {
-                runCmd = "sudo -u " + tenantCode + " " + runCmd;
-            }
-
+            runCmd = OSUtils.getSudoCmd(tenantCode, runCmd);
             logger.info("kill cmd:{}", runCmd);
             OSUtils.exeCmd(runCmd);
         } catch (Exception e) {
@@ -369,8 +366,8 @@ public class ProcessUtils {
                 return;
             }
 
-            String cmd = String.format("sudo kill -9 %s", getPidsStr(processId));
-
+            String cmd = String.format("kill -9 %s", getPidsStr(processId));
+            cmd = OSUtils.getSudoCmd(taskExecutionContext.getTenantCode(), cmd);
             logger.info("process id:{}, cmd:{}", processId, cmd);
 
             OSUtils.exeCmd(cmd);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
index 45268e6d86..b41c189eda 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java
@@ -115,8 +115,8 @@ public class TaskKillProcessor implements NettyRequestProcessor {
                 return Pair.of(true, appIds);
             }
 
-            String cmd = String.format("sudo kill -9 %s", ProcessUtils.getPidsStr(taskExecutionContext.getProcessId()));
-
+            String cmd = String.format("kill -9 %s", ProcessUtils.getPidsStr(taskExecutionContext.getProcessId()));
+            cmd = OSUtils.getSudoCmd(taskExecutionContext.getTenantCode(), cmd);
             logger.info("process id:{}, cmd:{}", taskExecutionContext.getProcessId(), cmd);
 
             OSUtils.exeCmd(cmd);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
index da5c0e6980..443bd319ed 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
@@ -27,6 +27,7 @@ import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.HadoopUtils;
 import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.OSUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.server.entity.TaskExecutionContext;
 import org.apache.dolphinscheduler.server.utils.ProcessUtils;
@@ -265,8 +266,8 @@ public abstract class AbstractCommandExecutor {
         if (processId != 0 && process.isAlive()) {
             try {
                 // sudo -u user command to run command
-                String cmd = String.format("sudo kill %d", processId);
-
+                String cmd = String.format("kill %d", processId);
+                cmd = OSUtils.getSudoCmd(taskExecutionContext.getTenantCode(), cmd);
                 logger.info("soft kill task:{}, process id:{}, cmd:{}", taskExecutionContext.getTaskAppId(), processId, cmd);
 
                 Runtime.getRuntime().exec(cmd);
@@ -286,8 +287,8 @@ public abstract class AbstractCommandExecutor {
     private void hardKill(int processId) {
         if (processId != 0 && process.isAlive()) {
             try {
-                String cmd = String.format("sudo kill -9 %d", processId);
-
+                String cmd = String.format("kill -9 %d", processId);
+                cmd = OSUtils.getSudoCmd(taskExecutionContext.getTenantCode(), cmd);
                 logger.info("hard kill task:{}, process id:{}, cmd:{}", taskExecutionContext.getTaskAppId(), processId, cmd);
 
                 Runtime.getRuntime().exec(cmd);
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
index 4d1ed27619..2f25e3b893 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java
@@ -99,12 +99,13 @@ public class ProcessUtilsTest {
         try {
             when(OSUtils.exeCmd(String.format("%s -sp %d", Constants.PSTREE, 1))).thenReturn("1111");
             when(OSUtils.exeCmd(String.format("%s -p %d", Constants.PSTREE, 1))).thenReturn("1111");
-            when(OSUtils.exeCmd("sudo kill -9")).thenReturn("1111");
+            when(OSUtils.exeCmd("sudo -u tenantCode kill -9")).thenReturn("1111");
         } catch (Exception e) {
             e.printStackTrace();
         }
         taskExecutionContext.setHost("127.0.0.1:8888");
         taskExecutionContext.setLogPath("/log/1.log");
+        taskExecutionContext.setTenantCode("tenantCode");
         ProcessUtils.kill(taskExecutionContext);
         Assert.assertEquals(1, taskExecutionContext.getProcessId());
     }

From aa07b081b407b5b820b43a9729436ae114a97678 Mon Sep 17 00:00:00 2001
From: "felix.wang" <59079269+felix-thinkingdata@users.noreply.github.com>
Date: Sun, 7 Feb 2021 23:52:51 +0800
Subject: [PATCH 68/87] [fix][Alert-plugin ]Fixed SQLTask content, JSON Formate
 exceptions. (#4724)

* Fixed SQLTask content, JSON Formate exceptions.

* add ut

* add ut

* fix code smell
---
 .../plugin/alert/feishu/FeiShuSender.java     | 23 ++++++------------
 .../plugin/alert/feishu/FeiShuSenderTest.java | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
index 4eee390721..8fdafe7182 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
@@ -23,9 +23,7 @@ import org.apache.dolphinscheduler.spi.utils.JSONUtils;
 
 import org.apache.commons.codec.binary.StringUtils;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -71,11 +69,6 @@ public class FeiShuSender {
 
     }
 
-    private static RequestConfig getProxyConfig(String proxy, int port) {
-        HttpHost httpProxy = new HttpHost(proxy, port);
-        return RequestConfig.custom().setProxy(httpProxy).build();
-    }
-
     private static String textToJsonString(AlertData alertData) {
 
         Map<String, Object> items = new HashMap<>(2);
@@ -88,7 +81,7 @@ public class FeiShuSender {
         return JSONUtils.toJsonString(items);
     }
 
-    private static AlertResult checkSendFeiShuSendMsgResult(String result) {
+    public static AlertResult checkSendFeiShuSendMsgResult(String result) {
         AlertResult alertResult = new AlertResult();
         alertResult.setStatus("false");
 
@@ -116,12 +109,10 @@ public class FeiShuSender {
 
     public static String formatContent(AlertData alertData) {
         if (alertData.getContent() != null) {
-            List<Map> list;
-            try {
-                list = JSONUtils.toList(alertData.getContent(), Map.class);
-            } catch (Exception e) {
-                logger.error("json format exception", e);
-                return null;
+
+            List<Map> list = JSONUtils.toList(alertData.getContent(), Map.class);
+            if (list.isEmpty()) {
+                return alertData.getTitle() + alertData.getContent();
             }
 
             StringBuilder contents = new StringBuilder(100);
@@ -170,7 +161,7 @@ public class FeiShuSender {
 
             int statusCode = response.getStatusLine().getStatusCode();
             if (statusCode != HttpStatus.SC_OK) {
-                logger.error("send feishu message error, return http status code: " + statusCode);
+                logger.error("send feishu message error, return http status code: {} ", statusCode);
             }
             String resp;
             try {
@@ -180,7 +171,7 @@ public class FeiShuSender {
             } finally {
                 response.close();
             }
-            logger.info("Ding Talk send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(), resp);
+            logger.info("Fei Shu send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(), resp);
             return resp;
         } finally {
             httpClient.close();
diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
index 26fac06b35..05110d42fe 100644
--- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
+++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-feishu/src/test/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSenderTest.java
@@ -72,4 +72,28 @@ public class FeiShuSenderTest {
         alertData.setContent(alertMsg);
         Assert.assertNotNull(FeiShuSender.formatContent(alertData));
     }
+
+    @Test
+    public void testSendWithFormatException() {
+        AlertData alertData = new AlertData();
+        alertData.setTitle("feishu test title");
+        alertData.setContent("feishu test content");
+        FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
+        String alertResult = feiShuSender.formatContent(alertData);
+        Assert.assertEquals(alertResult, alertData.getTitle() + alertData.getContent());
+    }
+
+    @Test
+    public void testCheckSendFeiShuSendMsgResult() {
+
+        FeiShuSender feiShuSender = new FeiShuSender(feiShuConfig);
+        AlertResult alertResult = feiShuSender.checkSendFeiShuSendMsgResult("");
+        Assert.assertFalse(Boolean.valueOf(alertResult.getStatus()));
+        AlertResult alertResult2 = feiShuSender.checkSendFeiShuSendMsgResult("123");
+        Assert.assertEquals("send fei shu msg fail",alertResult2.getMessage());
+
+        String response = "{\"StatusCode\":\"0\",\"extra\":\"extra\",\"StatusMessage\":\"StatusMessage\"}";
+        AlertResult alertResult3 = feiShuSender.checkSendFeiShuSendMsgResult(response);
+        Assert.assertTrue(Boolean.valueOf(alertResult3.getStatus()));
+    }
 }

From 743975cc5f04efcda02dfb1210a008fe8d8e1357 Mon Sep 17 00:00:00 2001
From: zapjone <zapjone@163.com>
Date: Mon, 8 Feb 2021 12:49:43 +0800
Subject: [PATCH 69/87] [Fix-4727]Update worker.properties misspell error #4730

modify work.weight to worker.weight
---
 dolphinscheduler-server/src/main/resources/worker.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/resources/worker.properties b/dolphinscheduler-server/src/main/resources/worker.properties
index cea1b4ea6c..a1236a36bd 100644
--- a/dolphinscheduler-server/src/main/resources/worker.properties
+++ b/dolphinscheduler-server/src/main/resources/worker.properties
@@ -28,13 +28,13 @@
 #worker.reserved.memory=0.3
 
 # worker listener port
-#worker.listen.port: 1234
+#worker.listen.port=1234
 
 # default worker group
 #worker.groups=default
 
 # default worker weight
-#work.weight=100
+#worker.weight=100
 
 # alert server listener host
 alert.listen.host=localhost

From 03ac3b42b21f4113cae81feaeb63f1c0f51ccd8e Mon Sep 17 00:00:00 2001
From: Alleria Windrunner <42635220+AlleriaWindrunner@users.noreply.github.com>
Date: Mon, 8 Feb 2021 13:12:08 +0800
Subject: [PATCH 70/87] Fix(UI):Fix tips error when login with username and
 without password. (#4728)

Replace isUserPassword to isUserName on the label that userNameText error tip.
---
 dolphinscheduler-ui/src/js/conf/login/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index 3eaf4d14b4..8292932252 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -31,7 +31,7 @@
                   @keyup.enter.native="_ok">
           </el-input>
         </div>
-        <p class="error" v-if="isUserPassword">
+        <p class="error" v-if="isUserName">
           {{userNameText}}
         </p>
       </div>

From 5d89bb0f5a9e9f32131047d493882bb97575d062 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Mon, 8 Feb 2021 23:13:27 +0800
Subject: [PATCH 71/87] [Improvement][alert] Improvement  alert plugin dist.
 (#4731)

* imp dev alert plugin dist.

* update xml code style.

* update xml code style.
---
 .../src/main/assembly/dolphinscheduler-binary.xml        | 9 +++++++++
 .../src/main/assembly/dolphinscheduler-nginx.xml         | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
index 34f2cd2a9a..9eff2b1755 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-binary.xml
@@ -151,6 +151,15 @@
 			<outputDirectory>.</outputDirectory>
 		</fileSet>
 
+		<!--alert plugin-->
+		<fileSet>
+			<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
+			<includes>
+				<include>**/*.*</include>
+			</includes>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+
 		<fileSet>
 			<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
 			<includes>
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
index b47a0ae393..d5aa0205f2 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-nginx.xml
@@ -150,6 +150,14 @@
 			</includes>
 			<outputDirectory>.</outputDirectory>
 		</fileSet>
+		<!--alert plugin-->
+		<fileSet>
+			<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
+			<includes>
+				<include>**/*.*</include>
+			</includes>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
 
 		<fileSet>
 			<directory>${basedir}/../dolphinscheduler-ui/dist</directory>

From 725e386af45223e1ddbd367851c47409346599c7 Mon Sep 17 00:00:00 2001
From: Zhenxu Ke <kezhenxu94@apache.org>
Date: Tue, 9 Feb 2021 13:41:51 +0800
Subject: [PATCH 72/87] chore: fix license checker to allow nested directories
 (#4748)

* chore: fix license checker to allow nested directories

* chore: fix license checker to allow nested directories
---
 tools/dependencies/check-LICENSE.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/dependencies/check-LICENSE.sh b/tools/dependencies/check-LICENSE.sh
index 0072554e29..00048e90c1 100755
--- a/tools/dependencies/check-LICENSE.sh
+++ b/tools/dependencies/check-LICENSE.sh
@@ -25,12 +25,10 @@ tar -zxf dolphinscheduler-dist/target/apache-dolphinscheduler*-bin.tar.gz --stri
 # licenses
 echo '=== Self modules: ' && ./mvnw --batch-mode --quiet -Dexec.executable='echo' -Dexec.args='${project.artifactId}-${project.version}.jar' exec:exec | tee self-modules.txt
 
-echo '=== Distributed dependencies: ' && find dist/lib -name "*.jar" | tee all-dependencies.txt
-# The prefix "dist/lib/" (9 chars) should be stripped to be ready to compare
-sed -i 's/.\{9\}//' all-dependencies.txt
+echo '=== Distributed dependencies: ' && find dist/lib -name "*.jar" -exec basename {} \; | uniq | sort | tee all-dependencies.txt
 
 # Exclude all self modules(jars) to generate all third-party dependencies
-echo '=== Third party dependencies: ' && grep -vf self-modules.txt all-dependencies.txt | tee third-party-dependencies.txt
+echo '=== Third party dependencies: ' && grep -vf self-modules.txt all-dependencies.txt | uniq | sort | tee third-party-dependencies.txt
 
 # 1. Compare the third-party dependencies with known dependencies, expect that all third-party dependencies are KNOWN
 # and the exit code of the command is 0, otherwise we should add its license to LICENSE file and add the dependency to

From c9972936d6457505849dea96e3c4a2e056d8dd85 Mon Sep 17 00:00:00 2001
From: Kirs <acm_master@163.com>
Date: Tue, 9 Feb 2021 19:48:54 +0800
Subject: [PATCH 73/87] [SPI][License]Add missing license (#4749)

---
 dolphinscheduler-dist/release-docs/LICENSE    |   4 +
 .../licenses/LICENSE-javax.mail.txt           | 759 ++++++++++++++++++
 tools/dependencies/known-dependencies.txt     |   4 +
 3 files changed, 767 insertions(+)
 create mode 100644 dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt

diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE
index 416c7969a3..0d9c357c75 100644
--- a/dolphinscheduler-dist/release-docs/LICENSE
+++ b/dolphinscheduler-dist/release-docs/LICENSE
@@ -236,6 +236,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     commons-configuration 1.10: https://mvnrepository.com/artifact/commons-configuration/commons-configuration/1.10, Apache 2.0
     commons-daemon 1.0.13 https://mvnrepository.com/artifact/commons-daemon/commons-daemon/1.0.13, Apache 2.0
     commons-dbcp 1.4: https://github.com/apache/commons-dbcp, Apache 2.0
+    commons-email 1.5: https://github.com/apache/commons-email, Apache 2.0
     commons-httpclient 3.0.1: https://mvnrepository.com/artifact/commons-httpclient/commons-httpclient/3.0.1, Apache 2.0
     commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
     commons-lang 2.6: https://github.com/apache/commons-lang, Apache 2.0
@@ -321,6 +322,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     jpam 1.1: https://mvnrepository.com/artifact/net.sf.jpam/jpam/1.1, Apache 2.0
     jsqlparser 2.1: https://github.com/JSQLParser/JSqlParser, Apache 2.0 or LGPL 2.1
     jsr305 3.0.0: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
+    jsr305 1.3.9: https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305, Apache 2.0
     j2objc-annotations 1.1 https://mvnrepository.com/artifact/com.google.j2objc/j2objc-annotations/1.1, Apache 2.0
     libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0
     libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0
@@ -412,8 +414,10 @@ CDDL licenses
 The following components are provided under the CDDL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
+    activation 1.1: https://mvnrepository.com/artifact/javax.activation/activation/1.1 CDDL 1.0
     javax.activation-api 1.2.0: https://mvnrepository.com/artifact/javax.activation/javax.activation-api/1.2.0, CDDL and LGPL 2.0
     javax.annotation-api 1.3.2: https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api/1.3.2, CDDL + GPLv2
+    javax.mail 1.6.2: https://mvnrepository.com/artifact/com.sun.mail/javax.mail/1.6.2, CDDL/GPLv2
     javax.servlet-api 3.1.0: https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api/3.1.0, CDDL + GPLv2
     jaxb-api 2.3.1: https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api/2.3.1, CDDL 1.1
     jaxb-impl 2.2.3-1: https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl/2.2.3-1, CDDL and GPL 1.1
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
new file mode 100644
index 0000000000..a4c7fecdf5
--- /dev/null
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
@@ -0,0 +1,759 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+
+1. Definitions.
+
+    1.1. "Contributor" means each individual or entity that creates or
+    contributes to the creation of Modifications.
+
+    1.2. "Contributor Version" means the combination of the Original
+    Software, prior Modifications used by a Contributor (if any), and
+    the Modifications made by that particular Contributor.
+
+    1.3. "Covered Software" means (a) the Original Software, or (b)
+    Modifications, or (c) the combination of files containing Original
+    Software with files containing Modifications, in each case including
+    portions thereof.
+
+    1.4. "Executable" means the Covered Software in any form other than
+    Source Code.
+
+    1.5. "Initial Developer" means the individual or entity that first
+    makes Original Software available under this License.
+
+    1.6. "Larger Work" means a work which combines Covered Software or
+    portions thereof with code not governed by the terms of this License.
+
+    1.7. "License" means this document.
+
+    1.8. "Licensable" means having the right to grant, to the maximum
+    extent possible, whether at the time of the initial grant or
+    subsequently acquired, any and all of the rights conveyed herein.
+
+    1.9. "Modifications" means the Source Code and Executable form of
+    any of the following:
+
+    A. Any file that results from an addition to, deletion from or
+    modification of the contents of a file containing Original Software
+    or previous Modifications;
+
+    B. Any new file that contains any part of the Original Software or
+    previous Modification; or
+
+    C. Any new file that is contributed or otherwise made available
+    under the terms of this License.
+
+    1.10. "Original Software" means the Source Code and Executable form
+    of computer software code that is originally released under this
+    License.
+
+    1.11. "Patent Claims" means any patent claim(s), now owned or
+    hereafter acquired, including without limitation, method, process,
+    and apparatus claims, in any patent Licensable by grantor.
+
+    1.12. "Source Code" means (a) the common form of computer software
+    code in which modifications are made and (b) associated
+    documentation included in or with such code.
+
+    1.13. "You" (or "Your") means an individual or a legal entity
+    exercising rights under, and complying with all of the terms of,
+    this License. For legal entities, "You" includes any entity which
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants.
+
+    2.1. The Initial Developer Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, the Initial Developer
+    hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Initial Developer, to use, reproduce,
+    modify, display, perform, sublicense and distribute the Original
+    Software (or portions thereof), with or without Modifications,
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using or selling of
+    Original Software, to make, have made, use, practice, sell, and
+    offer for sale, and/or otherwise dispose of the Original Software
+    (or portions thereof).
+
+    (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+    the date Initial Developer first distributes or otherwise makes the
+    Original Software available to a third party under the terms of this
+    License.
+
+    (d) Notwithstanding Section 2.1(b) above, no patent license is
+    granted: (1) for code that You delete from the Original Software, or
+    (2) for infringements caused by: (i) the modification of the
+    Original Software, or (ii) the combination of the Original Software
+    with other software or devices.
+
+    2.2. Contributor Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, each Contributor hereby
+    grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Contributor to use, reproduce, modify,
+    display, perform, sublicense and distribute the Modifications
+    created by such Contributor (or portions thereof), either on an
+    unmodified basis, with other Modifications, as Covered Software
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using, or selling
+    of Modifications made by that Contributor either alone and/or in
+    combination with its Contributor Version (or portions of such
+    combination), to make, use, sell, offer for sale, have made, and/or
+    otherwise dispose of: (1) Modifications made by that Contributor (or
+    portions thereof); and (2) the combination of Modifications made by
+    that Contributor with its Contributor Version (or portions of such
+    combination).
+
+    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+    on the date Contributor first distributes or otherwise makes the
+    Modifications available to a third party.
+
+    (d) Notwithstanding Section 2.2(b) above, no patent license is
+    granted: (1) for any code that Contributor has deleted from the
+    Contributor Version; (2) for infringements caused by: (i) third
+    party modifications of Contributor Version, or (ii) the combination
+    of Modifications made by that Contributor with other software
+    (except as part of the Contributor Version) or other devices; or (3)
+    under Patent Claims infringed by Covered Software in the absence of
+    Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+    3.1. Availability of Source Code.
+
+    Any Covered Software that You distribute or otherwise make available
+    in Executable form must also be made available in Source Code form
+    and that Source Code form must be distributed only under the terms
+    of this License. You must include a copy of this License with every
+    copy of the Source Code form of the Covered Software You distribute
+    or otherwise make available. You must inform recipients of any such
+    Covered Software in Executable form as to how they can obtain such
+    Covered Software in Source Code form in a reasonable manner on or
+    through a medium customarily used for software exchange.
+
+    3.2. Modifications.
+
+    The Modifications that You create or to which You contribute are
+    governed by the terms of this License. You represent that You
+    believe Your Modifications are Your original creation(s) and/or You
+    have sufficient rights to grant the rights conveyed by this License.
+
+    3.3. Required Notices.
+
+    You must include a notice in each of Your Modifications that
+    identifies You as the Contributor of the Modification. You may not
+    remove or alter any copyright, patent or trademark notices contained
+    within the Covered Software, or any notices of licensing or any
+    descriptive text giving attribution to any Contributor or the
+    Initial Developer.
+
+    3.4. Application of Additional Terms.
+
+    You may not offer or impose any terms on any Covered Software in
+    Source Code form that alters or restricts the applicable version of
+    this License or the recipients' rights hereunder. You may choose to
+    offer, and to charge a fee for, warranty, support, indemnity or
+    liability obligations to one or more recipients of Covered Software.
+    However, you may do so only on Your own behalf, and not on behalf of
+    the Initial Developer or any Contributor. You must make it
+    absolutely clear that any such warranty, support, indemnity or
+    liability obligation is offered by You alone, and You hereby agree
+    to indemnify the Initial Developer and every Contributor for any
+    liability incurred by the Initial Developer or such Contributor as a
+    result of warranty, support, indemnity or liability terms You offer.
+
+    3.5. Distribution of Executable Versions.
+
+    You may distribute the Executable form of the Covered Software under
+    the terms of this License or under the terms of a license of Your
+    choice, which may contain terms different from this License,
+    provided that You are in compliance with the terms of this License
+    and that the license for the Executable form does not attempt to
+    limit or alter the recipient's rights in the Source Code form from
+    the rights set forth in this License. If You distribute the Covered
+    Software in Executable form under a different license, You must make
+    it absolutely clear that any terms which differ from this License
+    are offered by You alone, not by the Initial Developer or
+    Contributor. You hereby agree to indemnify the Initial Developer and
+    every Contributor for any liability incurred by the Initial
+    Developer or such Contributor as a result of any such terms You offer.
+
+    3.6. Larger Works.
+
+    You may create a Larger Work by combining Covered Software with
+    other code not governed by the terms of this License and distribute
+    the Larger Work as a single product. In such a case, You must make
+    sure the requirements of this License are fulfilled for the Covered
+    Software.
+
+4. Versions of the License.
+
+    4.1. New Versions.
+
+    Oracle is the initial license steward and may publish revised and/or
+    new versions of this License from time to time. Each version will be
+    given a distinguishing version number. Except as provided in Section
+    4.3, no one other than the license steward has the right to modify
+    this License.
+
+    4.2. Effect of New Versions.
+
+    You may always continue to use, distribute or otherwise make the
+    Covered Software available under the terms of the version of the
+    License under which You originally received the Covered Software. If
+    the Initial Developer includes a notice in the Original Software
+    prohibiting it from being distributed or otherwise made available
+    under any subsequent version of the License, You must distribute and
+    make the Covered Software available under the terms of the version
+    of the License under which You originally received the Covered
+    Software. Otherwise, You may also choose to use, distribute or
+    otherwise make the Covered Software available under the terms of any
+    subsequent version of the License published by the license steward.
+
+    4.3. Modified Versions.
+
+    When You are an Initial Developer and You want to create a new
+    license for Your Original Software, You may create and use a
+    modified version of this License if You: (a) rename the license and
+    remove any references to the name of the license steward (except to
+    note that the license differs from this License); and (b) otherwise
+    make it clear that the license contains terms which differ from this
+    License.
+
+5. DISCLAIMER OF WARRANTY.
+
+    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
+    IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+    NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+    THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
+    DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
+    OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
+    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+    ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
+    AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+    6.1. This License and the rights granted hereunder will terminate
+    automatically if You fail to comply with terms herein and fail to
+    cure such breach within 30 days of becoming aware of the breach.
+    Provisions which, by their nature, must remain in effect beyond the
+    termination of this License shall survive.
+
+    6.2. If You assert a patent infringement claim (excluding
+    declaratory judgment actions) against Initial Developer or a
+    Contributor (the Initial Developer or Contributor against whom You
+    assert such claim is referred to as "Participant") alleging that the
+    Participant Software (meaning the Contributor Version where the
+    Participant is a Contributor or the Original Software where the
+    Participant is the Initial Developer) directly or indirectly
+    infringes any patent, then any and all rights granted directly or
+    indirectly to You by such Participant, the Initial Developer (if the
+    Initial Developer is not the Participant) and all Contributors under
+    Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
+    from Participant terminate prospectively and automatically at the
+    expiration of such 60 day notice period, unless if within such 60
+    day period You withdraw Your claim with respect to the Participant
+    Software against such Participant either unilaterally or pursuant to
+    a written agreement with Participant.
+
+    6.3. If You assert a patent infringement claim against Participant
+    alleging that the Participant Software directly or indirectly
+    infringes any patent where such claim is resolved (such as by
+    license or settlement) prior to the initiation of patent
+    infringement litigation, then the reasonable value of the licenses
+    granted by such Participant under Sections 2.1 or 2.2 shall be taken
+    into account in determining the amount or value of any payment or
+    license.
+
+    6.4. In the event of termination under Sections 6.1 or 6.2 above,
+    all end user licenses that have been validly granted by You or any
+    distributor hereunder prior to termination (excluding licenses
+    granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
+    TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+    LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+    FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+    LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+    POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
+    APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
+    PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
+    LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+    LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+    AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+    The Covered Software is a "commercial item," as that term is defined
+    in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+    software" (as that term is defined at 48 C.F.R. �
+    252.227-7014(a)(1)) and "commercial computer software documentation"
+    as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
+    with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+    (June 1995), all U.S. Government End Users acquire Covered Software
+    with only those rights set forth herein. This U.S. Government Rights
+    clause is in lieu of, and supersedes, any other FAR, DFAR, or other
+    clause or provision that addresses Government rights in computer
+    software under this License.
+
+9. MISCELLANEOUS.
+
+    This License represents the complete agreement concerning subject
+    matter hereof. If any provision of this License is held to be
+    unenforceable, such provision shall be reformed only to the extent
+    necessary to make it enforceable. This License shall be governed by
+    the law of the jurisdiction specified in a notice contained within
+    the Original Software (except to the extent applicable law, if any,
+    provides otherwise), excluding such jurisdiction's conflict-of-law
+    provisions. Any litigation relating to this License shall be subject
+    to the jurisdiction of the courts located in the jurisdiction and
+    venue specified in a notice contained within the Original Software,
+    with the losing party responsible for costs, including, without
+    limitation, court costs and reasonable attorneys' fees and expenses.
+    The application of the United Nations Convention on Contracts for
+    the International Sale of Goods is expressly excluded. Any law or
+    regulation which provides that the language of a contract shall be
+    construed against the drafter shall not apply to this License. You
+    agree that You alone are responsible for compliance with the United
+    States export administration regulations (and the export control
+    laws and regulation of any other countries) when You use, distribute
+    or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+    As between Initial Developer and the Contributors, each party is
+    responsible for claims and damages arising, directly or indirectly,
+    out of its utilization of rights under this License and You agree to
+    work with Initial Developer and Contributors to distribute such
+    responsibility on an equitable basis. Nothing herein is intended or
+    shall be deemed to constitute any admission of liability.
+
+------------------------------------------------------------------------
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the
+State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction
+of the Federal Courts of the Northern District of California and the
+state courts of the State of California, with venue lying in Santa Clara
+County, California.
+
+
+
+  The GNU General Public License (GPL) Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1335
+USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public
+License applies to most of the Free Software Foundation's software and
+to any other program whose authors commit to using it. (Some other Free
+Software Foundation software is covered by the GNU Library General
+Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this
+service if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone
+to deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis
+or for a fee, you must give the recipients all the rights that you have.
+You must make sure that they, too, receive or can get the source code.
+And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under
+the terms of this General Public License. The "Program", below, refers
+to any such program or work, and a "work based on the Program" means
+either the Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it, either
+verbatim or with modifications and/or translated into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any part
+    thereof, to be licensed as a whole at no charge to all third parties
+    under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this License.
+    (Exception: if the Program itself is interactive but does not
+    normally print such an announcement, your work based on the Program
+    is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program, and
+can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based on
+the Program, the distribution of the whole must be on the terms of this
+License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your cost
+    of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code. (This alternative is allowed
+    only for noncommercial distribution and only if you received the
+    program in object code or executable form with such an offer, in
+    accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to copy
+the source code from the same place counts as distribution of the source
+code, even though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties remain in
+full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and all
+its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot distribute
+so as to satisfy simultaneously your obligations under this License and
+any other pertinent obligations, then as a consequence you may not
+distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who
+receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is implemented
+by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up to
+the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be
+a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by the
+Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+    `show w'. This is free software, and you are welcome to redistribute
+    it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the commands
+you use may be called something other than `show w' and `show c'; they
+could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the
+    program `Gnomovision' (which makes passes at compilers) written by
+    James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications
+with the library. If this is what you want to do, use the GNU Library
+General Public License instead of this License.
+
+#
+
+Certain source files distributed by Oracle America, Inc. and/or its
+affiliates are subject to the following clarification and special
+exception to the GPLv2, based on the GNU Project exception for its
+Classpath libraries, known as the GNU Classpath Exception, but only
+where Oracle has expressly included in the particular source file's
+header the words "Oracle designates this particular file as subject to
+the "Classpath" exception as provided by Oracle in the LICENSE file
+that accompanied this code."
+
+You should also note that Oracle includes multiple, independent
+programs in this software package. Some of those programs are provided
+under licenses deemed incompatible with the GPLv2 by the Free Software
+Foundation and others.  For example, the package includes programs
+licensed under the Apache License, Version 2.0.  Such programs are
+licensed to you under their original licenses.
+
+Oracle facilitates your further distribution of this package by adding
+the Classpath Exception to the necessary parts of its GPLv2 code, which
+permits you to use that code in combination with other independent
+modules not licensed under the GPLv2.  However, note that this would
+not permit you to commingle code under an incompatible license with
+Oracle's GPLv2 licensed code by, for example, cutting and pasting such
+code into a file also containing Oracle's GPLv2 licensed code and then
+distributing the result.  Additionally, if you were to remove the
+Classpath Exception from any of the files to which it applies and
+distribute the result, you would likely be required to license some or
+all of the other code in that distribution under the GPLv2 as well, and
+since the GPLv2 is incompatible with the license terms of some items
+included in the distribution by Oracle, removing the Classpath
+Exception could therefore effectively compromise your ability to
+further distribute the package.
+
+Proceed with caution and we recommend that you obtain the advice of a
+lawyer skilled in open source matters before removing the Classpath
+Exception or making modifications to this package which may
+subsequently be redistributed and/or involve the use of third party
+software.
+
+CLASSPATH EXCEPTION
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License version 2 cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from or
+based on this library.  If you modify this library, you may extend this
+exception to your version of the library, but you are not obligated to
+do so.  If you do not wish to do so, delete this exception statement
+from your version.
diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt
index dc09647c2b..091b3ddc17 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -1,4 +1,5 @@
 HikariCP-3.2.0.jar
+activation-1.1.jar
 animal-sniffer-annotations-1.14.jar
 aopalliance-1.0.jar
 apache-el-8.5.54.jar
@@ -16,6 +17,7 @@ byte-buddy-1.9.16.jar
 checker-compat-qual-2.0.0.jar
 classmate-1.4.0.jar
 clickhouse-jdbc-0.1.52.jar
+commons-email-1.5.jar
 commons-cli-1.2.jar
 commons-codec-1.11.jar
 commons-collections-3.2.2.jar
@@ -96,6 +98,7 @@ javax.activation-api-1.2.0.jar
 javax.annotation-api-1.3.2.jar
 javax.inject-1.jar
 javax.jdo-3.2.0-m3.jar
+javax.mail-1.6.2.jar
 javax.servlet-api-3.1.0.jar
 javolution-5.5.1.jar
 jaxb-api-2.3.1.jar
@@ -129,6 +132,7 @@ jpam-1.1.jar
 jsch-0.1.42.jar
 jsp-api-2.1.jar
 jsqlparser-2.1.jar
+jsr305-1.3.9.jar
 jsr305-3.0.0.jar
 jta-1.1.jar
 jul-to-slf4j-1.7.30.jar

From 0c26e10f3fda98492358a85a51cb609df9ef7033 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Thu, 11 Feb 2021 09:54:07 +0800
Subject: [PATCH 74/87] [Fix-4738][Mail] Fix send mail failed instead of
 execute sql error (#4739)

---
 .../dolphinscheduler/server/worker/task/sql/SqlTask.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 4c328edbe0..411032fd1f 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -298,8 +298,12 @@ public class SqlTask extends AbstractTask {
         String result = JSONUtils.toJsonString(resultJSONArray);
         logger.debug("execute sql : {}", result);
 
-        sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle()) ? sqlParameters.getTitle() : taskExecutionContext.getTaskName() + " query result sets",
-                JSONUtils.toJsonString(resultJSONArray));
+        try {
+            sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle()) ? sqlParameters.getTitle() : taskExecutionContext.getTaskName() + " query result sets",
+                    JSONUtils.toJsonString(resultJSONArray));
+        } catch (Exception e) {
+            logger.warn("sql task sendAttachment error! msg : {} ", e.getMessage());
+        }
     }
 
     /**

From c1efbf3080c616af3eaaa6619547cdc02a78ac4d Mon Sep 17 00:00:00 2001
From: yankexi <yakcy@users.noreply.github.com>
Date: Fri, 12 Feb 2021 04:40:30 -0600
Subject: [PATCH 75/87] [Fix-4760][api][Repair dolphinscheduler-postgre.sql
 error sql] (#4763)

* Repair error sql about dolphinscheduler-postgre.sql

* Repair error sql about dolphinscheduler-postgre.sql

* Repair error sql about dolphinscheduler-postgre.sql

(cherry picked from commit 739a633)

* [Fix-4760][api][Repair dolphinscheduler-postgre.sql error sql]
---
 sql/dolphinscheduler-postgre.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index 8ca6cd8338..b8f638ff99 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -769,8 +769,7 @@ VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', '', '0',
 
 -- Records of t_ds_alertgroup，dolphinscheduler warning group
 INSERT INTO t_ds_alertgroup(id,alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
-VALUES (1, '1,2','dolphinscheduler warning group', 'dolphinscheduler warning group', '2018-11-29 10:20:39',
-        '2018-11-29 10:20:39');
+VALUES (1,'1,2', 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39', '2018-11-29 10:20:39');
 
 -- Records of t_ds_queue,default queue name : default
 INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)

From 7a6b905597d974d1c3a3154aa21ec9cbf61e519f Mon Sep 17 00:00:00 2001
From: guohaozhang <zhishengqianjun@gmail.com>
Date: Fri, 12 Feb 2021 18:50:38 +0800
Subject: [PATCH 76/87] [Fix-#4716][mater,worker] The task execution path
 should be calculated by the worker, not the master (#4717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [fix][api,mater,worker] 修复master 计算实际执行路径，worker上报实际执行路径

* remove unused import
---
 .../builder/TaskExecutionContextBuilder.java       |  1 -
 .../master/consumer/TaskPriorityQueueConsumer.java | 14 --------------
 .../worker/processor/TaskExecuteProcessor.java     |  1 +
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
index 74b0635145..7bfd9a0507 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/builder/TaskExecutionContextBuilder.java
@@ -44,7 +44,6 @@ public class TaskExecutionContextBuilder {
         taskExecutionContext.setStartTime(taskInstance.getStartTime());
         taskExecutionContext.setTaskType(taskInstance.getTaskType());
         taskExecutionContext.setLogPath(taskInstance.getLogPath());
-        taskExecutionContext.setExecutePath(taskInstance.getExecutePath());
         taskExecutionContext.setTaskJson(taskInstance.getTaskJson());
         taskExecutionContext.setWorkerGroup(taskInstance.getWorkerGroup());
         taskExecutionContext.setHost(taskInstance.getHost());
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
index 23255084e0..d7de840dfa 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java
@@ -35,7 +35,6 @@ import org.apache.dolphinscheduler.common.task.sqoop.targets.TargetMysqlParamete
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.EnumUtils;
-import org.apache.dolphinscheduler.common.utils.FileUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
@@ -222,7 +221,6 @@ public class TaskPriorityQueueConsumer extends Thread {
         String userQueue = processService.queryUserQueueByProcessInstanceId(taskInstance.getProcessInstanceId());
         taskInstance.getProcessInstance().setQueue(StringUtils.isEmpty(userQueue) ? tenant.getQueue() : userQueue);
         taskInstance.getProcessInstance().setTenantCode(tenant.getTenantCode());
-        taskInstance.setExecutePath(getExecLocalPath(taskInstance));
         taskInstance.setResources(getResourceFullNames(taskNode));
 
         SQLTaskExecutionContext sqlTaskExecutionContext = new SQLTaskExecutionContext();
@@ -363,18 +361,6 @@ public class TaskPriorityQueueConsumer extends Thread {
         }
     }
 
-    /**
-     * get execute local path
-     *
-     * @return execute local path
-     */
-    private String getExecLocalPath(TaskInstance taskInstance) {
-        return FileUtils.getProcessExecDir(taskInstance.getProcessDefine().getProjectId(),
-            taskInstance.getProcessDefine().getId(),
-            taskInstance.getProcessInstance().getId(),
-            taskInstance.getId());
-    }
-
     /**
      * whehter tenant is null
      *
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
index d8a6e2bfd8..18971dd363 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
@@ -147,6 +147,7 @@ public class TaskExecuteProcessor implements NettyRequestProcessor {
         // local execute path
         String execLocalPath = getExecLocalPath(taskExecutionContext);
         logger.info("task instance  local execute path : {} ", execLocalPath);
+        taskExecutionContext.setExecutePath(execLocalPath);
 
         FileUtils.taskLoggerThreadLocal.set(taskLogger);
         try {

From cbada7c16de4c5b853aada6765bd352ff5262416 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 17:42:04 +0800
Subject: [PATCH 77/87] [Improvement][Docker] Reduce docker image size, remove
 frontend/nginx, remove stdout log, improve compose/swarm deployment and fix
 random PSQLException (#4643)

* [Improvement][Docker] Reduce docker image size, remove frontend/nginx, remove stdout log and improve compose/swarm deployment

* [Improvement][Docker] Fix random PSQLException
---
 .gitignore                                    |  4 +
 docker/build/Dockerfile                       | 57 ++++---------
 docker/build/README.md                        | 36 ++------
 docker/build/README_zh_CN.md                  | 35 ++------
 docker/build/checkpoint.sh                    |  0
 .../env/dolphinscheduler_env.sh               | 12 ++-
 .../logback/logback-alert.xml                 |  9 --
 .../dolphinscheduler/logback/logback-api.xml  |  9 --
 .../logback/logback-master.xml                |  9 --
 .../logback/logback-worker.xml                |  9 --
 docker/build/conf/nginx/dolphinscheduler.conf | 51 -----------
 docker/build/conf/zookeeper/zoo.cfg           | 47 -----------
 docker/build/hooks/build                      |  9 +-
 docker/build/hooks/push                       |  0
 docker/build/startup-init-conf.sh             | 18 +---
 docker/build/startup.sh                       | 55 +++++-------
 docker/docker-swarm/check                     |  2 +-
 docker/docker-swarm/docker-compose.yml        | 80 ++++++++----------
 docker/docker-swarm/docker-stack.yml          | 84 +++++++++----------
 docker/docker-swarm/dolphinscheduler_env.sh   | 12 ++-
 .../install-dolphinscheduler-ui.sh            |  0
 .../test/resources/config/config.properties   |  2 +-
 script/create-dolphinscheduler.sh             |  0
 script/dolphinscheduler-daemon.sh             |  6 ++
 script/env/dolphinscheduler_env.sh            |  0
 script/monitor-server.sh                      |  0
 script/scp-hosts.sh                           |  0
 script/start-all.sh                           |  0
 script/status-all.sh                          |  0
 script/stop-all.sh                            |  0
 script/upgrade-dolphinscheduler.sh            |  0
 31 files changed, 170 insertions(+), 376 deletions(-)
 mode change 100644 => 100755 docker/build/checkpoint.sh
 mode change 100644 => 100755 docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
 delete mode 100644 docker/build/conf/nginx/dolphinscheduler.conf
 delete mode 100644 docker/build/conf/zookeeper/zoo.cfg
 mode change 100644 => 100755 docker/build/hooks/build
 mode change 100644 => 100755 docker/build/hooks/push
 mode change 100644 => 100755 docker/build/startup-init-conf.sh
 mode change 100644 => 100755 docker/build/startup.sh
 mode change 100644 => 100755 docker/docker-swarm/check
 mode change 100644 => 100755 docker/docker-swarm/dolphinscheduler_env.sh
 mode change 100644 => 100755 dolphinscheduler-ui/install-dolphinscheduler-ui.sh
 mode change 100644 => 100755 script/create-dolphinscheduler.sh
 mode change 100644 => 100755 script/dolphinscheduler-daemon.sh
 mode change 100644 => 100755 script/env/dolphinscheduler_env.sh
 mode change 100644 => 100755 script/monitor-server.sh
 mode change 100644 => 100755 script/scp-hosts.sh
 mode change 100644 => 100755 script/start-all.sh
 mode change 100644 => 100755 script/status-all.sh
 mode change 100644 => 100755 script/stop-all.sh
 mode change 100644 => 100755 script/upgrade-dolphinscheduler.sh

diff --git a/.gitignore b/.gitignore
index 6717162b37..9011db1479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,10 @@
 .target
 .idea/
 target/
+dist/
+all-dependencies.txt
+self-modules.txt
+third-party-dependencies.txt
 .settings
 .nbproject
 .classpath
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 7b0f09c539..a33cf490b1 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -15,55 +15,37 @@
 # limitations under the License.
 #
 
-FROM nginx:alpine
+FROM openjdk:8-jdk-alpine
 
 ARG VERSION
 
 ENV TZ Asia/Shanghai
 ENV LANG C.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+ENV DOCKER true
 
-#1. install dos2unix shadow bash openrc python sudo vim wget iputils net-tools ssh pip tini kazoo.
-#If install slowly, you can replcae alpine's mirror with aliyun's mirror, Example:
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories
+# 1. install command/library/software
+# If install slowly, you can replcae alpine's mirror with aliyun's mirror, Example:
+# RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories
+# RUN sed -i 's/dl-cdn.alpinelinux.org/mirror.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
 RUN apk update && \
-    apk add --update --no-cache dos2unix shadow bash openrc python2 python3 sudo vim wget iputils net-tools openssh-server py-pip tini && \
-    apk add --update --no-cache procps && \
-    openrc boot && \
-    pip install kazoo
+    apk add --no-cache tzdata dos2unix bash python2 python3 procps sudo shadow tini postgresql-client && \
+    cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    apk del tzdata && \
+    rm -rf /var/cache/apk/*
 
-#2. install jdk
-RUN apk add --update --no-cache openjdk8
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV PATH $JAVA_HOME/bin:$PATH
-
-#3. add dolphinscheduler
+# 2. add dolphinscheduler
 ADD ./apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz /opt/
-RUN mv /opt/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin/ /opt/dolphinscheduler/
+RUN ln -s /opt/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin /opt/dolphinscheduler
 ENV DOLPHINSCHEDULER_HOME /opt/dolphinscheduler
 
-#4. install database, if use mysql as your backend database, the `mysql-client` package should be installed
-RUN apk add --update --no-cache postgresql postgresql-contrib
-
-#5. modify nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf && \
-    rm -rf /etc/nginx/conf.d/*
-COPY ./conf/nginx/dolphinscheduler.conf /etc/nginx/conf.d
-
-#6. add configuration and modify permissions and set soft links
+# 3. add configuration and modify permissions and set soft links
 COPY ./checkpoint.sh /root/checkpoint.sh
 COPY ./startup-init-conf.sh /root/startup-init-conf.sh
 COPY ./startup.sh /root/startup.sh
 COPY ./conf/dolphinscheduler/*.tpl /opt/dolphinscheduler/conf/
 COPY ./conf/dolphinscheduler/logback/* /opt/dolphinscheduler/conf/
-COPY conf/dolphinscheduler/env/dolphinscheduler_env.sh /opt/dolphinscheduler/conf/env/
-RUN chmod +x /root/checkpoint.sh && \
-    chmod +x /root/startup-init-conf.sh && \
-    chmod +x /root/startup.sh && \
-    chmod +x /opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh && \
-    chmod +x /opt/dolphinscheduler/script/*.sh && \
-    chmod +x /opt/dolphinscheduler/bin/*.sh && \
-    dos2unix /root/checkpoint.sh && \
+COPY ./conf/dolphinscheduler/env/dolphinscheduler_env.sh /opt/dolphinscheduler/conf/env/
+RUN dos2unix /root/checkpoint.sh && \
     dos2unix /root/startup-init-conf.sh && \
     dos2unix /root/startup.sh && \
     dos2unix /opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh && \
@@ -71,13 +53,10 @@ RUN chmod +x /root/checkpoint.sh && \
     dos2unix /opt/dolphinscheduler/bin/*.sh && \
     rm -rf /bin/sh && \
     ln -s /bin/bash /bin/sh && \
-    mkdir -p /tmp/xls && \
-    #7. remove apk index cache and disable coredup for sudo
-    rm -rf /var/cache/apk/* && \
+    mkdir -p /var/mail /tmp/xls && \
     echo "Set disable_coredump false" >> /etc/sudo.conf
 
-
-#8. expose port
-EXPOSE 2181 2888 3888 5432 5678 1234 12345 50051 8888
+# 4. expose port
+EXPOSE 5678 1234 12345 50051
 
 ENTRYPOINT ["/sbin/tini", "--", "/root/startup.sh"]
diff --git a/docker/build/README.md b/docker/build/README.md
index 951f2d6b51..3a2a1666bb 100644
--- a/docker/build/README.md
+++ b/docker/build/README.md
@@ -15,9 +15,9 @@ Official Website: https://dolphinscheduler.apache.org
 
 #### You can start a dolphinscheduler instance
 ```
-$ docker run -dit --name dolphinscheduler \ 
+$ docker run -dit --name dolphinscheduler \
 -e DATABASE_USERNAME=test -e DATABASE_PASSWORD=test -e DATABASE_DATABASE=dolphinscheduler \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -33,7 +33,7 @@ You can specify **existing postgres service**. Example:
 $ docker run -dit --name dolphinscheduler \
 -e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
 -e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -43,7 +43,7 @@ You can specify **existing zookeeper service**. Example:
 $ docker run -dit --name dolphinscheduler \
 -e ZOOKEEPER_QUORUM="l92.168.x.x:2181"
 -e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" -e DATABASE_DATABASE="dolphinscheduler" \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -90,14 +90,6 @@ $ docker run -dit --name dolphinscheduler \
 dolphinscheduler alert-server
 ```
 
-* Start a **frontend**, For example:
-
-```
-$ docker run -dit --name dolphinscheduler \
--e FRONTEND_API_SERVER_HOST="192.168.x.x" -e FRONTEND_API_SERVER_PORT="12345" \
--p 8888:8888 \
-dolphinscheduler frontend
-```
 
 **Note**: You must be specify `DATABASE_HOST` `DATABASE_PORT` `DATABASE_DATABASE` `DATABASE_USERNAME` `DATABASE_PASSWORD` `ZOOKEEPER_QUORUM` when start a standalone dolphinscheduler server.
 
@@ -146,7 +138,7 @@ This environment variable sets the host for database. The default value is `127.
 
 This environment variable sets the port for database. The default value is `5432`.
 
-**Note**: You must be specify it when start a standalone dolphinscheduler server. Like `master-server`, `worker-server`, `api-server`, `alert-server`. 
+**Note**: You must be specify it when start a standalone dolphinscheduler server. Like `master-server`, `worker-server`, `api-server`, `alert-server`.
 
 **`DATABASE_USERNAME`**
 
@@ -306,18 +298,6 @@ This environment variable sets enterprise wechat agent id for `alert-server`. Th
 
 This environment variable sets enterprise wechat users for `alert-server`. The default value is empty.
 
-**`FRONTEND_API_SERVER_HOST`**
-
-This environment variable sets api server host for `frontend`. The default value is `127.0.0.1`.
-
-**Note**: You must be specify it when start a standalone dolphinscheduler server. Like `api-server`.
-
-**`FRONTEND_API_SERVER_PORT`**
-
-This environment variable sets api server port for `frontend`. The default value is `123451`.
-
-**Note**: You must be specify it when start a standalone dolphinscheduler server. Like `api-server`.
-
 ## Initialization scripts
 
 If you would like to do additional initialization in an image derived from this one, add one or more environment variable under `/root/start-init-conf.sh`, and modify template files in `/opt/dolphinscheduler/conf/*.tpl`.
@@ -326,7 +306,7 @@ For example, to add an environment variable `API_SERVER_PORT` in `/root/start-in
 
 ```
 export API_SERVER_PORT=5555
-``` 
+```
 
 and to modify `/opt/dolphinscheduler/conf/application-api.properties.tpl` template file, add server port:
 ```
@@ -343,8 +323,4 @@ $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line})
 EOF
 " > ${DOLPHINSCHEDULER_HOME}/conf/${line%.*}
 done
-
-echo "generate nginx config"
-sed -i "s/FRONTEND_API_SERVER_HOST/${FRONTEND_API_SERVER_HOST}/g" /etc/nginx/conf.d/dolphinscheduler.conf
-sed -i "s/FRONTEND_API_SERVER_PORT/${FRONTEND_API_SERVER_PORT}/g" /etc/nginx/conf.d/dolphinscheduler.conf
 ```
diff --git a/docker/build/README_zh_CN.md b/docker/build/README_zh_CN.md
index c4339a945c..ffa0020dcd 100644
--- a/docker/build/README_zh_CN.md
+++ b/docker/build/README_zh_CN.md
@@ -15,9 +15,9 @@ Official Website: https://dolphinscheduler.apache.org
 
 #### 你可以运行一个dolphinscheduler实例
 ```
-$ docker run -dit --name dolphinscheduler \ 
+$ docker run -dit --name dolphinscheduler \
 -e DATABASE_USERNAME=test -e DATABASE_PASSWORD=test -e DATABASE_DATABASE=dolphinscheduler \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -33,7 +33,7 @@ dolphinscheduler all
 $ docker run -dit --name dolphinscheduler \
 -e DATABASE_HOST="192.168.x.x" -e DATABASE_PORT="5432" -e DATABASE_DATABASE="dolphinscheduler" \
 -e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -43,7 +43,7 @@ dolphinscheduler all
 $ docker run -dit --name dolphinscheduler \
 -e ZOOKEEPER_QUORUM="l92.168.x.x:2181"
 -e DATABASE_USERNAME="test" -e DATABASE_PASSWORD="test" -e DATABASE_DATABASE="dolphinscheduler" \
--p 8888:8888 \
+-p 12345:12345 \
 dolphinscheduler all
 ```
 
@@ -90,15 +90,6 @@ $ docker run -dit --name dolphinscheduler \
 dolphinscheduler alert-server
 ```
 
-* 启动一个 **frontend**, 如下:
-
-```
-$ docker run -dit --name dolphinscheduler \
--e FRONTEND_API_SERVER_HOST="192.168.x.x" -e FRONTEND_API_SERVER_PORT="12345" \
--p 8888:8888 \
-dolphinscheduler frontend
-```
-
 **注意**: 当你运行dolphinscheduler中的部分服务时，你必须指定这些环境变量 `DATABASE_HOST` `DATABASE_PORT` `DATABASE_DATABASE` `DATABASE_USERNAME` `DATABASE_PASSWORD` `ZOOKEEPER_QUORUM`。
 
 ## 如何构建一个docker镜像
@@ -306,18 +297,6 @@ Dolphin Scheduler映像使用了几个容易遗漏的环境变量。虽然这些
 
 配置`alert-server`的邮件服务企业微信`USERS`，默认值 `空`。
 
-**`FRONTEND_API_SERVER_HOST`**
-
-配置`frontend`的连接`api-server`的地址，默认值 `127.0.0.1`。
-
-**Note**: 当单独运行`api-server`时，你应该指定`api-server`这个值。
-
-**`FRONTEND_API_SERVER_PORT`**
-
-配置`frontend`的连接`api-server`的端口，默认值 `12345`。
-
-**Note**: 当单独运行`api-server`时，你应该指定`api-server`这个值。
-
 ## 初始化脚本
 
 如果你想在编译的时候或者运行的时候附加一些其它的操作及新增一些环境变量，你可以在`/root/start-init-conf.sh`文件中进行修改，同时如果涉及到配置文件的修改，请在`/opt/dolphinscheduler/conf/*.tpl`中修改相应的配置文件
@@ -326,7 +305,7 @@ Dolphin Scheduler映像使用了几个容易遗漏的环境变量。虽然这些
 
 ```
 export API_SERVER_PORT=5555
-``` 
+```
 
 当添加以上环境变量后，你应该在相应的模板文件`/opt/dolphinscheduler/conf/application-api.properties.tpl`中添加这个环境变量配置:
 ```
@@ -343,8 +322,4 @@ $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line})
 EOF
 " > ${DOLPHINSCHEDULER_HOME}/conf/${line%.*}
 done
-
-echo "generate nginx config"
-sed -i "s/FRONTEND_API_SERVER_HOST/${FRONTEND_API_SERVER_HOST}/g" /etc/nginx/conf.d/dolphinscheduler.conf
-sed -i "s/FRONTEND_API_SERVER_PORT/${FRONTEND_API_SERVER_PORT}/g" /etc/nginx/conf.d/dolphinscheduler.conf
 ```
diff --git a/docker/build/checkpoint.sh b/docker/build/checkpoint.sh
old mode 100644
new mode 100755
diff --git a/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh b/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
old mode 100644
new mode 100755
index 78c8f98bc1..7fd39335ae
--- a/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
+++ b/docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
@@ -15,6 +15,14 @@
 # limitations under the License.
 #
 
-export PYTHON_HOME=/usr/bin/python2
+export HADOOP_HOME=/opt/soft/hadoop
+export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
+export SPARK_HOME1=/opt/soft/spark1
+export SPARK_HOME2=/opt/soft/spark2
+export PYTHON_HOME=/usr/bin/python
 export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-export PATH=$PYTHON_HOME/bin:$JAVA_HOME/bin:$PATH
+export HIVE_HOME=/opt/soft/hive
+export FLINK_HOME=/opt/soft/flink
+export DATAX_HOME=/opt/soft/datax/bin/datax.py
+
+export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH
diff --git a/docker/build/conf/dolphinscheduler/logback/logback-alert.xml b/docker/build/conf/dolphinscheduler/logback/logback-alert.xml
index 1718947dd1..eec78385db 100644
--- a/docker/build/conf/dolphinscheduler/logback/logback-alert.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-alert.xml
@@ -20,14 +20,6 @@
 <configuration scan="true" scanPeriod="120 seconds"> <!--debug="true" -->
 
     <property name="log.base" value="logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
 
     <appender name="ALERTLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-alert.log</file>
@@ -45,7 +37,6 @@
     </appender>
 
     <root level="INFO">
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="ALERTLOGFILE"/>
     </root>
 
diff --git a/docker/build/conf/dolphinscheduler/logback/logback-api.xml b/docker/build/conf/dolphinscheduler/logback/logback-api.xml
index 2df90d8392..6d29f8af5f 100644
--- a/docker/build/conf/dolphinscheduler/logback/logback-api.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-api.xml
@@ -20,14 +20,6 @@
 <configuration scan="true" scanPeriod="120 seconds"> <!--debug="true" -->
 
     <property name="log.base" value="logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
 
     <!-- api server logback config start -->
     <appender name="APILOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -55,7 +47,6 @@
 
 
     <root level="INFO">
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="APILOGFILE"/>
     </root>
 
diff --git a/docker/build/conf/dolphinscheduler/logback/logback-master.xml b/docker/build/conf/dolphinscheduler/logback/logback-master.xml
index 7410c01f05..d1bfb67aa1 100644
--- a/docker/build/conf/dolphinscheduler/logback/logback-master.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-master.xml
@@ -20,14 +20,6 @@
 <configuration scan="true" scanPeriod="120 seconds"> <!--debug="true" -->
 
     <property name="log.base" value="logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
 
     <conversionRule conversionWord="messsage"
                     converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
@@ -74,7 +66,6 @@
     <!-- master server logback config end -->
 
     <root level="INFO">
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="TASKLOGFILE"/>
         <appender-ref ref="MASTERLOGFILE"/>
     </root>
diff --git a/docker/build/conf/dolphinscheduler/logback/logback-worker.xml b/docker/build/conf/dolphinscheduler/logback/logback-worker.xml
index be1d0acde5..b7e08dd846 100644
--- a/docker/build/conf/dolphinscheduler/logback/logback-worker.xml
+++ b/docker/build/conf/dolphinscheduler/logback/logback-worker.xml
@@ -20,14 +20,6 @@
 <configuration scan="true" scanPeriod="120 seconds"> <!--debug="true" -->
 
     <property name="log.base" value="logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
 
     <!-- worker server logback config start -->
     <conversionRule conversionWord="messsage"
@@ -75,7 +67,6 @@
     <!-- worker server logback config end -->
 
     <root level="INFO">
-        <appender-ref ref="STDOUT"/>
         <appender-ref ref="TASKLOGFILE"/>
         <appender-ref ref="WORKERLOGFILE"/>
     </root>
diff --git a/docker/build/conf/nginx/dolphinscheduler.conf b/docker/build/conf/nginx/dolphinscheduler.conf
deleted file mode 100644
index a594385a0e..0000000000
--- a/docker/build/conf/nginx/dolphinscheduler.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-server {
-    listen       8888;
-    server_name  localhost;
-    #charset koi8-r;
-    #access_log  /var/log/nginx/host.access.log  main;
-    location / {
-        root   /opt/dolphinscheduler/ui;
-        index  index.html index.html;
-    }
-    location /dolphinscheduler/ui{
-        alias  /opt/dolphinscheduler/ui;
-    }
-    location /dolphinscheduler {
-        proxy_pass http://FRONTEND_API_SERVER_HOST:FRONTEND_API_SERVER_PORT;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header x_real_ipP $remote_addr;
-        proxy_set_header remote_addr $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_http_version 1.1;
-        proxy_connect_timeout 300s;
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-    #error_page  404              /404.html;
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-}
diff --git a/docker/build/conf/zookeeper/zoo.cfg b/docker/build/conf/zookeeper/zoo.cfg
deleted file mode 100644
index 94f92d0620..0000000000
--- a/docker/build/conf/zookeeper/zoo.cfg
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial 
-# synchronization phase can take
-initLimit=10
-# The number of ticks that can pass between 
-# sending a request and getting an acknowledgement
-syncLimit=5
-# the directory where the snapshot is stored.
-# do not use /tmp for storage, /tmp here is just 
-# example sakes.
-dataDir=/tmp/zookeeper
-# the port at which the clients will connect
-clientPort=2181
-# the maximum number of client connections.
-# increase this if you need to handle more clients
-#maxClientCnxns=60
-#
-# Be sure to read the maintenance section of the 
-# administrator guide before turning on autopurge.
-#
-# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
-#
-# The number of snapshots to retain in dataDir
-#autopurge.snapRetainCount=3
-# Purge task interval in hours
-# Set to "0" to disable auto purge feature
-#autopurge.purgeInterval=1
-#Four Letter Words commands:stat,ruok,conf,isro
-4lw.commands.whitelist=*
diff --git a/docker/build/hooks/build b/docker/build/hooks/build
old mode 100644
new mode 100755
index 6362fdd299..ce7362bf55
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
@@ -48,7 +48,12 @@ echo -e "mv $(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-incubati
 mv "$(pwd)"/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-"${VERSION}"-dolphinscheduler-bin.tar.gz $(pwd)/docker/build/
 
 # docker build
-echo -e "docker build --build-arg VERSION=${VERSION} -t $DOCKER_REPO:${VERSION} $(pwd)/docker/build/\n"
-sudo docker build --build-arg VERSION="${VERSION}" -t $DOCKER_REPO:"${VERSION}" "$(pwd)/docker/build/"
+BUILD_COMMAND="docker build --build-arg VERSION=${VERSION} -t $DOCKER_REPO:${VERSION} $(pwd)/docker/build/"
+echo -e "$BUILD_COMMAND\n"
+if (docker info 2> /dev/null | grep -i "ERROR"); then
+    sudo $BUILD_COMMAND
+else
+    $BUILD_COMMAND
+fi
 
 echo "------ dolphinscheduler end   - build -------"
diff --git a/docker/build/hooks/push b/docker/build/hooks/push
old mode 100644
new mode 100755
diff --git a/docker/build/startup-init-conf.sh b/docker/build/startup-init-conf.sh
old mode 100644
new mode 100755
index d5cd86f1a4..c3aadcd673
--- a/docker/build/startup-init-conf.sh
+++ b/docker/build/startup-init-conf.sh
@@ -39,9 +39,9 @@ export DATABASE_PARAMS=${DATABASE_PARAMS:-"characterEncoding=utf8"}
 export DOLPHINSCHEDULER_ENV_PATH=${DOLPHINSCHEDULER_ENV_PATH:-"/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh"}
 export DOLPHINSCHEDULER_DATA_BASEDIR_PATH=${DOLPHINSCHEDULER_DATA_BASEDIR_PATH:-"/tmp/dolphinscheduler"}
 export DOLPHINSCHEDULER_OPTS=${DOLPHINSCHEDULER_OPTS:-""}
-export RESOURCE_STORAGE_TYPE=${RESOURCE_STORAGE_TYPE:-"NONE"}
-export RESOURCE_UPLOAD_PATH=${RESOURCE_UPLOAD_PATH:-"/ds"}
-export FS_DEFAULT_FS=${FS_DEFAULT_FS:-"s3a://xxxx"}
+export RESOURCE_STORAGE_TYPE=${RESOURCE_STORAGE_TYPE:-"HDFS"}
+export RESOURCE_UPLOAD_PATH=${RESOURCE_UPLOAD_PATH:-"/dolphinscheduler"}
+export FS_DEFAULT_FS=${FS_DEFAULT_FS:-"file:///"}
 export FS_S3A_ENDPOINT=${FS_S3A_ENDPOINT:-"s3.xxx.amazonaws.com"}
 export FS_S3A_ACCESS_KEY=${FS_S3A_ACCESS_KEY:-"xxxxxxx"}
 export FS_S3A_SECRET_KEY=${FS_S3A_SECRET_KEY:-"xxxxxxx"}
@@ -81,7 +81,7 @@ export WORKER_WEIGHT=${WORKER_WEIGHT:-"100"}
 #============================================================================
 # alert plugin dir
 export ALERT_PLUGIN_DIR=${ALERT_PLUGIN_DIR:-"/opt/dolphinscheduler"}
-# XLS FILE
+# xls file
 export XLS_FILE_PATH=${XLS_FILE_PATH:-"/tmp/xls"}
 # mail
 export MAIL_SERVER_HOST=${MAIL_SERVER_HOST:-""}
@@ -99,12 +99,6 @@ export ENTERPRISE_WECHAT_SECRET=${ENTERPRISE_WECHAT_SECRET:-""}
 export ENTERPRISE_WECHAT_AGENT_ID=${ENTERPRISE_WECHAT_AGENT_ID:-""}
 export ENTERPRISE_WECHAT_USERS=${ENTERPRISE_WECHAT_USERS:-""}
 
-#============================================================================
-# Frontend
-#============================================================================
-export FRONTEND_API_SERVER_HOST=${FRONTEND_API_SERVER_HOST:-"127.0.0.1"}
-export FRONTEND_API_SERVER_PORT=${FRONTEND_API_SERVER_PORT:-"12345"}
-
 echo "generate app config"
 ls ${DOLPHINSCHEDULER_HOME}/conf/ | grep ".tpl" | while read line; do
 eval "cat << EOF
@@ -112,7 +106,3 @@ $(cat ${DOLPHINSCHEDULER_HOME}/conf/${line})
 EOF
 " > ${DOLPHINSCHEDULER_HOME}/conf/${line%.*}
 done
-
-echo "generate nginx config"
-sed -i "s/FRONTEND_API_SERVER_HOST/${FRONTEND_API_SERVER_HOST}/g" /etc/nginx/conf.d/dolphinscheduler.conf
-sed -i "s/FRONTEND_API_SERVER_PORT/${FRONTEND_API_SERVER_PORT}/g" /etc/nginx/conf.d/dolphinscheduler.conf
\ No newline at end of file
diff --git a/docker/build/startup.sh b/docker/build/startup.sh
old mode 100644
new mode 100755
index 0511788d48..8bd1895cc0
--- a/docker/build/startup.sh
+++ b/docker/build/startup.sh
@@ -22,8 +22,8 @@ DOLPHINSCHEDULER_BIN=${DOLPHINSCHEDULER_HOME}/bin
 DOLPHINSCHEDULER_SCRIPT=${DOLPHINSCHEDULER_HOME}/script
 DOLPHINSCHEDULER_LOGS=${DOLPHINSCHEDULER_HOME}/logs
 
-# start database
-initDatabase() {
+# wait database
+waitDatabase() {
     echo "test ${DATABASE_TYPE} service"
     while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
         counter=$((counter+1))
@@ -43,19 +43,22 @@ initDatabase() {
             exit 1
         fi
     else
-        v=$(sudo -u postgres PGPASSWORD=${DATABASE_PASSWORD} psql -h ${DATABASE_HOST} -p ${DATABASE_PORT} -U ${DATABASE_USERNAME} -d ${DATABASE_DATABASE} -tAc "select 1")
+        v=$(PGPASSWORD=${DATABASE_PASSWORD} psql -h ${DATABASE_HOST} -p ${DATABASE_PORT} -U ${DATABASE_USERNAME} -d ${DATABASE_DATABASE} -tAc "select 1")
         if [ "$(echo ${v} | grep 'FATAL' | wc -l)" -eq 1 ]; then
             echo "Error: Can't connect to database...${v}"
             exit 1
         fi
     fi
+}
 
+# init database
+initDatabase() {
     echo "import sql data"
     ${DOLPHINSCHEDULER_SCRIPT}/create-dolphinscheduler.sh
 }
 
-# start zk
-initZK() {
+# wait zk
+waitZK() {
     echo "connect remote zookeeper"
     echo "${ZOOKEEPER_QUORUM}" | awk -F ',' 'BEGIN{ i=1 }{ while( i <= NF ){ print $i; i++ } }' | while read line; do
         while ! nc -z ${line%:*} ${line#*:}; do
@@ -70,12 +73,6 @@ initZK() {
     done
 }
 
-# start nginx
-initNginx() {
-    echo "start nginx"
-    nginx &
-}
-
 # start master-server
 initMasterServer() {
     echo "start master-server"
@@ -115,59 +112,54 @@ initAlertServer() {
 printUsage() {
     echo -e "Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system,"
     echo -e "dedicated to solving the complex dependencies in data processing, making the scheduling system out of the box for data processing.\n"
-    echo -e "Usage: [ all | master-server | worker-server | api-server | alert-server | frontend ]\n"
-    printf "%-13s:  %s\n" "all"           "Run master-server, worker-server, api-server, alert-server and frontend."
+    echo -e "Usage: [ all | master-server | worker-server | api-server | alert-server ]\n"
+    printf "%-13s:  %s\n" "all"           "Run master-server, worker-server, api-server and alert-server"
     printf "%-13s:  %s\n" "master-server" "MasterServer is mainly responsible for DAG task split, task submission monitoring."
-    printf "%-13s:  %s\n" "worker-server" "WorkerServer is mainly responsible for task execution and providing log services.."
-    printf "%-13s:  %s\n" "api-server"    "ApiServer is mainly responsible for processing requests from the front-end UI layer."
+    printf "%-13s:  %s\n" "worker-server" "WorkerServer is mainly responsible for task execution and providing log services."
+    printf "%-13s:  %s\n" "api-server"    "ApiServer is mainly responsible for processing requests and providing the front-end UI layer."
     printf "%-13s:  %s\n" "alert-server"  "AlertServer mainly include Alarms."
-    printf "%-13s:  %s\n" "frontend"      "Frontend mainly provides various visual operation interfaces of the system."
 }
 
 # init config file
 source /root/startup-init-conf.sh
 
-LOGFILE=/var/log/nginx/access.log
 case "$1" in
     (all)
-        initZK
+        waitZK
+        waitDatabase
         initDatabase
         initMasterServer
         initWorkerServer
         initApiServer
         initAlertServer
         initLoggerServer
-        initNginx
-        LOGFILE=/var/log/nginx/access.log
+        LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-api-server.log
     ;;
     (master-server)
-        initZK
-        initDatabase
+        waitZK
+        waitDatabase
         initMasterServer
         LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-master.log
     ;;
     (worker-server)
-        initZK
-        initDatabase
+        waitZK
+        waitDatabase
         initWorkerServer
         initLoggerServer
         LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-worker.log
     ;;
     (api-server)
-        initZK
+        waitZK
+        waitDatabase
         initDatabase
         initApiServer
         LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-api-server.log
     ;;
     (alert-server)
-        initDatabase
+        waitDatabase
         initAlertServer
         LOGFILE=${DOLPHINSCHEDULER_LOGS}/dolphinscheduler-alert.log
     ;;
-    (frontend)
-        initNginx
-        LOGFILE=/var/log/nginx/access.log
-    ;;
     (help)
         printUsage
         exit 1
@@ -179,8 +171,7 @@ case "$1" in
 esac
 
 # init directories and log files
-mkdir -p ${DOLPHINSCHEDULER_LOGS} && mkdir -p /var/log/nginx/ && cat /dev/null >> ${LOGFILE}
+mkdir -p ${DOLPHINSCHEDULER_LOGS} && cat /dev/null >> ${LOGFILE}
 
 echo "tail begin"
 exec bash -c "tail -n 1 -f ${LOGFILE}"
-
diff --git a/docker/docker-swarm/check b/docker/docker-swarm/check
old mode 100644
new mode 100755
index 59203c5b3e..f4093664da
--- a/docker/docker-swarm/check
+++ b/docker/docker-swarm/check
@@ -25,7 +25,7 @@ else
     echo "Server start failed "$server_num
     exit 1
 fi
-ready=`curl http://127.0.0.1:8888/dolphinscheduler/login -d 'userName=admin&userPassword=dolphinscheduler123' -v | grep "login success" | wc -l`
+ready=`curl http://127.0.0.1:12345/dolphinscheduler/login -d 'userName=admin&userPassword=dolphinscheduler123' -v | grep "login success" | wc -l`
 if [ $ready -eq 1 ]
 then
     echo "Servers is ready"
diff --git a/docker/docker-swarm/docker-compose.yml b/docker/docker-swarm/docker-compose.yml
index 349b3ad790..04a9bc556d 100644
--- a/docker/docker-swarm/docker-compose.yml
+++ b/docker/docker-swarm/docker-compose.yml
@@ -31,6 +31,7 @@ services:
     volumes:
     - dolphinscheduler-postgresql:/bitnami/postgresql
     - dolphinscheduler-postgresql-initdb:/docker-entrypoint-initdb.d
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
@@ -45,13 +46,14 @@ services:
       ZOO_4LW_COMMANDS_WHITELIST: srvr,ruok,wchs,cons
     volumes:
     - dolphinscheduler-zookeeper:/bitnami/zookeeper
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
   dolphinscheduler-api:
     image: apache/dolphinscheduler:latest
     container_name: dolphinscheduler-api
-    command: ["api-server"]
+    command: api-server
     ports:
     - 12345:12345
     environment:
@@ -62,6 +64,9 @@ services:
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      RESOURCE_STORAGE_TYPE: HDFS
+      RESOURCE_UPLOAD_PATH: /dolphinscheduler
+      FS_DEFAULT_FS: file:///
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "ApiApplicationServer"]
       interval: 30s
@@ -72,37 +77,16 @@ services:
     - dolphinscheduler-postgresql
     - dolphinscheduler-zookeeper
     volumes:
-    - ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
-    networks:
-    - dolphinscheduler
-
-  dolphinscheduler-frontend:
-    image: apache/dolphinscheduler:latest
-    container_name: dolphinscheduler-frontend
-    command: ["frontend"]
-    ports:
-    - 8888:8888
-    environment:
-      TZ: Asia/Shanghai
-      FRONTEND_API_SERVER_HOST: dolphinscheduler-api
-      FRONTEND_API_SERVER_PORT: 12345
-    healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "8888"]
-      interval: 30s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
-    depends_on:
-    - dolphinscheduler-api
-    volumes:
-    - ./dolphinscheduler-logs:/var/log/nginx
+    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    - dolphinscheduler-resource-local:/dolphinscheduler
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
   dolphinscheduler-alert:
     image: apache/dolphinscheduler:latest
     container_name: dolphinscheduler-alert
-    command: ["alert-server"]
+    command: alert-server
     environment:
       TZ: Asia/Shanghai
       XLS_FILE_PATH: "/tmp/xls"
@@ -133,14 +117,15 @@ services:
     depends_on:
     - dolphinscheduler-postgresql
     volumes:
-    - ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
   dolphinscheduler-master:
     image: apache/dolphinscheduler:latest
     container_name: dolphinscheduler-master
-    command: ["master-server"]
+    command: master-server
     ports:
     - 5678:5678
     environment:
@@ -168,14 +153,15 @@ services:
     - dolphinscheduler-postgresql
     - dolphinscheduler-zookeeper
     volumes:
-    - ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
   dolphinscheduler-worker:
     image: apache/dolphinscheduler:latest
     container_name: dolphinscheduler-worker
-    command: ["worker-server"]
+    command: worker-server
     ports:
     - 1234:1234
     - 50051:50051
@@ -188,30 +174,40 @@ services:
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUP: "default"
       WORKER_WEIGHT: "100"
-      DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler"
+      DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
+      XLS_FILE_PATH: "/tmp/xls"
+      MAIL_SERVER_HOST: ""
+      MAIL_SERVER_PORT: ""
+      MAIL_SENDER: ""
+      MAIL_USER: ""
+      MAIL_PASSWD: ""
+      MAIL_SMTP_STARTTLS_ENABLE: "false"
+      MAIL_SMTP_SSL_ENABLE: "false"
+      MAIL_SMTP_SSL_TRUST: ""
       DATABASE_HOST: dolphinscheduler-postgresql
       DATABASE_PORT: 5432
       DATABASE_USERNAME: root
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      RESOURCE_STORAGE_TYPE: HDFS
+      RESOURCE_UPLOAD_PATH: /dolphinscheduler
+      FS_DEFAULT_FS: file:///
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "WorkerServer"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
-    depends_on: 
+    depends_on:
     - dolphinscheduler-postgresql
     - dolphinscheduler-zookeeper
     volumes:
-    - type: bind
-      source: ./dolphinscheduler_env.sh
-      target: /opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh
-    - type: volume
-      source: dolphinscheduler-worker-data
-      target: /tmp/dolphinscheduler
-    - ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    - ./dolphinscheduler_env.sh:/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh
+    - dolphinscheduler-worker-data:/tmp/dolphinscheduler
+    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
+    - dolphinscheduler-resource-local:/dolphinscheduler
+    restart: unless-stopped
     networks:
     - dolphinscheduler
 
@@ -224,7 +220,5 @@ volumes:
   dolphinscheduler-postgresql-initdb:
   dolphinscheduler-zookeeper:
   dolphinscheduler-worker-data:
-
-configs:
-  dolphinscheduler-worker-task-env:
-    file: ./dolphinscheduler_env.sh
\ No newline at end of file
+  dolphinscheduler-logs:
+  dolphinscheduler-resource-local:
\ No newline at end of file
diff --git a/docker/docker-swarm/docker-stack.yml b/docker/docker-swarm/docker-stack.yml
index dff4a47b2c..39c36347bb 100644
--- a/docker/docker-swarm/docker-stack.yml
+++ b/docker/docker-swarm/docker-stack.yml
@@ -20,13 +20,13 @@ services:
 
   dolphinscheduler-postgresql:
     image: bitnami/postgresql:latest
+    ports:
+    - 5432:5432
     environment:
       TZ: Asia/Shanghai
       POSTGRESQL_USERNAME: root
       POSTGRESQL_PASSWORD: root
       POSTGRESQL_DATABASE: dolphinscheduler
-    ports:
-    - 5432:5432
     volumes:
     - dolphinscheduler-postgresql:/bitnami/postgresql
     networks:
@@ -37,12 +37,12 @@ services:
 
   dolphinscheduler-zookeeper:
     image: bitnami/zookeeper:latest
+    ports:
+    - 2181:2181
     environment:
       TZ: Asia/Shanghai
       ALLOW_ANONYMOUS_LOGIN: "yes"
       ZOO_4LW_COMMANDS_WHITELIST: srvr,ruok,wchs,cons
-    ports:
-    - 2181:2181
     volumes:
     - dolphinscheduler-zookeeper:/bitnami/zookeeper
     networks:
@@ -53,7 +53,9 @@ services:
 
   dolphinscheduler-api:
     image: apache/dolphinscheduler:latest
-    command: ["api-server"]
+    command: api-server
+    ports:
+    - 12345:12345
     environment:
       TZ: Asia/Shanghai
       DATABASE_HOST: dolphinscheduler-postgresql
@@ -62,39 +64,17 @@ services:
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
-    ports:
-    - 12345:12345
+      RESOURCE_STORAGE_TYPE: HDFS
+      RESOURCE_UPLOAD_PATH: /dolphinscheduler
+      FS_DEFAULT_FS: file:///
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "ApiApplicationServer"]
-      interval: 30
+      interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
     volumes:
     - dolphinscheduler-logs:/opt/dolphinscheduler/logs
-    networks: 
-    - dolphinscheduler
-    deploy:
-      mode: replicated
-      replicas: 1
-
-  dolphinscheduler-frontend:
-    image: apache/dolphinscheduler:latest
-    command: ["frontend"]
-    ports:
-    - 8888:8888
-    environment:
-      TZ: Asia/Shanghai
-      FRONTEND_API_SERVER_HOST: dolphinscheduler-api
-      FRONTEND_API_SERVER_PORT: 12345
-    healthcheck:
-      test: ["CMD", "nc", "-z", "localhost", "8888"]
-      interval: 30
-      timeout: 5s
-      retries: 3
-      start_period: 30s
-    volumes:
-    - dolphinscheduler-logs:/var/log/nginx
     networks:
     - dolphinscheduler
     deploy:
@@ -103,7 +83,7 @@ services:
 
   dolphinscheduler-alert:
     image: apache/dolphinscheduler:latest
-    command: ["alert-server"]
+    command: alert-server
     environment:
       TZ: Asia/Shanghai
       XLS_FILE_PATH: "/tmp/xls"
@@ -127,13 +107,13 @@ services:
       DATABASE_DATABASE: dolphinscheduler
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "AlertServer"]
-      interval: 30
+      interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
     volumes:
     - dolphinscheduler-logs:/opt/dolphinscheduler/logs
-    networks: 
+    networks:
     - dolphinscheduler
     deploy:
       mode: replicated
@@ -141,10 +121,10 @@ services:
 
   dolphinscheduler-master:
     image: apache/dolphinscheduler:latest
-    command: ["master-server"]
-    ports: 
+    command: master-server
+    ports:
     - 5678:5678
-    environment: 
+    environment:
       TZ: Asia/Shanghai
       MASTER_EXEC_THREADS: "100"
       MASTER_EXEC_TASK_NUM: "20"
@@ -161,7 +141,7 @@ services:
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "MasterServer"]
-      interval: 30
+      interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
@@ -175,11 +155,11 @@ services:
 
   dolphinscheduler-worker:
     image: apache/dolphinscheduler:latest
-    command: ["worker-server"]
-    ports: 
+    command: worker-server
+    ports:
     - 1234:1234
     - 50051:50051
-    environment: 
+    environment:
       TZ: Asia/Shanghai
       WORKER_EXEC_THREADS: "100"
       WORKER_HEARTBEAT_INTERVAL: "10"
@@ -188,25 +168,37 @@ services:
       WORKER_RESERVED_MEMORY: "0.1"
       WORKER_GROUP: "default"
       WORKER_WEIGHT: "100"
-      DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler"
+      DOLPHINSCHEDULER_DATA_BASEDIR_PATH: /tmp/dolphinscheduler
+      XLS_FILE_PATH: "/tmp/xls"
+      MAIL_SERVER_HOST: ""
+      MAIL_SERVER_PORT: ""
+      MAIL_SENDER: ""
+      MAIL_USER: ""
+      MAIL_PASSWD: ""
+      MAIL_SMTP_STARTTLS_ENABLE: "false"
+      MAIL_SMTP_SSL_ENABLE: "false"
+      MAIL_SMTP_SSL_TRUST: ""
       DATABASE_HOST: dolphinscheduler-postgresql
       DATABASE_PORT: 5432
       DATABASE_USERNAME: root
       DATABASE_PASSWORD: root
       DATABASE_DATABASE: dolphinscheduler
       ZOOKEEPER_QUORUM: dolphinscheduler-zookeeper:2181
+      RESOURCE_STORAGE_TYPE: HDFS
+      RESOURCE_UPLOAD_PATH: /dolphinscheduler
+      FS_DEFAULT_FS: file:///
     healthcheck:
       test: ["CMD", "/root/checkpoint.sh", "WorkerServer"]
-      interval: 30
+      interval: 30s
       timeout: 5s
       retries: 3
       start_period: 30s
-    volumes:
-    - dolphinscheduler-worker-data:/tmp/dolphinscheduler
-    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
     configs:
     - source: dolphinscheduler-worker-task-env
       target: /opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh
+    volumes:
+    - dolphinscheduler-worker-data:/tmp/dolphinscheduler
+    - dolphinscheduler-logs:/opt/dolphinscheduler/logs
     networks:
     - dolphinscheduler
     deploy:
diff --git a/docker/docker-swarm/dolphinscheduler_env.sh b/docker/docker-swarm/dolphinscheduler_env.sh
old mode 100644
new mode 100755
index 654318cb41..7fd39335ae
--- a/docker/docker-swarm/dolphinscheduler_env.sh
+++ b/docker/docker-swarm/dolphinscheduler_env.sh
@@ -15,6 +15,14 @@
 # limitations under the License.
 #
 
-export PYTHON_HOME=/usr/bin/python2
+export HADOOP_HOME=/opt/soft/hadoop
+export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
+export SPARK_HOME1=/opt/soft/spark1
+export SPARK_HOME2=/opt/soft/spark2
+export PYTHON_HOME=/usr/bin/python
 export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-export PATH=$PYTHON_HOME:$JAVA_HOME/bin:$PATH
\ No newline at end of file
+export HIVE_HOME=/opt/soft/hive
+export FLINK_HOME=/opt/soft/flink
+export DATAX_HOME=/opt/soft/datax/bin/datax.py
+
+export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME:$PATH
diff --git a/dolphinscheduler-ui/install-dolphinscheduler-ui.sh b/dolphinscheduler-ui/install-dolphinscheduler-ui.sh
old mode 100644
new mode 100755
diff --git a/e2e/src/test/resources/config/config.properties b/e2e/src/test/resources/config/config.properties
index 352d9375be..135af0baa0 100644
--- a/e2e/src/test/resources/config/config.properties
+++ b/e2e/src/test/resources/config/config.properties
@@ -17,7 +17,7 @@
 
 ############### project ##############
 # login url
-LOGIN_URL=http://127.0.0.1:8888/dolphinscheduler/
+LOGIN_URL=http://127.0.0.1:12345/dolphinscheduler/
 #login username
 USER_NAME=admin
 #login password
diff --git a/script/create-dolphinscheduler.sh b/script/create-dolphinscheduler.sh
old mode 100644
new mode 100755
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
old mode 100644
new mode 100755
index 5e7652199e..a87e62e187
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -54,6 +54,12 @@ fi
 log=$DOLPHINSCHEDULER_LOG_DIR/dolphinscheduler-$command-$HOSTNAME.out
 pid=$DOLPHINSCHEDULER_PID_DIR/dolphinscheduler-$command.pid
 
+# print logs to /dev/null in docker
+if [ "$DOCKER" = "true" ]; then
+  echo "start in docker"
+  log=/dev/null
+fi
+
 cd $DOLPHINSCHEDULER_HOME
 
 if [ "$command" = "api-server" ]; then
diff --git a/script/env/dolphinscheduler_env.sh b/script/env/dolphinscheduler_env.sh
old mode 100644
new mode 100755
diff --git a/script/monitor-server.sh b/script/monitor-server.sh
old mode 100644
new mode 100755
diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh
old mode 100644
new mode 100755
diff --git a/script/start-all.sh b/script/start-all.sh
old mode 100644
new mode 100755
diff --git a/script/status-all.sh b/script/status-all.sh
old mode 100644
new mode 100755
diff --git a/script/stop-all.sh b/script/stop-all.sh
old mode 100644
new mode 100755
diff --git a/script/upgrade-dolphinscheduler.sh b/script/upgrade-dolphinscheduler.sh
old mode 100644
new mode 100755

From 60016fbd669c4a19dd0894ad4eda8a34f5b50f76 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 21:28:02 +0800
Subject: [PATCH 78/87] [Improvement-4740][UI] Set the default Tenant as
 default or the first exist tenant in save process (#4742)

---
 .../src/js/conf/home/pages/dag/_source/udp/udp.vue          | 6 +++---
 .../home/pages/security/pages/users/_source/createUser.vue  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
index a040b4be43..50f6016191 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@@ -213,10 +213,10 @@
       this.timeout = dag.timeout || 0
       this.checkedTimeout = this.timeout !== 0
       this.$nextTick(() => {
-        if (dag.tenantId === -1) {
-          this.tenantId = this.store.state.user.userInfo.tenantId
-        } else {
+        if (dag.tenantId > -1) {
           this.tenantId = dag.tenantId
+        } else if (this.store.state.user.userInfo.tenantId) {
+          this.tenantId = this.store.state.user.userInfo.tenantId
         }
       })
     },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 882a54c230..e53128b23e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -293,7 +293,7 @@
             this.email = this.item.email
             this.phone = this.item.phone
             this.userState = this.item.state + '' || '1'
-            if (this.item.tenantName) {
+            if (this.item.tenantId) {
               this.tenantId = this.item.tenantId
             }
             this.$nextTick(() => {
@@ -311,7 +311,7 @@
           this.email = this.item.email
           this.phone = this.item.phone
           this.userState = this.state + '' || '1'
-          if (this.item.tenantName) {
+          if (this.item.tenantId) {
             this.tenantId = this.item.tenantId
           }
           if (this.queueList.length > 0) {

From a6ea04d4a321db5e74751ff076b679830ca21282 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 21:31:41 +0800
Subject: [PATCH 79/87] [Fix-4741][UI] Fix task instance log not change (#4744)

---
 .../home/pages/projects/pages/taskInstance/_source/list.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index 8aa387afc6..b5bb553865 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -76,7 +76,7 @@
       :show-close="false"
       :visible.sync="logDialog"
       width="auto">
-      <m-log :item="item" :source="source" :logId="logId" @ok="ok" @close="close"></m-log>
+      <m-log :key="logId" :item="item" :source="source" :logId="logId" @ok="ok" @close="close"></m-log>
     </el-dialog>
   </div>
 </template>

From 53598fdd18a31797d8c6ac796a9c49e537d6e4e9 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 21:33:45 +0800
Subject: [PATCH 80/87] [Fix-3298][K8s] Fix task log disappear after recreating
 or upgrading helm release (#4755)

* [Improvement][K8s] Alter column host varchar(15) to varchar(135) for long host

* [Improvement][K8s] Improve getHost and getAddr in NetUtils

* [Improvement][K8s] Replace getHost with getAddr
---
 .../dolphinscheduler/common/Constants.java    |  8 +++
 .../common/utils/NetUtils.java                | 26 +++++++--
 .../common/utils/NetUtilsTest.java            |  9 +++
 .../common/utils/OSUtilsTest.java             |  6 --
 .../master/registry/MasterRegistry.java       |  2 +-
 .../runner/ConditionsTaskExecThread.java      |  2 +-
 .../runner/DependentTaskExecThread.java       |  2 +-
 .../master/runner/MasterSchedulerService.java |  4 +-
 .../processor/TaskExecuteProcessor.java       |  2 +-
 .../worker/registry/WorkerRegistry.java       |  2 +-
 .../executor/NettyExecutorManagerTest.java    |  4 +-
 .../registry/ZookeeperNodeManagerTest.java    |  4 +-
 .../utils/ExecutionContextTestUtils.java      |  2 +-
 .../worker/registry/WorkerRegistryTest.java   |  2 +-
 pom.xml                                       |  1 +
 sql/dolphinscheduler-postgre.sql              |  4 +-
 sql/dolphinscheduler_mysql.sql                |  4 +-
 .../mysql/dolphinscheduler_ddl.sql            | 58 +++++++++++++++++++
 .../mysql/dolphinscheduler_dml.sql            | 16 +++++
 .../postgresql/dolphinscheduler_ddl.sql       | 52 +++++++++++++++++
 .../postgresql/dolphinscheduler_dml.sql       | 16 +++++
 21 files changed, 197 insertions(+), 29 deletions(-)
 create mode 100644 sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_ddl.sql
 create mode 100644 sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_dml.sql
 create mode 100644 sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_ddl.sql
 create mode 100644 sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_dml.sql

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 0520520621..45af3b2700 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.common;
 
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.utils.OSUtils;
+import org.apache.dolphinscheduler.common.utils.StringUtils;
 
 import java.util.regex.Pattern;
 
@@ -1042,4 +1043,11 @@ public final class Constants {
      * pstree, get pud and sub pid
      */
     public static final String PSTREE = "pstree";
+
+    /**
+     * docker & kubernetes
+     */
+    public static final boolean DOCKER_MODE = StringUtils.isNotEmpty(System.getenv("DOCKER"));
+    public static final boolean KUBERNETES_MODE = StringUtils.isNotEmpty(System.getenv("KUBERNETES_SERVICE_HOST")) && StringUtils.isNotEmpty(System.getenv("KUBERNETES_SERVICE_PORT"));
+
 }
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/NetUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/NetUtils.java
index ddb29730b7..6c761f3d00 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/NetUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/NetUtils.java
@@ -49,8 +49,6 @@ public class NetUtils {
     private static final String NETWORK_PRIORITY_INNER = "inner";
     private static final String NETWORK_PRIORITY_OUTER = "outer";
     private static final Logger logger = LoggerFactory.getLogger(NetUtils.class);
-    private static final String ANY_HOST_VALUE = "0.0.0.0";
-    private static final String LOCAL_HOST_VALUE = "127.0.0.1";
     private static InetAddress LOCAL_ADDRESS = null;
     private static volatile String HOST_ADDRESS;
 
@@ -58,6 +56,22 @@ public class NetUtils {
         throw new UnsupportedOperationException("Construct NetUtils");
     }
 
+    /**
+     * get addr like host:port
+     * @return addr
+     */
+    public static String getAddr(String host, int port) {
+        return String.format("%s:%d", host, port);
+    }
+
+    /**
+     * get addr like host:port
+     * @return addr
+     */
+    public static String getAddr(int port) {
+        return getAddr(getHost(), port);
+    }
+
     public static String getHost() {
         if (HOST_ADDRESS != null) {
             return HOST_ADDRESS;
@@ -65,10 +79,10 @@ public class NetUtils {
 
         InetAddress address = getLocalAddress();
         if (address != null) {
-            HOST_ADDRESS = address.getHostAddress();
+            HOST_ADDRESS = Constants.KUBERNETES_MODE ? address.getHostName() : address.getHostAddress();
             return HOST_ADDRESS;
         }
-        return LOCAL_HOST_VALUE;
+        return Constants.KUBERNETES_MODE ? "localhost" : "127.0.0.1";
     }
 
     private static InetAddress getLocalAddress() {
@@ -153,8 +167,8 @@ public class NetUtils {
         String name = address.getHostAddress();
         return (name != null
                 && IP_PATTERN.matcher(name).matches()
-                && !ANY_HOST_VALUE.equals(name)
-                && !LOCAL_HOST_VALUE.equals(name));
+                && !address.isAnyLocalAddress()
+                && !address.isLoopbackAddress());
     }
 
     /**
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/NetUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/NetUtilsTest.java
index 59276295ae..d2461ecfeb 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/NetUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/NetUtilsTest.java
@@ -29,6 +29,13 @@ import static org.mockito.Mockito.when;
  */
 public class NetUtilsTest {
 
+    @Test
+    public void testGetAddr() {
+        assertEquals(NetUtils.getHost() + ":5678", NetUtils.getAddr(5678));
+        assertEquals("127.0.0.1:5678", NetUtils.getAddr("127.0.0.1", 5678));
+        assertEquals("localhost:1234", NetUtils.getAddr("localhost", 1234));
+    }
+
     @Test
     public void testGetLocalHost() {
         assertNotNull(NetUtils.getHost());
@@ -45,9 +52,11 @@ public class NetUtilsTest {
         assertFalse(NetUtils.isValidV4Address(address));
         address = mock(InetAddress.class);
         when(address.getHostAddress()).thenReturn("0.0.0.0");
+        when(address.isAnyLocalAddress()).thenReturn(true);
         assertFalse(NetUtils.isValidV4Address(address));
         address = mock(InetAddress.class);
         when(address.getHostAddress()).thenReturn("127.0.0.1");
+        when(address.isLoopbackAddress()).thenReturn(true);
         assertFalse(NetUtils.isValidV4Address(address));
         address = mock(InetAddress.class);
         when(address.getHostAddress()).thenReturn("1.2.3.4");
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
index d005010f93..83cacb758b 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/OSUtilsTest.java
@@ -99,12 +99,6 @@ public class OSUtilsTest {
         Assert.assertNotEquals(0, processId);
     }
     @Test
-    public void getHost(){
-        String host = NetUtils.getHost();
-        Assert.assertNotNull(host);
-        Assert.assertNotEquals("", host);
-    }
-    @Test
     public void checkResource(){
         boolean resource = OSUtils.checkResource(100,0);
         Assert.assertTrue(resource);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
index 01218e5d8b..37d6e72243 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistry.java
@@ -135,7 +135,7 @@ public class MasterRegistry {
      */
     private String getLocalAddress() {
 
-        return NetUtils.getHost() + ":" + masterConfig.getListenPort();
+        return NetUtils.getAddr(masterConfig.getListenPort());
 
     }
 
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
index 11598d9ace..d0b314e0bf 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
@@ -125,7 +125,7 @@ public class ConditionsTaskExecThread extends MasterBaseTaskExecThread {
 
     private void initTaskParameters() {
         this.taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance));
-        this.taskInstance.setHost(NetUtils.getHost() + Constants.COLON + masterConfig.getListenPort());
+        this.taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort()));
         taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
         taskInstance.setStartTime(new Date());
         this.processService.saveTaskInstance(taskInstance);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
index 5b56911fd7..9f78e0c532 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
@@ -185,7 +185,7 @@ public class DependentTaskExecThread extends MasterBaseTaskExecThread {
 
     private void initTaskParameters() {
         taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance));
-        taskInstance.setHost(NetUtils.getHost() + Constants.COLON + masterConfig.getListenPort());
+        taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort()));
         taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
         taskInstance.setStartTime(new Date());
         processService.updateTaskInstance(taskInstance);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java
index b0e0528c3e..b2659bae52 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java
@@ -178,7 +178,7 @@ public class MasterSchedulerService extends Thread {
         }
     }
 
-    private String getLocalAddress(){
-        return NetUtils.getHost() + ":" + masterConfig.getListenPort();
+    private String getLocalAddress() {
+        return NetUtils.getAddr(masterConfig.getListenPort());
     }
 }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
index 18971dd363..fc8b33a488 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteProcessor.java
@@ -139,7 +139,7 @@ public class TaskExecuteProcessor implements NettyRequestProcessor {
             taskExecutionContext.getProcessInstanceId(),
             taskExecutionContext.getTaskInstanceId()));
 
-        taskExecutionContext.setHost(NetUtils.getHost() + ":" + workerConfig.getListenPort());
+        taskExecutionContext.setHost(NetUtils.getAddr(workerConfig.getListenPort()));
         taskExecutionContext.setStartTime(new Date());
         taskExecutionContext.setLogPath(LogUtils.getTaskLogPath(taskExecutionContext));
         taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.RUNNING_EXECUTION);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
index 904ea3a807..e779d5deb3 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistry.java
@@ -169,7 +169,7 @@ public class WorkerRegistry {
      * get local address
      */
     private String getLocalAddress() {
-        return NetUtils.getHost() + COLON + workerConfig.getListenPort();
+        return NetUtils.getAddr(workerConfig.getListenPort());
     }
 
     /**
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManagerTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManagerTest.java
index f7d98baed1..f8e6e65521 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManagerTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/executor/NettyExecutorManagerTest.java
@@ -79,7 +79,7 @@ public class NettyExecutorManagerTest {
                 .buildProcessDefinitionRelatedInfo(processDefinition)
                 .create();
         ExecutionContext executionContext = new ExecutionContext(context.toCommand(), ExecutorType.WORKER);
-        executionContext.setHost(Host.of(NetUtils.getHost() + ":" + serverConfig.getListenPort()));
+        executionContext.setHost(Host.of(NetUtils.getAddr(serverConfig.getListenPort())));
         Boolean execute = nettyExecutorManager.execute(executionContext);
         Assert.assertTrue(execute);
         nettyRemotingServer.close();
@@ -98,7 +98,7 @@ public class NettyExecutorManagerTest {
                 .buildProcessDefinitionRelatedInfo(processDefinition)
                 .create();
         ExecutionContext executionContext = new ExecutionContext(context.toCommand(), ExecutorType.WORKER);
-        executionContext.setHost(Host.of(NetUtils.getHost() + ":4444"));
+        executionContext.setHost(Host.of(NetUtils.getAddr(4444)));
         nettyExecutorManager.execute(executionContext);
 
     }
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java
index f6eb861069..c7fa8f3b65 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java
@@ -75,7 +75,7 @@ public class ZookeeperNodeManagerTest {
         Set<String> masterNodes = zookeeperNodeManager.getMasterNodes();
         Assert.assertTrue(CollectionUtils.isNotEmpty(masterNodes));
         Assert.assertEquals(1, masterNodes.size());
-        Assert.assertEquals(NetUtils.getHost() + ":" + masterConfig.getListenPort(), masterNodes.iterator().next());
+        Assert.assertEquals(NetUtils.getAddr(masterConfig.getListenPort()), masterNodes.iterator().next());
         workerRegistry.unRegistry();
     }
 
@@ -105,7 +105,7 @@ public class ZookeeperNodeManagerTest {
         Set<String> workerNodes = zookeeperNodeManager.getWorkerGroupNodes("default");
         Assert.assertTrue(CollectionUtils.isNotEmpty(workerNodes));
         Assert.assertEquals(1, workerNodes.size());
-        Assert.assertEquals(NetUtils.getHost() + ":" + workerConfig.getListenPort(), workerNodes.iterator().next());
+        Assert.assertEquals(NetUtils.getAddr(workerConfig.getListenPort()), workerNodes.iterator().next());
         workerRegistry.unRegistry();
     }
 }
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ExecutionContextTestUtils.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ExecutionContextTestUtils.java
index 3d570b24b9..0894c1b0dd 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ExecutionContextTestUtils.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ExecutionContextTestUtils.java
@@ -47,7 +47,7 @@ public class ExecutionContextTestUtils {
                 .buildProcessDefinitionRelatedInfo(processDefinition)
                 .create();
         ExecutionContext executionContext = new ExecutionContext(context.toCommand(), ExecutorType.WORKER);
-        executionContext.setHost(Host.of(NetUtils.getHost() + ":" + port));
+        executionContext.setHost(Host.of(NetUtils.getAddr(port)));
 
         return executionContext;
     }
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryTest.java
index 0490d934e6..a71e48030d 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryTest.java
@@ -113,7 +113,7 @@ public class WorkerRegistryTest {
 
         int i = 0;
         for (String workerGroup : workerConfig.getWorkerGroups()) {
-            String workerZkPath = workerPath + "/" + workerGroup.trim() + "/" + (NetUtils.getHost() + ":" + workerConfig.getListenPort());
+            String workerZkPath = workerPath + "/" + workerGroup.trim() + "/" + (NetUtils.getAddr(workerConfig.getListenPort()));
             String heartbeat = zookeeperRegistryCenter.getZookeeperCachedOperator().get(workerZkPath);
             if (0 == i) {
                 Assert.assertTrue(workerZkPath.startsWith("/dolphinscheduler/nodes/worker/test/"));
diff --git a/pom.xml b/pom.xml
index 6d7446f8d1..48ab95aa0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,6 +839,7 @@
                         <include>**/common/utils/IpUtilsTest.java</include>
                         <include>**/common/utils/JSONUtilsTest.java</include>
                         <include>**/common/utils/LoggerUtilsTest.java</include>
+                        <include>**/common/utils/NetUtilsTest.java</include>
                         <include>**/common/utils/OSUtilsTest.java</include>
                         <include>**/common/utils/ParameterUtilsTest.java</include>
                         <include>**/common/utils/TimePlaceholderUtilsTest.java</include>
diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index b8f638ff99..b242205d3f 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -348,7 +348,7 @@ CREATE TABLE t_ds_process_instance (
   start_time timestamp DEFAULT NULL ,
   end_time timestamp DEFAULT NULL ,
   run_times int DEFAULT NULL ,
-  host varchar(45) DEFAULT NULL ,
+  host varchar(135) DEFAULT NULL ,
   command_type int DEFAULT NULL ,
   command_param text ,
   task_depend_type int DEFAULT NULL ,
@@ -562,7 +562,7 @@ CREATE TABLE t_ds_task_instance (
   submit_time timestamp DEFAULT NULL ,
   start_time timestamp DEFAULT NULL ,
   end_time timestamp DEFAULT NULL ,
-  host varchar(45) DEFAULT NULL ,
+  host varchar(135) DEFAULT NULL ,
   execute_path varchar(200) DEFAULT NULL ,
   log_path varchar(200) DEFAULT NULL ,
   alert_flag int DEFAULT NULL ,
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 890e00344b..bb6588dbec 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -458,7 +458,7 @@ CREATE TABLE `t_ds_process_instance` (
   `start_time` datetime DEFAULT NULL COMMENT 'process instance start time',
   `end_time` datetime DEFAULT NULL COMMENT 'process instance end time',
   `run_times` int(11) DEFAULT NULL COMMENT 'process instance run times',
-  `host` varchar(45) DEFAULT NULL COMMENT 'process instance host',
+  `host` varchar(135) DEFAULT NULL COMMENT 'process instance host',
   `command_type` tinyint(4) DEFAULT NULL COMMENT 'command type',
   `command_param` text COMMENT 'json command parameters',
   `task_depend_type` tinyint(4) DEFAULT NULL COMMENT 'task depend type. 0: only current node,1:before the node,2:later nodes',
@@ -697,7 +697,7 @@ CREATE TABLE `t_ds_task_instance` (
   `submit_time` datetime DEFAULT NULL COMMENT 'task submit time',
   `start_time` datetime DEFAULT NULL COMMENT 'task start time',
   `end_time` datetime DEFAULT NULL COMMENT 'task end time',
-  `host` varchar(45) DEFAULT NULL COMMENT 'host of task running on',
+  `host` varchar(135) DEFAULT NULL COMMENT 'host of task running on',
   `execute_path` varchar(200) DEFAULT NULL COMMENT 'task execute path in the host',
   `log_path` varchar(200) DEFAULT NULL COMMENT 'task log path',
   `alert_flag` tinyint(4) DEFAULT NULL COMMENT 'whether alert',
diff --git a/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_ddl.sql b/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..5635073390
--- /dev/null
+++ b/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_ddl.sql
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+
+-- uc_dolphin_T_t_ds_process_instance_R_host
+drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_process_instance_R_host;
+delimiter d//
+CREATE PROCEDURE uc_dolphin_T_t_ds_process_instance_R_host()
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+        WHERE TABLE_NAME='t_ds_process_instance'
+        AND TABLE_SCHEMA=(SELECT DATABASE())
+        AND COLUMN_NAME ='host')
+    THEN
+        ALTER TABLE t_ds_process_instance MODIFY COLUMN `host` varchar(135);
+    END IF;
+END;
+
+d//
+
+delimiter ;
+CALL uc_dolphin_T_t_ds_process_instance_R_host;
+DROP PROCEDURE uc_dolphin_T_t_ds_process_instance_R_host;
+
+-- uc_dolphin_T_t_ds_task_instance_R_host
+drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_R_host;
+delimiter d//
+CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_R_host()
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+        WHERE TABLE_NAME='t_ds_task_instance'
+        AND TABLE_SCHEMA=(SELECT DATABASE())
+        AND COLUMN_NAME ='host')
+    THEN
+        ALTER TABLE t_ds_task_instance MODIFY COLUMN `host` varchar(135);
+    END IF;
+END;
+
+d//
+
+delimiter ;
+CALL uc_dolphin_T_t_ds_task_instance_R_host;
+DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_R_host;
diff --git a/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_dml.sql b/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..38964cc551
--- /dev/null
+++ b/sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
\ No newline at end of file
diff --git a/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..6dd15f7b07
--- /dev/null
+++ b/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_ddl.sql
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+-- uc_dolphin_T_t_ds_process_instance_A_host
+delimiter d//
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_process_instance_A_host() RETURNS void AS $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+        WHERE TABLE_NAME='t_ds_process_instance'
+        AND COLUMN_NAME ='host')
+    THEN
+        ALTER TABLE t_ds_process_instance ALTER COLUMN host type varchar(135);
+    END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+delimiter ;
+SELECT uc_dolphin_T_t_ds_process_instance_A_host();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_process_instance_A_host();
+
+-- uc_dolphin_T_t_ds_task_instance_A_host
+delimiter d//
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_host() RETURNS void AS $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+        WHERE TABLE_NAME='t_ds_task_instance'
+        AND COLUMN_NAME ='host')
+    THEN
+        ALTER TABLE t_ds_task_instance ALTER COLUMN host type varchar(135);
+    END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+delimiter ;
+SELECT uc_dolphin_T_t_ds_task_instance_A_host();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_host();
diff --git a/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_dml.sql b/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..38964cc551
--- /dev/null
+++ b/sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
\ No newline at end of file

From 93514ddf316475caf3c8498b48c31c807c29c6f1 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 21:35:23 +0800
Subject: [PATCH 81/87] [Improvement][K8s] Improve K8s for helm (#4746)

---
 docker/kubernetes/dolphinscheduler/Chart.yaml |  10 +-
 docker/kubernetes/dolphinscheduler/README.md  |  37 +--
 .../dolphinscheduler/requirements.yaml        |  25 --
 .../dolphinscheduler/requirements.yaml~HEAD   |  25 --
 .../dolphinscheduler/requirements.yaml~HEAD_0 |  25 --
 .../dolphinscheduler/requirements.yaml~dev    |  25 --
 .../dolphinscheduler/requirements.yaml~dev_0  |  25 --
 .../dolphinscheduler/templates/NOTES.txt      |   6 +-
 .../dolphinscheduler/templates/_helpers.tpl   |   4 +-
 .../configmap-dolphinscheduler-alert.yaml     |   1 +
 ...ml => configmap-dolphinscheduler-api.yaml} |  21 +-
 .../configmap-dolphinscheduler-common.yaml    |   8 +-
 .../configmap-dolphinscheduler-master.yaml    |   2 +-
 .../configmap-dolphinscheduler-worker.yaml    |   7 +-
 .../deployment-dolphinscheduler-alert.yaml    |  68 +---
 .../deployment-dolphinscheduler-api.yaml      |  48 +--
 .../deployment-dolphinscheduler-frontend.yaml | 119 -------
 .../dolphinscheduler/templates/ingress.yaml   |   2 +-
 .../templates/pvc-dolphinscheduler-alert.yaml |   2 +-
 .../templates/pvc-dolphinscheduler-api.yaml   |   2 +-
 ...ntend.yaml => secret-external-fs-s3a.yaml} |  20 +-
 .../statefulset-dolphinscheduler-master.yaml  |  96 +-----
 .../statefulset-dolphinscheduler-worker.yaml  | 184 ++++-------
 .../svc-dolphinscheduler-worker-headless.yaml |   4 +-
 .../kubernetes/dolphinscheduler/values.yaml   | 310 ++++++++----------
 25 files changed, 269 insertions(+), 807 deletions(-)
 delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml
 delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
 delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD_0
 delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~dev
 delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml~dev_0
 rename docker/kubernetes/dolphinscheduler/templates/{svc-dolphinscheduler-frontend.yaml => configmap-dolphinscheduler-api.yaml} (69%)
 delete mode 100644 docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
 rename docker/kubernetes/dolphinscheduler/templates/{pvc-dolphinscheduler-frontend.yaml => secret-external-fs-s3a.yaml} (66%)

diff --git a/docker/kubernetes/dolphinscheduler/Chart.yaml b/docker/kubernetes/dolphinscheduler/Chart.yaml
index 9d640869dd..1e0ca755b9 100644
--- a/docker/kubernetes/dolphinscheduler/Chart.yaml
+++ b/docker/kubernetes/dolphinscheduler/Chart.yaml
@@ -22,7 +22,7 @@ home: https://dolphinscheduler.apache.org
 icon: https://dolphinscheduler.apache.org/img/hlogo_colorful.svg
 keywords:
 - dolphinscheduler
-- Scheduler
+- scheduler
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -35,18 +35,18 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.0.0
+version: 1.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.3.0
+appVersion: 1.4.0
 
 dependencies:
 - name: postgresql
-  version: 8.x.x
+  version: 10.x.x
   repository: https://charts.bitnami.com/bitnami
   condition: postgresql.enabled
 - name: zookeeper
-  version: 5.x.x
+  version: 6.x.x
   repository: https://charts.bitnami.com/bitnami
   condition: zookeeper.enabled
diff --git a/docker/kubernetes/dolphinscheduler/README.md b/docker/kubernetes/dolphinscheduler/README.md
index 0691b1ed2e..318c3a9132 100644
--- a/docker/kubernetes/dolphinscheduler/README.md
+++ b/docker/kubernetes/dolphinscheduler/README.md
@@ -7,19 +7,20 @@ This chart bootstraps a [Dolphin Scheduler](https://dolphinscheduler.apache.org)
 
 ## Prerequisites
 
-- Kubernetes 1.10+
+- Helm 3.1.0+
+- Kubernetes 1.12+
 - PV provisioner support in the underlying infrastructure
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release`:
+To install the chart with the release name `dolphinscheduler`:
 
 ```bash
 $ git clone https://github.com/apache/incubator-dolphinscheduler.git
-$ cd incubator-dolphinscheduler/kubernetes/dolphinscheduler
+$ cd incubator-dolphinscheduler/docker/kubernetes/dolphinscheduler
 $ helm repo add bitnami https://charts.bitnami.com/bitnami
 $ helm dependency update .
-$ helm install --name dolphinscheduler .
+$ helm install dolphinscheduler .
 ```
 These commands deploy Dolphin Scheduler on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
@@ -30,7 +31,7 @@ These commands deploy Dolphin Scheduler on the Kubernetes cluster in the default
 To uninstall/delete the `dolphinscheduler` deployment:
 
 ```bash
-$ helm delete --purge dolphinscheduler
+$ helm uninstall dolphinscheduler
 ```
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
@@ -220,32 +221,6 @@ The following tables lists the configurable parameters of the Dolphins Scheduler
 | `api.persistentVolumeClaim.storageClassName`                                      | `api` logs data Persistent Volume Storage Class. If set to "-", storageClassName: "", which disables dynamic provisioning      | `-`                                                   |
 | `api.persistentVolumeClaim.storage`                                               | `PersistentVolumeClaim` Size                                                                                                   | `20Gi`                                                |
 |                                                                                   |                                                                                                                                |                                                       |
-| `frontend.strategy.type`                                                          | Type of deployment. Can be "Recreate" or "RollingUpdate"                                                                       | `RollingUpdate`                                       |
-| `frontend.strategy.rollingUpdate.maxSurge`                                        | The maximum number of pods that can be scheduled above the desired number of pods                                              | `25%`                                                 |
-| `frontend.strategy.rollingUpdate.maxUnavailable`                                  | The maximum number of pods that can be unavailable during the update                                                           | `25%`                                                 |
-| `frontend.replicas`                                                               | Replicas is the desired number of replicas of the given Template                                                               | `1`                                                   |
-| `frontend.nodeSelector`                                                           | NodeSelector is a selector which must be true for the pod to fit on a node                                                     | `{}`                                                  |
-| `frontend.tolerations`                                                            | If specified, the pod's tolerations                                                                                            | `{}`                                                  |
-| `frontend.affinity`                                                               | If specified, the pod's scheduling constraints                                                                                 | `{}`                                                  |
-| `frontend.resources`                                                                 |  The `resource` limit and request config for frontend server. | `{}`                                                  |
-| `frontend.annotations`                                                                 |  The `annotations` for frontend server. | `{}`                                                  |
-| `frontend.livenessProbe.enabled`                                                  | Turn on and off liveness probe                                                                                                 | `true`                                                |
-| `frontend.livenessProbe.initialDelaySeconds`                                      | Delay before liveness probe is initiated                                                                                       | `30`                                                  |
-| `frontend.livenessProbe.periodSeconds`                                            | How often to perform the probe                                                                                                 | `30`                                                  |
-| `frontend.livenessProbe.timeoutSeconds`                                           | When the probe times out                                                                                                       | `5`                                                   |
-| `frontend.livenessProbe.failureThreshold`                                         | Minimum consecutive successes for the probe                                                                                    | `3`                                                   |
-| `frontend.livenessProbe.successThreshold`                                         | Minimum consecutive failures for the probe                                                                                     | `1`                                                   |
-| `frontend.readinessProbe.enabled`                                                 | Turn on and off readiness probe                                                                                                | `true`                                                |
-| `frontend.readinessProbe.initialDelaySeconds`                                     | Delay before readiness probe is initiated                                                                                      | `30`                                                  |
-| `frontend.readinessProbe.periodSeconds`                                           | How often to perform the probe                                                                                                 | `30`                                                  |
-| `frontend.readinessProbe.timeoutSeconds`                                          | When the probe times out                                                                                                       | `5`                                                   |
-| `frontend.readinessProbe.failureThreshold`                                        | Minimum consecutive successes for the probe                                                                                    | `3`                                                   |
-| `frontend.readinessProbe.successThreshold`                                        | Minimum consecutive failures for the probe                                                                                     | `1`                                                   |
-| `frontend.persistentVolumeClaim.enabled`                                          | Set `frontend.persistentVolumeClaim.enabled` to `true` to mount a new volume for `frontend`                                    | `false`                                               |
-| `frontend.persistentVolumeClaim.accessModes`                                      | `PersistentVolumeClaim` Access Modes                                                                                           | `[ReadWriteOnce]`                                     |
-| `frontend.persistentVolumeClaim.storageClassName`                                 | `frontend` logs data Persistent Volume Storage Class. If set to "-", storageClassName: "", which disables dynamic provisioning | `-`                                                   |
-| `frontend.persistentVolumeClaim.storage`                                          | `PersistentVolumeClaim` Size                                                                                                   | `20Gi`                                                |
-|                                                                                   |                                                                                                                                |                                                       |
 | `ingress.enabled`                                                                 | Enable ingress                                                                                                                 | `false`                                               |
 | `ingress.host`                                                                    | Ingress host                                                                                                                   | `dolphinscheduler.org`                                |
 | `ingress.path`                                                                    | Ingress path                                                                                                                   | `/`                                                   |
diff --git a/docker/kubernetes/dolphinscheduler/requirements.yaml b/docker/kubernetes/dolphinscheduler/requirements.yaml
deleted file mode 100644
index e219975995..0000000000
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-dependencies:
-- name: postgresql
-  version: 8.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: zookeeper
-  version: 5.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD b/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
deleted file mode 100644
index e219975995..0000000000
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-dependencies:
-- name: postgresql
-  version: 8.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: zookeeper
-  version: 5.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD_0 b/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD_0
deleted file mode 100644
index e219975995..0000000000
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~HEAD_0
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-dependencies:
-- name: postgresql
-  version: 8.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: zookeeper
-  version: 5.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/requirements.yaml~dev b/docker/kubernetes/dolphinscheduler/requirements.yaml~dev
deleted file mode 100644
index e219975995..0000000000
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~dev
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-dependencies:
-- name: postgresql
-  version: 8.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: zookeeper
-  version: 5.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/requirements.yaml~dev_0 b/docker/kubernetes/dolphinscheduler/requirements.yaml~dev_0
deleted file mode 100644
index e219975995..0000000000
--- a/docker/kubernetes/dolphinscheduler/requirements.yaml~dev_0
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-dependencies:
-- name: postgresql
-  version: 8.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: postgresql.enabled
-- name: zookeeper
-  version: 5.x.x
-  repository: https://charts.bitnami.com/bitnami
-  condition: redis.enabled
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/NOTES.txt b/docker/kubernetes/dolphinscheduler/templates/NOTES.txt
index 256c53ca57..8afe766d27 100644
--- a/docker/kubernetes/dolphinscheduler/templates/NOTES.txt
+++ b/docker/kubernetes/dolphinscheduler/templates/NOTES.txt
@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-** Please be patient while the chart is being deployed **
+** Please be patient while the chart Dolphinscheduler {{ .Chart.AppVersion }} is being deployed **
 
-1. Get the Dolphinscheduler URL by running:
+Get the Dolphinscheduler URL by running:
 
 {{- if .Values.ingress.enabled }}
 
@@ -26,6 +26,6 @@
 
 {{- else }}
 
-  kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "dolphinscheduler.fullname" . }}-frontend 8888:8888
+  kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "dolphinscheduler.fullname" . }}-api 12345:12345
 
 {{- end }}
diff --git a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl
index 1f121dfea8..ccfc746645 100644
--- a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl
+++ b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl
@@ -135,7 +135,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default dolphinscheduler worker base dir.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "dolphinscheduler.worker.base.dir" -}}
-{{- $name := default "/tmp/dolphinscheduler" .Values.worker.configmap.DOLPHINSCHEDULER_DATA_BASEDIR_PATH -}}
+{{- define "dolphinscheduler.data.basedir.path" -}}
+{{- $name := default "/tmp/dolphinscheduler" .Values.common.configmap.DOLPHINSCHEDULER_DATA_BASEDIR_PATH -}}
 {{- printf "%s" $name | trunc 63 | trimSuffix "/" -}}
 {{- end -}}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
index 2c5b76c3f0..2c7dd67c57 100644
--- a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
@@ -24,6 +24,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
+  DOLPHINSCHEDULER_OPTS: {{ .Values.alert.configmap.DOLPHINSCHEDULER_OPTS | quote }}
   ALERT_PLUGIN_DIR: {{ .Values.alert.configmap.ALERT_PLUGIN_DIR | quote }}
   XLS_FILE_PATH: {{ .Values.alert.configmap.XLS_FILE_PATH | quote }}
   MAIL_SERVER_HOST: {{ .Values.alert.configmap.MAIL_SERVER_HOST | quote }}
diff --git a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-frontend.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
similarity index 69%
rename from docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-frontend.yaml
rename to docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
index 60d0d6e7b5..3845f1f67c 100644
--- a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-frontend.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-api.yaml
@@ -14,22 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+{{- if .Values.api.configmap }}
 apiVersion: v1
-kind: Service
+kind: ConfigMap
 metadata:
-  name: {{ include "dolphinscheduler.fullname" . }}-frontend
+  name: {{ include "dolphinscheduler.fullname" . }}-api
   labels:
-    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
+    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-api
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  ports:
-    - port: 8888
-      targetPort: tcp-port
-      protocol: TCP
-      name: tcp-port
-  selector:
-    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/component: frontend
\ No newline at end of file
+data:
+  DOLPHINSCHEDULER_OPTS: {{ .Values.api.configmap.DOLPHINSCHEDULER_OPTS | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-common.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-common.yaml
index 931f6d48e4..1fcb5b5992 100644
--- a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-common.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-common.yaml
@@ -24,12 +24,14 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
-  DOLPHINSCHEDULER_ENV_PATH: {{ .Values.common.configmap.DOLPHINSCHEDULER_ENV_PATH | quote }}
-  DOLPHINSCHEDULER_DATA_BASEDIR_PATH: {{ .Values.common.configmap.DOLPHINSCHEDULER_DATA_BASEDIR_PATH | quote }}
+  DOLPHINSCHEDULER_ENV: |-
+  {{- range .Values.common.configmap.DOLPHINSCHEDULER_ENV }}
+    {{ . }}
+  {{- end }}
+  DOLPHINSCHEDULER_DATA_BASEDIR_PATH: {{ include "dolphinscheduler.data.basedir.path" . | quote }}
   RESOURCE_STORAGE_TYPE: {{ .Values.common.configmap.RESOURCE_STORAGE_TYPE | quote }}
   RESOURCE_UPLOAD_PATH: {{ .Values.common.configmap.RESOURCE_UPLOAD_PATH | quote }}
   FS_DEFAULT_FS: {{ .Values.common.configmap.FS_DEFAULT_FS | quote }}
   FS_S3A_ENDPOINT: {{ .Values.common.configmap.FS_S3A_ENDPOINT | quote }}
   FS_S3A_ACCESS_KEY: {{ .Values.common.configmap.FS_S3A_ACCESS_KEY | quote }}
-  FS_S3A_SECRET_KEY: {{ .Values.common.configmap.FS_S3A_SECRET_KEY | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
index da82d639cb..7c1be7717e 100644
--- a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-master.yaml
@@ -24,6 +24,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
+  DOLPHINSCHEDULER_OPTS: {{ .Values.master.configmap.DOLPHINSCHEDULER_OPTS | quote }}
   MASTER_EXEC_THREADS: {{ .Values.master.configmap.MASTER_EXEC_THREADS | quote }}
   MASTER_EXEC_TASK_NUM: {{ .Values.master.configmap.MASTER_EXEC_TASK_NUM | quote }}
   MASTER_HEARTBEAT_INTERVAL: {{ .Values.master.configmap.MASTER_HEARTBEAT_INTERVAL | quote }}
@@ -32,5 +33,4 @@ data:
   MASTER_MAX_CPULOAD_AVG: {{ .Values.master.configmap.MASTER_MAX_CPULOAD_AVG | quote }}
   MASTER_RESERVED_MEMORY: {{ .Values.master.configmap.MASTER_RESERVED_MEMORY | quote }}
   MASTER_LISTEN_PORT: {{ .Values.master.configmap.MASTER_LISTEN_PORT | quote }}
-  DOLPHINSCHEDULER_DATA_BASEDIR_PATH: {{ include "dolphinscheduler.worker.base.dir" . | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
index 569341c225..78b6ed1036 100644
--- a/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-worker.yaml
@@ -24,17 +24,12 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
+  DOLPHINSCHEDULER_OPTS: {{ .Values.worker.configmap.DOLPHINSCHEDULER_OPTS | quote }}
   WORKER_EXEC_THREADS: {{ .Values.worker.configmap.WORKER_EXEC_THREADS | quote }}
   WORKER_HEARTBEAT_INTERVAL: {{ .Values.worker.configmap.WORKER_HEARTBEAT_INTERVAL | quote }}
-  WORKER_FETCH_TASK_NUM: {{ .Values.worker.configmap.WORKER_FETCH_TASK_NUM | quote }}
   WORKER_MAX_CPULOAD_AVG: {{ .Values.worker.configmap.WORKER_MAX_CPULOAD_AVG | quote }}
   WORKER_RESERVED_MEMORY: {{ .Values.worker.configmap.WORKER_RESERVED_MEMORY | quote }}
   WORKER_LISTEN_PORT: {{ .Values.worker.configmap.WORKER_LISTEN_PORT | quote }}
   WORKER_GROUP: {{ .Values.worker.configmap.WORKER_GROUP | quote }}
   WORKER_WEIGHT: {{ .Values.worker.configmap.WORKER_WEIGHT | quote }}
-  DOLPHINSCHEDULER_DATA_BASEDIR_PATH: {{ include "dolphinscheduler.worker.base.dir" . | quote }}
-  dolphinscheduler_env.sh: |-
-  {{- range .Values.worker.configmap.DOLPHINSCHEDULER_ENV }}
-    {{ . }}
-  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
index fb9a23786b..e4a2b21ffa 100644
--- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml
@@ -57,35 +57,6 @@ spec:
       {{- if .Values.alert.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
-      initContainers:
-        - name: init-database
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
-                  counter=$((counter+1))
-                  if [ $counter == 5 ]; then
-                      echo "Error: Couldn't connect to database."
-                      exit 1
-                  fi
-                  echo "Trying to connect to database at ${DATABASE_HOST}:${DATABASE_PORT}. Attempt $counter."
-                  sleep 60
-              done
-          env:
-            - name: DATABASE_HOST
-              {{- if .Values.postgresql.enabled }}
-              value: {{ template "dolphinscheduler.postgresql.fullname" . }}
-              {{- else }}
-              value: {{ .Values.externalDatabase.host | quote }}
-            {{- end }}
-            - name: DATABASE_PORT
-              {{- if .Values.postgresql.enabled }}
-              value: "5432"
-              {{- else }}
-              value: {{ .Values.externalDatabase.port | quote }}
-              {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       - name: {{ include "dolphinscheduler.image.pullSecrets" . }}
@@ -93,14 +64,17 @@ spec:
       containers:
         - name: {{ include "dolphinscheduler.fullname" . }}-alert
           image: {{ include "dolphinscheduler.image.repository" . | quote }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "alert-server"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: DOLPHINSCHEDULER_OPTS
-              value: {{ default "" .Values.alert.jvmOptions }}
             - name: TZ
               value: {{ .Values.timezone }}
+            - name: DOLPHINSCHEDULER_OPTS
+              valueFrom:
+                configMapKeyRef:
+                  key: DOLPHINSCHEDULER_OPTS
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
             - name: ALERT_PLUGIN_DIR
               valueFrom:
                 configMapKeyRef:
@@ -228,36 +202,6 @@ spec:
               {{- else }}
               value: {{ .Values.externalDatabase.params | quote }}
               {{- end }}
-            - name: RESOURCE_STORAGE_TYPE
-              valueFrom:
-                configMapKeyRef:
-                  key: RESOURCE_STORAGE_TYPE
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: RESOURCE_UPLOAD_PATH
-              valueFrom:
-                configMapKeyRef:
-                  key: RESOURCE_UPLOAD_PATH
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_DEFAULT_FS
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_DEFAULT_FS
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_ENDPOINT
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_ENDPOINT
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_ACCESS_KEY
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_ACCESS_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_SECRET_KEY
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_SECRET_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
           {{- if .Values.alert.resources }}
           resources:
             limits:
diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
index 92c2c72398..563f9ebbf9 100644
--- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
@@ -57,35 +57,6 @@ spec:
       {{- if .Values.api.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
-      initContainers:
-        - name: init-database
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
-                  counter=$((counter+1))
-                  if [ $counter == 5 ]; then
-                      echo "Error: Couldn't connect to database."
-                      exit 1
-                  fi
-                  echo "Trying to connect to database at ${DATABASE_HOST}:${DATABASE_PORT}. Attempt $counter."
-                  sleep 60
-              done
-          env:
-            - name: DATABASE_HOST
-              {{- if .Values.postgresql.enabled }}
-              value: {{ template "dolphinscheduler.postgresql.fullname" . }}
-              {{- else }}
-              value: {{ .Values.externalDatabase.host | quote }}
-            {{- end }}
-            - name: DATABASE_PORT
-              {{- if .Values.postgresql.enabled }}
-              value: "5432"
-              {{- else }}
-              value: {{ .Values.externalDatabase.port | quote }}
-            {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       - name: {{ include "dolphinscheduler.image.pullSecrets" . }}
@@ -93,17 +64,20 @@ spec:
       containers:
         - name: {{ include "dolphinscheduler.fullname" . }}-api
           image: {{ include "dolphinscheduler.image.repository" . | quote }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "api-server"
           ports:
             - containerPort: 12345
               name: tcp-port
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: DOLPHINSCHEDULER_OPTS
-              value: {{ default "" .Values.api.jvmOptions }}
             - name: TZ
               value: {{ .Values.timezone }}
+            - name: DOLPHINSCHEDULER_OPTS
+              valueFrom:
+                configMapKeyRef:
+                  key: DOLPHINSCHEDULER_OPTS
+                  name: {{ include "dolphinscheduler.fullname" . }}-api
             - name: DATABASE_TYPE
               {{- if .Values.postgresql.enabled }}
               value: "postgresql"
@@ -164,7 +138,7 @@ spec:
               {{- end }}
             - name: ZOOKEEPER_ROOT
               {{- if .Values.zookeeper.enabled }}
-              value: "/dolphinscheduler"
+              value: {{ .Values.zookeeper.zookeeperRoot }}
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperRoot }}
               {{- end }}
@@ -183,6 +157,7 @@ spec:
                 configMapKeyRef:
                   key: FS_DEFAULT_FS
                   name: {{ include "dolphinscheduler.fullname" . }}-common
+            {{- if eq .Values.common.configmap.RESOURCE_STORAGE_TYPE "S3" }}
             - name: FS_S3A_ENDPOINT
               valueFrom:
                 configMapKeyRef:
@@ -195,9 +170,10 @@ spec:
                   name: {{ include "dolphinscheduler.fullname" . }}-common
             - name: FS_S3A_SECRET_KEY
               valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_SECRET_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
+                secretKeyRef:
+                  key: fs-s3a-secret-key
+                  name: {{ printf "%s-%s" .Release.Name "fs-s3a"  }}
+            {{- end }}
           {{- if .Values.api.resources }}
           resources:
             limits:
diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
deleted file mode 100644
index 04b9408d9f..0000000000
--- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "dolphinscheduler.fullname" . }}-frontend
-  labels:
-    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/component: frontend
-spec:
-  replicas: {{ .Values.frontend.replicas }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
-      app.kubernetes.io/instance: {{ .Release.Name }}
-      app.kubernetes.io/managed-by: {{ .Release.Service }}
-      app.kubernetes.io/component: frontend
-  strategy:
-    type: {{ .Values.frontend.strategy.type | quote }}
-    rollingUpdate:
-      maxSurge: {{ .Values.frontend.strategy.rollingUpdate.maxSurge | quote }}
-      maxUnavailable: {{ .Values.frontend.strategy.rollingUpdate.maxUnavailable | quote }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
-        app.kubernetes.io/instance: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: {{ .Release.Service }}
-        app.kubernetes.io/component: frontend
-      {{- if .Values.alert.annotations }}
-      annotations:
-        {{- toYaml .Values.alert.annotations | nindent 8 }}
-      {{- end }}
-    spec:
-      {{- if .Values.frontend.affinity }}
-      affinity: {{- toYaml .Values.frontend.affinity | nindent 8 }}
-      {{- end }}
-      {{- if .Values.frontend.nodeSelector }}
-      nodeSelector: {{- toYaml .Values.frontend.nodeSelector | nindent 8 }}
-      {{- end }}
-      {{- if .Values.frontend.tolerations }}
-      tolerations: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.image.pullSecrets }}
-      imagePullSecrets:
-      - name: {{ include "dolphinscheduler.image.pullSecrets" . }}
-      {{- end }}
-      containers:
-        - name: {{ include "dolphinscheduler.fullname" . }}-frontend
-          image: {{ include "dolphinscheduler.image.repository" . | quote }}
-          args:
-            - "frontend"
-          ports:
-            - containerPort: 8888
-              name: tcp-port
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: TZ
-              value: {{ .Values.timezone }}
-            - name: FRONTEND_API_SERVER_HOST
-              value: '{{ include "dolphinscheduler.fullname" . }}-api'
-            - name: FRONTEND_API_SERVER_PORT
-              value: "12345"
-          {{- if .Values.frontend.resources }}
-          resources:
-            limits:
-              memory: {{ .Values.frontend.resources.limits.memory | quote }}
-              cpu: {{ .Values.frontend.resources.limits.cpu | quote }}
-            requests:
-              memory: {{ .Values.frontend.resources.requests.memory | quote }}
-              cpu: {{ .Values.frontend.resources.requests.cpu | quote }}
-          {{- end }}
-          {{- if .Values.frontend.livenessProbe.enabled }}
-          livenessProbe:
-            tcpSocket:
-              port: 8888
-            initialDelaySeconds: {{ .Values.frontend.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.frontend.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.frontend.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.frontend.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.frontend.livenessProbe.failureThreshold }}
-          {{- end }}
-          {{- if .Values.frontend.readinessProbe.enabled }}
-          readinessProbe:
-            tcpSocket:
-              port: 8888
-            initialDelaySeconds: {{ .Values.frontend.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.frontend.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.frontend.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.frontend.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.frontend.readinessProbe.failureThreshold }}
-          {{- end }}
-          volumeMounts:
-            - mountPath: "/var/log/nginx"
-              name: {{ include "dolphinscheduler.fullname" . }}-frontend
-      volumes:
-        - name: {{ include "dolphinscheduler.fullname" . }}-frontend
-          {{- if .Values.frontend.persistentVolumeClaim.enabled }}
-          persistentVolumeClaim:
-            claimName: {{ include "dolphinscheduler.fullname" . }}-frontend
-          {{- else }}
-          emptyDir: {}
-          {{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml
index d0f923dcf1..6edc82b12a 100644
--- a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml
@@ -30,7 +30,7 @@ spec:
       paths:
         - path: {{ .Values.ingress.path }}
           backend:
-            serviceName: {{ include "dolphinscheduler.fullname" . }}-frontend
+            serviceName: {{ include "dolphinscheduler.fullname" . }}-api
             servicePort: tcp-port
   {{- if .Values.ingress.tls.enabled }}
   tls:
diff --git a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-alert.yaml b/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-alert.yaml
index 7f74cd94ae..fd5e88afb9 100644
--- a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-alert.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-alert.yaml
@@ -25,7 +25,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   accessModes:
-    {{- range .Values.alert.persistentVolumeClaim.accessModes }}
+  {{- range .Values.alert.persistentVolumeClaim.accessModes }}
     - {{ . | quote }}
   {{- end }}
   storageClassName: {{ .Values.alert.persistentVolumeClaim.storageClassName | quote }}
diff --git a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-api.yaml
index c1074cc2b1..48292966ad 100644
--- a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-api.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-api.yaml
@@ -25,7 +25,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   accessModes:
-    {{- range .Values.api.persistentVolumeClaim.accessModes }}
+  {{- range .Values.api.persistentVolumeClaim.accessModes }}
     - {{ . | quote }}
   {{- end }}
   storageClassName: {{ .Values.api.persistentVolumeClaim.storageClassName | quote }}
diff --git a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-frontend.yaml b/docker/kubernetes/dolphinscheduler/templates/secret-external-fs-s3a.yaml
similarity index 66%
rename from docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-frontend.yaml
rename to docker/kubernetes/dolphinscheduler/templates/secret-external-fs-s3a.yaml
index ac9fe02a9e..78e7440392 100644
--- a/docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-frontend.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/secret-external-fs-s3a.yaml
@@ -14,22 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if .Values.frontend.persistentVolumeClaim.enabled }}
+{{- if eq .Values.common.configmap.RESOURCE_STORAGE_TYPE "S3" }}
 apiVersion: v1
-kind: PersistentVolumeClaim
+kind: Secret
 metadata:
-  name: {{ include "dolphinscheduler.fullname" . }}-frontend
+  name: {{ printf "%s-%s" .Release.Name "fs-s3a"  }}
   labels:
-    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-frontend
+    app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-fs-s3a
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    {{- range .Values.frontend.persistentVolumeClaim.accessModes }}
-    - {{ . | quote }}
-  {{- end }}
-  storageClassName: {{ .Values.frontend.persistentVolumeClaim.storageClassName | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.frontend.persistentVolumeClaim.storage | quote }}
+type: Opaque
+data:
+  fs-s3a-secret-key: {{ .Values.common.configmap.FS_S3A_SECRET_KEY | b64enc | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
index e9dc7919ca..85633a9f33 100644
--- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml
@@ -54,59 +54,6 @@ spec:
       {{- if .Values.master.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
-      initContainers:
-        - name: init-zookeeper
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              echo "${ZOOKEEPER_QUORUM}" | awk -F ',' 'BEGIN{ i=1 }{ while( i <= NF ){ print $i; i++ } }' | while read line; do
-                  while ! nc -z ${line%:*} ${line#*:}; do
-                      counter=$((counter+1))
-                      if [ $counter == 5 ]; then
-                          echo "Error: Couldn't connect to zookeeper."
-                          exit 1
-                      fi
-                      echo "Trying to connect to zookeeper at ${line}. Attempt $counter."
-                      sleep 60
-                  done
-              done
-          env:
-            - name: ZOOKEEPER_QUORUM
-              {{- if .Values.zookeeper.enabled }}
-              value: "{{ template "dolphinscheduler.zookeeper.quorum" . }}"
-              {{- else }}
-              value: {{ .Values.externalZookeeper.zookeeperQuorum }}
-              {{- end }}
-        - name: init-database
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
-                  counter=$((counter+1))
-                  if [ $counter == 5 ]; then
-                      echo "Error: Couldn't connect to database."
-                      exit 1
-                  fi
-                  echo "Trying to connect to database at ${DATABASE_HOST}:${DATABASE_PORT}. Attempt $counter."
-                  sleep 60
-              done
-          env:
-            - name: DATABASE_HOST
-              {{- if .Values.postgresql.enabled }}
-              value: {{ template "dolphinscheduler.postgresql.fullname" . }}
-              {{- else }}
-              value: {{ .Values.externalDatabase.host | quote }}
-              {{- end }}
-            - name: DATABASE_PORT
-              {{- if .Values.postgresql.enabled }}
-              value: "5432"
-              {{- else }}
-              value: {{ .Values.externalDatabase.port | quote }}
-              {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       - name: {{ include "dolphinscheduler.image.pullSecrets" . }}
@@ -114,17 +61,20 @@ spec:
       containers:
         - name: {{ include "dolphinscheduler.fullname" . }}-master
           image: {{ include "dolphinscheduler.image.repository" . | quote }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "master-server"
           ports:
             - containerPort: {{ .Values.master.configmap.MASTER_LISTEN_PORT }}
               name: "master-port"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: DOLPHINSCHEDULER_OPTS
-              value: {{ default "" .Values.master.jvmOptions }}
             - name: TZ
               value: {{ .Values.timezone }}
+            - name: DOLPHINSCHEDULER_OPTS
+              valueFrom:
+                configMapKeyRef:
+                  key: DOLPHINSCHEDULER_OPTS
+                  name: {{ include "dolphinscheduler.fullname" . }}-master
             - name: MASTER_EXEC_THREADS
               valueFrom:
                 configMapKeyRef:
@@ -168,7 +118,7 @@ spec:
             - name: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
               valueFrom:
                 configMapKeyRef:
-                  name: {{ include "dolphinscheduler.fullname" . }}-master
+                  name: {{ include "dolphinscheduler.fullname" . }}-common
                   key: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
             - name: DATABASE_TYPE
               {{- if .Values.postgresql.enabled }}
@@ -230,40 +180,10 @@ spec:
               {{- end }}
             - name: ZOOKEEPER_ROOT
               {{- if .Values.zookeeper.enabled }}
-              value: "/dolphinscheduler"
+              value: {{ .Values.zookeeper.zookeeperRoot }}
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperRoot }}
               {{- end }}
-            - name: RESOURCE_STORAGE_TYPE
-              valueFrom:
-                configMapKeyRef:
-                  key: RESOURCE_STORAGE_TYPE
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: RESOURCE_UPLOAD_PATH
-              valueFrom:
-                configMapKeyRef:
-                  key: RESOURCE_UPLOAD_PATH
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_DEFAULT_FS
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_DEFAULT_FS
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_ENDPOINT
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_ENDPOINT
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_ACCESS_KEY
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_ACCESS_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: FS_S3A_SECRET_KEY
-              valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_SECRET_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
           {{- if .Values.master.resources }}
           resources:
             limits:
diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
index ae562cc62b..b8a62fa6ae 100644
--- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -54,59 +54,6 @@ spec:
       {{- if .Values.worker.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
-      initContainers:
-        - name: init-zookeeper
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              echo "${ZOOKEEPER_QUORUM}" | awk -F ',' 'BEGIN{ i=1 }{ while( i <= NF ){ print $i; i++ } }' | while read line; do
-                  while ! nc -z ${line%:*} ${line#*:}; do
-                      counter=$((counter+1))
-                      if [ $counter == 5 ]; then
-                          echo "Error: Couldn't connect to zookeeper."
-                          exit 1
-                      fi
-                      echo "Trying to connect to zookeeper at ${line}. Attempt $counter."
-                      sleep 60
-                  done
-              done
-          env:
-            - name: ZOOKEEPER_QUORUM
-              {{- if .Values.zookeeper.enabled }}
-              value: "{{ template "dolphinscheduler.zookeeper.quorum" . }}"
-              {{- else }}
-              value: {{ .Values.externalZookeeper.zookeeperQuorum }}
-              {{- end }}
-        - name: init-database
-          image: busybox:1.31.0
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              while ! nc -z ${DATABASE_HOST} ${DATABASE_PORT}; do
-                  counter=$((counter+1))
-                  if [ $counter == 5 ]; then
-                      echo "Error: Couldn't connect to database."
-                      exit 1
-                  fi
-                  echo "Trying to connect to database at ${DATABASE_HOST}:${DATABASE_PORT}. Attempt $counter."
-                  sleep 60
-              done
-          env:
-            - name: DATABASE_HOST
-              {{- if .Values.postgresql.enabled }}
-              value: {{ template "dolphinscheduler.postgresql.fullname" . }}
-              {{- else }}
-              value: {{ .Values.externalDatabase.host | quote }}
-              {{- end }}
-            - name: DATABASE_PORT
-              {{- if .Values.postgresql.enabled }}
-              value: "5432"
-              {{- else }}
-              value: {{ .Values.externalDatabase.port | quote }}
-              {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       - name: {{ include "dolphinscheduler.image.pullSecrets" . }}
@@ -114,29 +61,27 @@ spec:
       containers:
         - name: {{ include "dolphinscheduler.fullname" . }}-worker
           image: {{ include "dolphinscheduler.image.repository" . | quote }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "worker-server"
           ports:
             - containerPort: {{ .Values.worker.configmap.WORKER_LISTEN_PORT }}
               name: "worker-port"
             - containerPort: 50051
-              name: "logs-port"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+              name: "logger-port"
           env:
-            - name: DOLPHINSCHEDULER_OPTS
-              value: {{ default "" .Values.worker.jvmOptions }}
             - name: TZ
               value: {{ .Values.timezone }}
-            - name: WORKER_EXEC_THREADS
+            - name: DOLPHINSCHEDULER_OPTS
               valueFrom:
                 configMapKeyRef:
+                  key: DOLPHINSCHEDULER_OPTS
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
-                  key: WORKER_EXEC_THREADS
-            - name: WORKER_FETCH_TASK_NUM
+            - name: WORKER_EXEC_THREADS
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "dolphinscheduler.fullname" . }}-worker
-                  key: WORKER_FETCH_TASK_NUM
+                  key: WORKER_EXEC_THREADS
             - name: WORKER_HEARTBEAT_INTERVAL
               valueFrom:
                 configMapKeyRef:
@@ -170,8 +115,58 @@ spec:
             - name: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
               valueFrom:
                 configMapKeyRef:
-                  name: {{ include "dolphinscheduler.fullname" . }}-master
+                  name: {{ include "dolphinscheduler.fullname" . }}-common
                   key: DOLPHINSCHEDULER_DATA_BASEDIR_PATH
+            - name: ALERT_PLUGIN_DIR
+              valueFrom:
+                configMapKeyRef:
+                  key: ALERT_PLUGIN_DIR
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: XLS_FILE_PATH
+              valueFrom:
+                configMapKeyRef:
+                  key: XLS_FILE_PATH
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SERVER_HOST
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SERVER_HOST
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SERVER_PORT
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SERVER_PORT
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SENDER
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SENDER
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_USER
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_USER
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_PASSWD
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_PASSWD
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_STARTTLS_ENABLE
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_STARTTLS_ENABLE
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_SSL_ENABLE
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_SSL_ENABLE
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+            - name: MAIL_SMTP_SSL_TRUST
+              valueFrom:
+                configMapKeyRef:
+                  key: MAIL_SMTP_SSL_TRUST
+                  name: {{ include "dolphinscheduler.fullname" . }}-alert
             - name: DATABASE_TYPE
               {{- if .Values.postgresql.enabled }}
               value: "postgresql"
@@ -232,7 +227,7 @@ spec:
               {{- end }}
             - name: ZOOKEEPER_ROOT
               {{- if .Values.zookeeper.enabled }}
-              value: "/dolphinscheduler"
+              value: {{ .Values.zookeeper.zookeeperRoot }}
               {{- else }}
               value: {{ .Values.externalZookeeper.zookeeperRoot }}
               {{- end }}
@@ -251,6 +246,7 @@ spec:
                 configMapKeyRef:
                   key: FS_DEFAULT_FS
                   name: {{ include "dolphinscheduler.fullname" . }}-common
+            {{- if eq .Values.common.configmap.RESOURCE_STORAGE_TYPE "S3" }}
             - name: FS_S3A_ENDPOINT
               valueFrom:
                 configMapKeyRef:
@@ -263,54 +259,10 @@ spec:
                   name: {{ include "dolphinscheduler.fullname" . }}-common
             - name: FS_S3A_SECRET_KEY
               valueFrom:
-                configMapKeyRef:
-                  key: FS_S3A_SECRET_KEY
-                  name: {{ include "dolphinscheduler.fullname" . }}-common
-            - name: XLS_FILE_PATH
-              valueFrom:
-                configMapKeyRef:
-                  key: XLS_FILE_PATH
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SERVER_HOST
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SERVER_HOST
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SERVER_PORT
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SERVER_PORT
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SENDER
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SENDER
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_USER
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_USER
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_PASSWD
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_PASSWD
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SMTP_STARTTLS_ENABLE
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SMTP_STARTTLS_ENABLE
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SMTP_SSL_ENABLE
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SMTP_SSL_ENABLE
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
-            - name: MAIL_SMTP_SSL_TRUST
-              valueFrom:
-                configMapKeyRef:
-                  key: MAIL_SMTP_SSL_TRUST
-                  name: {{ include "dolphinscheduler.fullname" . }}-alert
+                secretKeyRef:
+                  key: fs-s3a-secret-key
+                  name: {{ printf "%s-%s" .Release.Name "fs-s3a"  }}
+            {{- end }}
             - name: ENTERPRISE_WECHAT_ENABLE
               valueFrom:
                 configMapKeyRef:
@@ -372,13 +324,13 @@ spec:
             failureThreshold: {{ .Values.worker.readinessProbe.failureThreshold }}
           {{- end }}
           volumeMounts:
-            - mountPath: {{ include "dolphinscheduler.worker.base.dir" . | quote }}
+            - mountPath: {{ include "dolphinscheduler.data.basedir.path" . | quote }}
               name: {{ include "dolphinscheduler.fullname" . }}-worker-data
             - mountPath: "/opt/dolphinscheduler/logs"
               name: {{ include "dolphinscheduler.fullname" . }}-worker-logs
             - mountPath: "/opt/dolphinscheduler/conf/env/dolphinscheduler_env.sh"
               subPath: "dolphinscheduler_env.sh"
-              name: {{ include "dolphinscheduler.fullname" . }}-worker-configmap
+              name: {{ include "dolphinscheduler.fullname" . }}-common-env
       volumes:
         - name: {{ include "dolphinscheduler.fullname" . }}-worker-data
           {{- if .Values.worker.persistentVolumeClaim.dataPersistentVolume.enabled }}
@@ -394,12 +346,12 @@ spec:
           {{- else }}
           emptyDir: {}
           {{- end }}
-        - name: {{ include "dolphinscheduler.fullname" . }}-worker-configmap
+        - name: {{ include "dolphinscheduler.fullname" . }}-common-env
           configMap:
             defaultMode: 0777
-            name: {{ include "dolphinscheduler.fullname" . }}-worker
+            name: {{ include "dolphinscheduler.fullname" . }}-common
             items:
-              - key: dolphinscheduler_env.sh
+              - key: DOLPHINSCHEDULER_ENV
                 path: dolphinscheduler_env.sh
   {{- if .Values.worker.persistentVolumeClaim.enabled }}
   volumeClaimTemplates:
diff --git a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml b/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
index fb3b85b5c3..5c4e75436f 100644
--- a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
+++ b/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
@@ -30,9 +30,9 @@ spec:
       protocol: TCP
       name: worker-port
     - port: 50051
-      targetPort: logs-port
+      targetPort: logger-port
       protocol: TCP
-      name: logs-port
+      name: logger-port
   selector:
     app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-worker
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml
index 3261b08401..61201dfaa7 100644
--- a/docker/kubernetes/dolphinscheduler/values.yaml
+++ b/docker/kubernetes/dolphinscheduler/values.yaml
@@ -58,62 +58,74 @@ externalDatabase:
 # If not exists external zookeeper, by default, Dolphinscheduler's zookeeper will use it.
 zookeeper:
   enabled: true
-  taskQueue: "zookeeper"
-  config: null
+  fourlwCommandsWhitelist: srvr,ruok,wchs,cons
   service:
     port: "2181"
   persistence:
     enabled: false
     size: "20Gi"
     storageClass: "-"
+  zookeeperRoot: "/dolphinscheduler"
 
 # If exists external zookeeper, and set zookeeper.enable value to false.
-# If zookeeper.enable is false,  Dolphinscheduler's zookeeper will use it.
+# If zookeeper.enable is false, Dolphinscheduler's zookeeper will use it.
 externalZookeeper:
-  taskQueue: "zookeeper"
   zookeeperQuorum: "127.0.0.1:2181"
   zookeeperRoot: "/dolphinscheduler"
 
 common:
+  ## ConfigMap
   configmap:
-    DOLPHINSCHEDULER_ENV_PATH: "/tmp/dolphinscheduler/env"
-    DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler/files"
-    RESOURCE_STORAGE_TYPE: "NONE"
-    RESOURCE_UPLOAD_PATH: "/ds"
-    FS_DEFAULT_FS: "s3a://xxxx"
+    DOLPHINSCHEDULER_ENV:
+    - "export HADOOP_HOME=/opt/soft/hadoop"
+    - "export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop"
+    - "export SPARK_HOME1=/opt/soft/spark1"
+    - "export SPARK_HOME2=/opt/soft/spark2"
+    - "export PYTHON_HOME=/usr/bin/python"
+    - "export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk"
+    - "export HIVE_HOME=/opt/soft/hive"
+    - "export FLINK_HOME=/opt/soft/flink"
+    - "export DATAX_HOME=/opt/soft/datax/bin/datax.py"
+    - "export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$PATH"
+    DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler"
+    RESOURCE_STORAGE_TYPE: "HDFS"
+    RESOURCE_UPLOAD_PATH: "/dolphinscheduler"
+    FS_DEFAULT_FS: "file:///"
     FS_S3A_ENDPOINT: "s3.xxx.amazonaws.com"
     FS_S3A_ACCESS_KEY: "xxxxxxx"
     FS_S3A_SECRET_KEY: "xxxxxxx"
 
 master:
+  ## PodManagementPolicy controls how pods are created during initial scale up, when replacing pods on nodes, or when scaling down.
   podManagementPolicy: "Parallel"
+  ## Replicas is the desired number of replicas of the given Template.
   replicas: "3"
-  # NodeSelector is a selector which must be true for the pod to fit on a node.
-  # Selector which must match a node's labels for the pod to be scheduled on that node.
-  # More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ## You can use annotations to attach arbitrary non-identifying metadata to objects.
+  ## Clients such as tools and libraries can retrieve this metadata.
+  annotations: {}
+  ## Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints.
+  ## More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
+  affinity: {}
+  ## NodeSelector is a selector which must be true for the pod to fit on a node.
+  ## Selector which must match a node's labels for the pod to be scheduled on that node.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   nodeSelector: {}
-  # Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
-  # effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
+  ## Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
+  ## effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
   tolerations: []
-  # Affinity is a group of affinity scheduling rules.
-  # If specified, the pod's scheduling constraints.
-  # More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
-  affinity: {}
-  # The jvm options for java instance startup
-  jvmOptions: ""
+  ## Compute Resources required by this container. Cannot be updated.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container
   resources: {}
-  # limits:
-  #   memory: "18Gi"
-  #   cpu: "4"
-  # requests:
-  #   memory: "2Gi"
-  #   cpu: "500m"
-  # You can use annotations to attach arbitrary non-identifying metadata to objects. 
-  # Clients such as tools and libraries can retrieve this metadata.
-  annotations: {}
-  ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
-  ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+  # resources:
+  #   limits:
+  #     memory: "8Gi"
+  #     cpu: "4"
+  #   requests:
+  #     memory: "2Gi"
+  #     cpu: "500m"
+  ## ConfigMap
   configmap:
+    DOLPHINSCHEDULER_OPTS: ""
     MASTER_EXEC_THREADS: "100"
     MASTER_EXEC_TASK_NUM: "20"
     MASTER_HEARTBEAT_INTERVAL: "10"
@@ -122,6 +134,8 @@ master:
     MASTER_MAX_CPULOAD_AVG: "100"
     MASTER_RESERVED_MEMORY: "0.1"
     MASTER_LISTEN_PORT: "5678"
+  ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
+  ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
   livenessProbe:
     enabled: true
     initialDelaySeconds: "30"
@@ -138,7 +152,7 @@ master:
     timeoutSeconds: "5"
     failureThreshold: "3"
     successThreshold: "1"
-  ## volumeClaimTemplates is a list of claims that pods are allowed to reference.
+  ## PersistentVolumeClaim represents a reference to a PersistentVolumeClaim in the same namespace.
   ## The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod.
   ## Every claim in this list must have at least one matching (by name) volumeMount in one container in the template.
   ## A claim in this list takes precedence over any volumes in the template, with the same name.
@@ -150,31 +164,43 @@ master:
     storage: "20Gi"
 
 worker:
+  ## PodManagementPolicy controls how pods are created during initial scale up, when replacing pods on nodes, or when scaling down.
   podManagementPolicy: "Parallel"
+  ## Replicas is the desired number of replicas of the given Template.
   replicas: "3"
-  # NodeSelector is a selector which must be true for the pod to fit on a node.
-  # Selector which must match a node's labels for the pod to be scheduled on that node.
-  # More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ## You can use annotations to attach arbitrary non-identifying metadata to objects.
+  ## Clients such as tools and libraries can retrieve this metadata.
+  annotations: {}
+  ## Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints.
+  ## More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
+  affinity: {}
+  ## NodeSelector is a selector which must be true for the pod to fit on a node.
+  ## Selector which must match a node's labels for the pod to be scheduled on that node.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
   nodeSelector: {}
-  # Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
-  # effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
+  ## Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
+  ## effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
   tolerations: []
-  # Affinity is a group of affinity scheduling rules.
-  # If specified, the pod's scheduling constraints.
-  # More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
-  affinity: {}
-  # The jvm options for java instance startup
-  jvmOptions: ""
+  ## Compute Resources required by this container. Cannot be updated.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container
   resources: {}
-  # limits:
-  #   memory: "18Gi"
-  #   cpu: "4"
-  # requests:
-  #   memory: "2Gi"
-  #   cpu: "500m"
-  # You can use annotations to attach arbitrary non-identifying metadata to objects. 
-  # Clients such as tools and libraries can retrieve this metadata.
-  annotations: {}
+  # resources:
+  #   limits:
+  #     memory: "8Gi"
+  #     cpu: "4"
+  #   requests:
+  #     memory: "2Gi"
+  #     cpu: "500m"
+  ## ConfigMap
+  configmap:
+    DOLPHINSCHEDULER_OPTS: ""
+    WORKER_EXEC_THREADS: "100"
+    WORKER_HEARTBEAT_INTERVAL: "10"
+    WORKER_MAX_CPULOAD_AVG: "100"
+    WORKER_RESERVED_MEMORY: "0.1"
+    WORKER_LISTEN_PORT: "1234"
+    WORKER_GROUP: "default"
+    WORKER_WEIGHT: "100"
   ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
   ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
   livenessProbe:
@@ -193,27 +219,7 @@ worker:
     timeoutSeconds: "5"
     failureThreshold: "3"
     successThreshold: "1"
-  configmap:
-    WORKER_EXEC_THREADS: "100"
-    WORKER_HEARTBEAT_INTERVAL: "10"
-    WORKER_FETCH_TASK_NUM: "3"
-    WORKER_MAX_CPULOAD_AVG: "100"
-    WORKER_RESERVED_MEMORY: "0.1"
-    WORKER_LISTEN_PORT: "1234"
-    WORKER_GROUP: "default"
-    WORKER_WEIGHT: "100"
-    DOLPHINSCHEDULER_DATA_BASEDIR_PATH: "/tmp/dolphinscheduler"
-    DOLPHINSCHEDULER_ENV:
-    - "export HADOOP_HOME=/opt/soft/hadoop"
-    - "export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop"
-    - "export SPARK_HOME1=/opt/soft/spark1"
-    - "export SPARK_HOME2=/opt/soft/spark2"
-    - "export PYTHON_HOME=/opt/soft/python"
-    - "export JAVA_HOME=/opt/soft/java"
-    - "export HIVE_HOME=/opt/soft/hive"
-    - "export FLINK_HOME=/opt/soft/flink"
-    - "export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$PATH"
-  ## volumeClaimTemplates is a list of claims that pods are allowed to reference.
+  ## PersistentVolumeClaim represents a reference to a PersistentVolumeClaim in the same namespace.
   ## The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod.
   ## Every claim in this list must have at least one matching (by name) volumeMount in one container in the template.
   ## A claim in this list takes precedence over any volumes in the template, with the same name.
@@ -235,38 +241,40 @@ worker:
       storage: "20Gi"
 
 alert:
+  ## Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1.
+  replicas: "1"
+  ## The deployment strategy to use to replace existing pods with new ones.
   strategy:
     type: "RollingUpdate"
     rollingUpdate:
       maxSurge: "25%"
       maxUnavailable: "25%"
-  replicas: "1"
-  # NodeSelector is a selector which must be true for the pod to fit on a node.
-  # Selector which must match a node's labels for the pod to be scheduled on that node.
-  # More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ## You can use annotations to attach arbitrary non-identifying metadata to objects.
+  ## Clients such as tools and libraries can retrieve this metadata.
+  annotations: {}
+  ## NodeSelector is a selector which must be true for the pod to fit on a node.
+  ## Selector which must match a node's labels for the pod to be scheduled on that node.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
+  ## Compute Resources required by this container. Cannot be updated.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container
   nodeSelector: {}
-  # Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
-  # effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
+  ## Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
+  ## effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
   tolerations: []
-  # Affinity is a group of affinity scheduling rules.
-  # If specified, the pod's scheduling constraints.
-  # More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
-  affinity: {}
-  # The jvm options for java instance startup
-  jvmOptions: ""
+  ## Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints.
+  ## More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
   resources: {}
-  # limits:
-  #   memory: "4Gi"
-  #   cpu: "1"
-  # requests:
-  #   memory: "2Gi"
-  #   cpu: "500m"
-  # You can use annotations to attach arbitrary non-identifying metadata to objects. 
-  # Clients such as tools and libraries can retrieve this metadata.
-  annotations: {}
-  ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
-  ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+  # resources:
+  #   limits:
+  #     memory: "2Gi"
+  #     cpu: "1"
+  #   requests:
+  #     memory: "1Gi"
+  #     cpu: "500m"
+  ## ConfigMap
   configmap:
+    DOLPHINSCHEDULER_OPTS: ""
     ALERT_PLUGIN_DIR: "/opt/dolphinscheduler/alert/plugin"
     XLS_FILE_PATH: "/tmp/xls"
     MAIL_SERVER_HOST: ""
@@ -282,63 +290,6 @@ alert:
     ENTERPRISE_WECHAT_SECRET: ""
     ENTERPRISE_WECHAT_AGENT_ID: ""
     ENTERPRISE_WECHAT_USERS: ""
-  livenessProbe:
-    enabled: true
-    initialDelaySeconds: "30"
-    periodSeconds: "30"
-    timeoutSeconds: "5"
-    failureThreshold: "3"
-    successThreshold: "1"
-  ## Periodic probe of container service readiness. Container will be removed from service endpoints if the probe fails. Cannot be updated.
-  ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
-  readinessProbe:
-    enabled: true
-    initialDelaySeconds: "30"
-    periodSeconds: "30"
-    timeoutSeconds: "5"
-    failureThreshold: "3"
-    successThreshold: "1"
-  ## volumeClaimTemplates is a list of claims that pods are allowed to reference.
-  ## The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod.
-  ## Every claim in this list must have at least one matching (by name) volumeMount in one container in the template.
-  ## A claim in this list takes precedence over any volumes in the template, with the same name.
-  persistentVolumeClaim:
-    enabled: false
-    accessModes:
-    - "ReadWriteOnce"
-    storageClassName: "-"
-    storage: "20Gi"
-
-api:
-  strategy:
-    type: "RollingUpdate"
-    rollingUpdate:
-      maxSurge: "25%"
-      maxUnavailable: "25%"
-  replicas: "1"
-  # NodeSelector is a selector which must be true for the pod to fit on a node.
-  # Selector which must match a node's labels for the pod to be scheduled on that node.
-  # More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-  nodeSelector: {}
-  # Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
-  # effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
-  tolerations: []
-  # Affinity is a group of affinity scheduling rules.
-  # If specified, the pod's scheduling constraints.
-  # More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
-  affinity: {}
-  # The jvm options for java instance startup
-  jvmOptions: ""
-  resources: {}
-  # limits:
-  #   memory: "4Gi"
-  #   cpu: "2"
-  # requests:
-  #   memory: "2Gi"
-  #   cpu: "500m"
-  # You can use annotations to attach arbitrary non-identifying metadata to objects. 
-  # Clients such as tools and libraries can retrieve this metadata.
-  annotations: {}
   ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
   ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
   livenessProbe:
@@ -357,10 +308,8 @@ api:
     timeoutSeconds: "5"
     failureThreshold: "3"
     successThreshold: "1"
-  ## volumeClaimTemplates is a list of claims that pods are allowed to reference.
-  ## The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod.
-  ## Every claim in this list must have at least one matching (by name) volumeMount in one container in the template.
-  ## A claim in this list takes precedence over any volumes in the template, with the same name.
+  ## PersistentVolumeClaim represents a reference to a PersistentVolumeClaim in the same namespace.
+  ## More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
   persistentVolumeClaim:
     enabled: false
     accessModes:
@@ -368,34 +317,41 @@ api:
     storageClassName: "-"
     storage: "20Gi"
 
-frontend:
+api:
+  ## Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1.
+  replicas: "1"
+  ## The deployment strategy to use to replace existing pods with new ones.
   strategy:
     type: "RollingUpdate"
     rollingUpdate:
       maxSurge: "25%"
       maxUnavailable: "25%"
-  replicas: "1"
-  # NodeSelector is a selector which must be true for the pod to fit on a node.
-  # Selector which must match a node's labels for the pod to be scheduled on that node.
-  # More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ## You can use annotations to attach arbitrary non-identifying metadata to objects.
+  ## Clients such as tools and libraries can retrieve this metadata.
+  annotations: {}
+  ## NodeSelector is a selector which must be true for the pod to fit on a node.
+  ## Selector which must match a node's labels for the pod to be scheduled on that node.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
+  ## Compute Resources required by this container. Cannot be updated.
+  ## More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container
   nodeSelector: {}
-  # Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
-  # effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
+  ## Tolerations are appended (excluding duplicates) to pods running with this RuntimeClass during admission,
+  ## effectively unioning the set of nodes tolerated by the pod and the RuntimeClass.
   tolerations: []
-  # Affinity is a group of affinity scheduling rules.
-  # If specified, the pod's scheduling constraints.
-  # More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
-  affinity: {}
+  ## Affinity is a group of affinity scheduling rules. If specified, the pod's scheduling constraints.
+  ## More info: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#affinity-v1-core
   resources: {}
-  # limits:
-  #     memory: "256Mi"
+  # resources:
+  #   limits:
+  #     memory: "2Gi"
   #     cpu: "1"
   #   requests:
-  #     memory: "256Mi"
+  #     memory: "1Gi"
   #     cpu: "500m"
-  # You can use annotations to attach arbitrary non-identifying metadata to objects. 
-  # Clients such as tools and libraries can retrieve this metadata.
-  annotations: {}
+  ## ConfigMap
+  configmap:
+    DOLPHINSCHEDULER_OPTS: ""
   ## Periodic probe of container liveness. Container will be restarted if the probe fails. Cannot be updated.
   ## More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
   livenessProbe:
@@ -414,10 +370,8 @@ frontend:
     timeoutSeconds: "5"
     failureThreshold: "3"
     successThreshold: "1"
-  ## volumeClaimTemplates is a list of claims that pods are allowed to reference.
-  ## The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod.
-  ## Every claim in this list must have at least one matching (by name) volumeMount in one container in the template.
-  ## A claim in this list takes precedence over any volumes in the template, with the same name.
+  ## PersistentVolumeClaim represents a reference to a PersistentVolumeClaim in the same namespace.
+  ## More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
   persistentVolumeClaim:
     enabled: false
     accessModes:

From 5f40fce1f5544baffe34356e4244aaf0b364fd83 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Sun, 14 Feb 2021 21:37:25 +0800
Subject: [PATCH 82/87] [Improvement][UI] Improve long host display in K8s
 (#4756)

---
 .../pages/monitor/pages/servers/master.vue    | 22 ++++++++++++++-----
 .../pages/monitor/pages/servers/worker.vue    |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
index 40ff14b53d..3f257e5fe8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
@@ -21,8 +21,8 @@
         <div class="row-box" v-for="(item,$index) in masterList" :key="$index">
           <div class="row-title">
             <div class="left">
-              <span class="sp">IP: {{item.host}}</span>
-              <span class="sp">{{$t('Zk registration directory')}}: {{item.zkDirectory}}</span>
+              <span class="sp">Host: {{item.host}}</span>
+              <span>{{$t('Zk registration directory')}}: <a href="javascript:" @click="_showZkDirectories(item)" class="links">{{$t('Directory detail')}}</a></span>
             </div>
             <div class="right">
               <span class="sp">{{$t('Create Time')}}: {{item.createTime | formatDate}}</span>
@@ -57,6 +57,11 @@
           </div>
         </div>
       </div>
+      <el-drawer
+        :visible.sync="drawer"
+        :with-header="false">
+        <zookeeper-directories-popup :zkDirectories = zkDirectories></zookeeper-directories-popup>
+      </el-drawer>
       <div v-if="!masterList.length">
         <m-no-data></m-no-data>
       </div>
@@ -72,6 +77,7 @@
   import mNoData from '@/module/components/noData/noData'
   import themeData from '@/module/echarts/themeData.json'
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
+  import zookeeperDirectoriesPopup from './_source/zookeeperDirectories'
 
   export default {
     name: 'servers-master',
@@ -79,12 +85,18 @@
       return {
         isLoading: false,
         masterList: [],
-        color: themeData.color
+        color: themeData.color,
+        drawer: false,
+        zkDirectories: []
       }
     },
     props: {},
     methods: {
-      ...mapActions('monitor', ['getMasterData'])
+      ...mapActions('monitor', ['getMasterData']),
+      _showZkDirectories (item) {
+        this.zkDirectories = [{ zkDirectory: item.zkDirectory }]
+        this.drawer = true
+      }
     },
     watch: {},
     created () {
@@ -103,7 +115,7 @@
         this.isLoading = false
       })
     },
-    components: { mListConstruction, mSpin, mNoData, mGauge }
+    components: { mListConstruction, mSpin, mNoData, mGauge, zookeeperDirectoriesPopup }
   }
 </script>
 <style lang="scss" rel="stylesheet/scss">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
index 91bae2b41f..2d853ae701 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
@@ -21,7 +21,7 @@
         <div class="row-box" v-for="(item,$index) in workerList" :key="$index">
           <div class="row-title">
             <div class="left">
-              <span class="sp">IP: {{item.host}}</span>
+              <span class="sp">Host: {{item.host}}</span>
               <span>{{$t('Zk registration directory')}}: <a href="javascript:" @click="_showZkDirectories(item)" class="links">{{$t('Directory detail')}}</a></span>
             </div>
             <div class="right">

From fef1a7ef21a811771565aee3e7cba9bd77cfa868 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Mon, 15 Feb 2021 23:38:42 +0800
Subject: [PATCH 83/87] [Fix-4760][api] Repair dolphinscheduler-postgre.sql
 error sql (#4774)

---
 sql/dolphinscheduler-postgre.sql | 7 ++++---
 sql/dolphinscheduler_mysql.sql   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index b242205d3f..6d6d60b3b1 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -767,9 +767,10 @@ INSERT INTO t_ds_user(user_name, user_password, user_type, email, phone, tenant_
 VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', '', '0', 1, '2018-03-27 15:48:50',
         '2018-10-24 17:40:22');
 
--- Records of t_ds_alertgroup，dolphinscheduler warning group
-INSERT INTO t_ds_alertgroup(id,alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
-VALUES (1,'1,2', 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39', '2018-11-29 10:20:39');
+-- Records of t_ds_alertgroup, default admin warning group
+INSERT INTO t_ds_alertgroup(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
+VALUES ('1,2', 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39',
+        '2018-11-29 10:20:39');
 
 -- Records of t_ds_queue,default queue name : default
 INSERT INTO t_ds_queue(queue_name, queue, create_time, update_time)
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index bb6588dbec..79964b7eba 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -812,7 +812,7 @@ VALUES ('1', '1.3.0');
 -- Records of t_ds_alertgroup
 -- ----------------------------
 INSERT INTO `t_ds_alertgroup`
-VALUES (1,"1,2", 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39',
+VALUES ("1,2", 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39',
         '2018-11-29 10:20:39');
 
 -- ----------------------------

From 5025b5015f6fc6c9918d04434b2ce76832d1b627 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Tue, 16 Feb 2021 10:19:27 +0800
Subject: [PATCH 84/87] Repair dolphinscheduler-mysql.sql error sql. (#4780)

---
 sql/dolphinscheduler_mysql.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 79964b7eba..2ce4156475 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -811,7 +811,7 @@ VALUES ('1', '1.3.0');
 -- ----------------------------
 -- Records of t_ds_alertgroup
 -- ----------------------------
-INSERT INTO `t_ds_alertgroup`
+INSERT INTO `t_ds_alertgroup`(alert_instance_ids, create_user_id, group_name, description, create_time, update_time)
 VALUES ("1,2", 1, 'default admin warning group', 'default admin warning group', '2018-11-29 10:20:39',
         '2018-11-29 10:20:39');
 

From 18e4087c7e9f995e86a28dcbd7d3ce16ced590f5 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Tue, 16 Feb 2021 20:22:01 +0800
Subject: [PATCH 85/87] [Improvement][JSONUtils] Improvement JSONUtils parse
 object method (#4781)

* Improvement JSONUtils parse object method.

* update JSONUtils toMap method.

* rerun ut test.
---
 .../common/utils/JSONUtils.java               | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
index 4ab04997d8..73af57929b 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
@@ -211,25 +211,13 @@ public class JSONUtils {
 
     /**
      * json to map
-     * <p>
      * {@link #toMap(String, Class, Class)}
      *
      * @param json json
      * @return json to map
      */
     public static Map<String, String> toMap(String json) {
-        if (StringUtils.isEmpty(json)) {
-            return null;
-        }
-
-        try {
-            return objectMapper.readValue(json, new TypeReference<Map<String, String>>() {
-            });
-        } catch (Exception e) {
-            logger.error("json to map exception!", e);
-        }
-
-        return null;
+        return parseObject(json, new TypeReference<Map<String, String>>() {});
     }
 
     /**
@@ -243,13 +231,24 @@ public class JSONUtils {
      * @return to map
      */
     public static <K, V> Map<K, V> toMap(String json, Class<K> classK, Class<V> classV) {
+        return parseObject(json, new TypeReference<Map<K, V>>() {});
+    }
+
+    /**
+     * json to object
+     *
+     * @param json json string
+     * @param type type reference
+     * @param <T>
+     * @return return parse object
+     */
+    public static <T> T parseObject(String json, TypeReference<T> type) {
         if (StringUtils.isEmpty(json)) {
             return null;
         }
 
         try {
-            return objectMapper.readValue(json, new TypeReference<Map<K, V>>() {
-            });
+            return objectMapper.readValue(json, type);
         } catch (Exception e) {
             logger.error("json to map exception!", e);
         }

From d41dd10a1649ee56c362e115354d287bfa09af66 Mon Sep 17 00:00:00 2001
From: Shiwen Cheng <chengshiwen0103@gmail.com>
Date: Wed, 17 Feb 2021 11:48:47 +0800
Subject: [PATCH 86/87] [Fix][CI] Fix error: unable to resolve action
 apache/skywalking-eyes@9bd5feb (#4784)

---
 .github/workflows/ci_backend.yml | 2 +-
 .github/workflows/ci_e2e.yml     | 2 +-
 .github/workflows/ci_ut.yml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_backend.yml b/.github/workflows/ci_backend.yml
index 7b245d77ef..e19336eab3 100644
--- a/.github/workflows/ci_backend.yml
+++ b/.github/workflows/ci_backend.yml
@@ -49,7 +49,7 @@ jobs:
         with:
           submodule: true
       - name: Check License Header
-        uses: apache/skywalking-eyes@9bd5feb
+        uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/ci_e2e.yml b/.github/workflows/ci_e2e.yml
index 3e781056d0..cab1eeda61 100644
--- a/.github/workflows/ci_e2e.yml
+++ b/.github/workflows/ci_e2e.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           submodule: true
       - name: Check License Header
-        uses: apache/skywalking-eyes@9bd5feb
+        uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository
diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index 09542d97f1..bb1e8c83a9 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -36,7 +36,7 @@ jobs:
         with:
           submodule: true
       - name: Check License Header
-        uses: apache/skywalking-eyes@9bd5feb
+        uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Only enable review / suggestion here
       - uses: actions/cache@v1

From 23591b71a2859021e9280899b1f1b6ff3b679fbc Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Thu, 18 Feb 2021 10:08:23 +0800
Subject: [PATCH 87/87] [Improvement-4751][API] Improvement the duration field
 modify the display to a time-based minute-second format (e.g. 1d 10h 20m 1s)
 (#4752)

* imp ui instance duration field display content.

* update DateUtils format2Duration method.
---
 .../api/service/ProcessInstanceService.java   |  2 +-
 .../api/service/TaskInstanceService.java      |  2 +-
 .../impl/ProcessDefinitionServiceImpl.java    |  2 +-
 .../common/utils/DateUtils.java               | 86 ++++++++++++++++++-
 .../common/utils/DateUtilsTest.java           | 39 +++++++++
 .../dao/entity/ProcessInstance.java           |  6 +-
 .../dao/entity/TaskInstance.java              |  8 +-
 7 files changed, 131 insertions(+), 14 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
index b41ff71f5d..6458a768d8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
@@ -256,7 +256,7 @@ public class ProcessInstanceService extends BaseService {
         List<ProcessInstance> processInstances = processInstanceList.getRecords();
 
         for (ProcessInstance processInstance : processInstances) {
-            processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(), processInstance.getEndTime()));
+            processInstance.setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime()));
             User executor = usersService.queryUser(processInstance.getExecutorId());
             if (null != executor) {
                 processInstance.setExecutorName(executor.getUserName());
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
index dd2caff3b6..6c68202313 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
@@ -131,7 +131,7 @@ public class TaskInstanceService extends BaseService {
         List<TaskInstance> taskInstanceList = taskInstanceIPage.getRecords();
 
         for (TaskInstance taskInstance : taskInstanceList) {
-            taskInstance.setDuration(DateUtils.differSec(taskInstance.getStartTime(), taskInstance.getEndTime()));
+            taskInstance.setDuration(DateUtils.format2Duration(taskInstance.getStartTime(), taskInstance.getEndTime()));
             User executor = usersService.queryUser(taskInstance.getExecutorId());
             if (null != executor) {
                 taskInstance.setExecutorName(executor.getUserName());
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index af91ed2674..2a2ae78618 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -1327,7 +1327,7 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
         List<ProcessInstance> processInstanceList = processInstanceService.queryByProcessDefineId(processId, limit);
 
         for (ProcessInstance processInstance : processInstanceList) {
-            processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(), processInstance.getEndTime()));
+            processInstance.setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime()));
         }
 
         if (limit > processInstanceList.size()) {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
index 80c0ed411c..a5312995ac 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
@@ -241,15 +241,50 @@ public class DateUtils {
      */
     public static String format2Readable(long ms) {
 
-        long days = ms / (1000 * 60 * 60 * 24);
-        long hours = (ms % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);
-        long minutes = (ms % (1000 * 60 * 60)) / (1000 * 60);
-        long seconds = (ms % (1000 * 60)) / 1000;
+        long days = MILLISECONDS.toDays(ms);
+        long hours = MILLISECONDS.toDurationHours(ms);
+        long minutes = MILLISECONDS.toDurationMinutes(ms);
+        long seconds = MILLISECONDS.toDurationSeconds(ms);
 
         return String.format("%02d %02d:%02d:%02d", days, hours, minutes, seconds);
 
     }
 
+    /**
+     *
+     * format time to duration
+     *
+     * @param d1 d1
+     * @param d2 d2
+     * @return format time
+     */
+    public static String format2Duration(Date d1, Date d2) {
+        return format2Duration(differMs(d1, d2));
+    }
+
+    /**
+     * format time to duration
+     *
+     * @param ms ms
+     * @return format time
+     */
+    public static String format2Duration(long ms) {
+
+        long days = MILLISECONDS.toDays(ms);
+        long hours = MILLISECONDS.toDurationHours(ms);
+        long minutes = MILLISECONDS.toDurationMinutes(ms);
+        long seconds = MILLISECONDS.toDurationSeconds(ms);
+
+        StringBuilder strBuilder = new StringBuilder();
+        strBuilder = days > 0 ? strBuilder.append(days).append("d").append(" ") : strBuilder;
+        strBuilder = hours > 0 ? strBuilder.append(hours).append("h").append(" ") : strBuilder;
+        strBuilder = minutes > 0 ? strBuilder.append(minutes).append("m").append(" ") : strBuilder;
+        strBuilder = seconds > 0 ? strBuilder.append(seconds).append("s") : strBuilder;
+
+        return strBuilder.toString();
+
+    }
+
     /**
      * get monday
      * <p>
@@ -454,4 +489,47 @@ public class DateUtils {
         return getCurrentTime(Constants.YYYYMMDDHHMMSSSSS);
     }
 
+    static final long C0 = 1L;
+    static final long C1 = C0 * 1000L;
+    static final long C2 = C1 * 1000L;
+    static final long C3 = C2 * 1000L;
+    static final long C4 = C3 * 60L;
+    static final long C5 = C4 * 60L;
+    static final long C6 = C5 * 24L;
+
+    /**
+     * Time unit representing one thousandth of a second
+     */
+    public static class MILLISECONDS {
+
+        public static long toSeconds(long d) {
+            return d / (C3 / C2);
+        }
+
+        public static long toMinutes(long d) {
+            return d / (C4 / C2);
+        }
+
+        public static long toHours(long d)   {
+            return d / (C5 / C2);
+        }
+
+        public static long toDays(long d)    {
+            return d / (C6 / C2);
+        }
+
+        public static long toDurationSeconds(long d)   {
+            return (d % (C4 / C2)) / (C3 / C2);
+        }
+
+        public static long toDurationMinutes(long d)   {
+            return (d % (C5 / C2)) / (C4 / C2);
+        }
+
+        public static long toDurationHours(long d)   {
+            return (d % (C6 / C2)) / (C5 / C2);
+        }
+
+    }
+
 }
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java
index fa16446cd8..63f0be5906 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java
@@ -157,4 +157,43 @@ public class DateUtilsTest {
         Assert.assertNotNull(timeStamp);
     }
 
+    @Test
+    public void testFormat2Duration() {
+
+        // days hours minutes seconds
+        Date d1 = DateUtils.stringToDate("2020-01-20 11:00:00");
+        Date d2 = DateUtils.stringToDate("2020-01-21 12:10:10");
+        String duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("1d 1h 10m 10s", duration);
+
+        // hours minutes seconds
+        d1 = DateUtils.stringToDate("2020-01-20 11:00:00");
+        d2 = DateUtils.stringToDate("2020-01-20 12:10:10");
+        duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("1h 10m 10s", duration);
+
+        // minutes seconds
+        d1 = DateUtils.stringToDate("2020-01-20 11:00:00");
+        d2 = DateUtils.stringToDate("2020-01-20 11:10:10");
+        duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("10m 10s", duration);
+
+        // minutes seconds
+        d1 = DateUtils.stringToDate("2020-01-20 11:10:00");
+        d2 = DateUtils.stringToDate("2020-01-20 11:10:10");
+        duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("10s", duration);
+
+        d1 = DateUtils.stringToDate("2020-01-20 11:10:00");
+        d2 = DateUtils.stringToDate("2020-01-21 11:10:10");
+        duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("1d 10s", duration);
+
+        d1 = DateUtils.stringToDate("2020-01-20 11:10:00");
+        d2 = DateUtils.stringToDate("2020-01-20 16:10:10");
+        duration = DateUtils.format2Duration(d2, d1);
+        Assert.assertEquals("5h 10s", duration);
+
+    }
+
 }
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
index f1d43a353b..03e81dc92d 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
@@ -202,7 +202,7 @@ public class ProcessInstance {
      * @return
      */
     @TableField(exist = false)
-    private Long duration;
+    private String duration;
 
     /**
      * process instance priority
@@ -547,11 +547,11 @@ public class ProcessInstance {
         this.dependenceScheduleTimes = dependenceScheduleTimes;
     }
 
-    public Long getDuration() {
+    public String getDuration() {
         return duration;
     }
 
-    public void setDuration(Long duration) {
+    public void setDuration(String duration) {
         this.duration = duration;
     }
 
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
index b13ca87e38..ce8d6d58f5 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.dao.entity;
 
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
@@ -170,7 +171,7 @@ public class TaskInstance implements Serializable {
      * duration
      */
     @TableField(exist = false)
-    private Long duration;
+    private String duration;
 
     /**
      * max retry times
@@ -437,11 +438,11 @@ public class TaskInstance implements Serializable {
         this.processInstanceName = processInstanceName;
     }
 
-    public Long getDuration() {
+    public String getDuration() {
         return duration;
     }
 
-    public void setDuration(Long duration) {
+    public void setDuration(String duration) {
         this.duration = duration;
     }
 
@@ -505,7 +506,6 @@ public class TaskInstance implements Serializable {
         return TaskType.CONDITIONS.equals(TaskType.valueOf(this.taskType));
     }
 
-
     /**
      * determine if you can try again
      *