From 60bb2deb2a506d3941b023f5537cd8fa4d29f10d Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Fri, 17 Jan 2020 15:02:47 +0800
Subject: [PATCH 01/35] Modify list tooltip theme color (#1845)

* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color
---
 .../pages/resource/pages/file/pages/list/_source/list.vue     | 4 ++--
 .../pages/resource/pages/udf/pages/function/_source/list.vue  | 2 +-
 .../pages/resource/pages/udf/pages/resource/_source/list.vue  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index c50d392bdb..783eeadab5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -46,11 +46,11 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span class="ellipsis">
+            <span class="ellipsis" v-tooltip.large.top.start.light="{text: item.alias, maxWidth: '500px'}">
               <a href="javascript:" class="links" @click="_go(item)">{{item.alias}}</a>
             </span>
           </td>
-          <td><span class="ellipsis">{{item.fileName}}</span></td>
+          <td><span class="ellipsis" v-tooltip.large.top.start.light="{text: item.fileName, maxWidth: '500px'}">{{item.fileName}}</span></td>
           <td>
             <span v-if="item.description" class="ellipsis" v-tooltip.large.top.start.light="{text: item.description, maxWidth: '500px'}">{{item.description}}</span>
             <span v-else>-</span>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index b0c9b5ac7b..5f788f8223 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -55,7 +55,7 @@ v-ps<template>
             <span>{{$index + 1}}</span>
           </td>
           <td>
-            <span class="ellipsis">
+            <span class="ellipsis" v-tooltip.large.top.start.light="{text: item.funcName, maxWidth: '500px'}">
               <a href="javascript:" class="links">{{item.funcName}}</a>
             </span>
           </td>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index ce288945fb..1f72e51f34 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -49,11 +49,11 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span class="ellipsis">
+            <span class="ellipsis" v-tooltip.large.top.start.light="{text: item.alias, maxWidth: '500px'}">
               <a href="javascript:" class="links" >{{item.alias}}</a>
             </span>
           </td>
-          <td><span class="ellipsis">{{item.fileName}}</span></td>
+          <td><span class="ellipsis" v-tooltip.large.top.start.light="{text: item.fileName, maxWidth: '500px'}">{{item.fileName}}</span></td>
           <td>
             <span>{{_rtSize(item.size)}}</span>
           </td>

From aa91572def773936265c83435e6dc1e6f7d1b1be Mon Sep 17 00:00:00 2001
From: samz406 <lilin5906@163.com>
Date: Fri, 17 Jan 2020 15:04:53 +0800
Subject: [PATCH 02/35] fix Misspelled words (#1841)

* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log

* add BaseServiceTest BaseServiceTest UT

* update

* fix word spelling

* Revert "fix word spelling"

This reverts commit 19bde513504d991443995d0a3246afc86bc537bb.

* fix Misspelled words
---
 .../server/master/runner/MasterExecThread.java                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 6c147e2628..84b1114b84 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -254,7 +254,7 @@ public class MasterExecThread implements Runnable {
                 break;
             }
 
-            //  current process instance sucess ，next execute
+            //  current process instance success ,next execute
             if(null == iterator){
                 // loop by day
                 scheduleDate = DateUtils.getSomeDay(scheduleDate, 1);
@@ -575,7 +575,7 @@ public class MasterExecThread implements Runnable {
     private DependResult isTaskDepsComplete(String taskName) {
 
         Collection<String> startNodes = dag.getBeginNode();
-        // ff the vertex returns true directly
+        // if the vertex returns true directly
         if(startNodes.contains(taskName)){
             return DependResult.SUCCESS;
         }

From abe80fc538428e8cb8923f86bcb2fd1f8aa1ad00 Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Fri, 17 Jan 2020 16:04:59 +0800
Subject: [PATCH 03/35] [Feature] python task logs print delayed (#1844)

* [Feature] python task logs print delayed
#1843
---
 .../worker/task/AbstractCommandExecutor.java   | 18 ++++++++++++------
 .../worker/task/PythonCommandExecutor.java     | 11 +++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

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 11934dea4c..8774186bc5 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
@@ -30,10 +30,7 @@ import org.slf4j.Logger;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -207,7 +204,14 @@ public abstract class AbstractCommandExecutor {
         // merge error information to standard output stream
         processBuilder.redirectErrorStream(true);
         // setting up user to run commands
-        processBuilder.command("sudo", "-u", tenantCode, commandInterpreter(), commandFile);
+        List<String> command = new LinkedList<>();
+        command.add("sudo");
+        command.add("-u");
+        command.add(tenantCode);
+        command.add(commandInterpreter());
+        command.addAll(commandOptions());
+        command.add(commandFile);
+        processBuilder.command(command);
 
         process = processBuilder.start();
 
@@ -559,7 +563,9 @@ public abstract class AbstractCommandExecutor {
         }
     }
 
-
+    protected List<String> commandOptions() {
+        return Collections.emptyList();
+    }
     protected abstract String buildCommandFilePath();
     protected abstract String commandInterpreter();
     protected abstract boolean checkFindApp(String line);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java
index c943e5d9d7..a673134488 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java
@@ -26,6 +26,7 @@ import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.function.Consumer;
@@ -108,6 +109,16 @@ public class PythonCommandExecutor extends AbstractCommandExecutor {
         }
     }
 
+    /**
+     * get command options
+     * @return command options list
+     */
+    @Override
+    protected List<String> commandOptions() {
+        // unbuffered binary stdout and stderr
+        return Collections.singletonList("-u");
+    }
+
     /**
      * get python home
      * @return python home

From c522ea7ebbe78df9233103b2126bf869546c73be Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Fri, 17 Jan 2020 16:55:01 +0800
Subject: [PATCH 04/35] Fix bug: NullPointerException etc. (#1721)

* #1720 Fix bug: NullPointerException etc.

* fix code smell

* Update DateInterval.java

refactor equals method

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 .../dolphinscheduler/alert/runner/AlertSender.java |  5 +++++
 .../api/service/ExecutorService.java               |  8 +++++---
 .../common/model/DateInterval.java                 | 13 ++++++-------
 .../dolphinscheduler/common/utils/HadoopUtils.java | 14 +++++++++-----
 .../dolphinscheduler/dao/utils/DagHelper.java      |  9 +++++++--
 5 files changed, 32 insertions(+), 17 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 d54c2327be..5feb36b60f 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
@@ -101,6 +101,11 @@ public class AlertSender{
             }else if (alert.getAlertType() == AlertType.SMS){
                 retMaps = emailManager.send(getReciversForSMS(users), alert.getTitle(), alert.getContent(),alert.getShowType());
                 alert.setInfo(retMaps);
+            } else {
+                logger.error("AlertType is not defined. code: {}, descp: {}", 
+                    alert.getAlertType().getCode(), 
+                    alert.getAlertType().getDescp());
+                return;
             }
 
             //send flag
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index c1689c5bec..8fa4c013c7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -499,6 +499,10 @@ public class ExecutorService extends BaseService{
             }
         }
 
+        if ( start == null || end == null) {
+            return 0;
+        }
+
         if(commandType == CommandType.COMPLEMENT_DATA){
             runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
             if(null != start && null != end && start.before(end)){
@@ -546,9 +550,7 @@ public class ExecutorService extends BaseService{
         }else{
             command.setCommandParam(JSONUtils.toJson(cmdParam));
             return processDao.createCommand(command);
-        }
-
-        return 0;
+        }  
     }
 
     /**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 3519d5c535..9dc2f34cc1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -35,13 +35,12 @@ public class DateInterval {
 
     @Override
     public boolean equals(Object obj) {
-        try{
-            DateInterval dateInterval = (DateInterval) obj;
-            return startTime.equals(dateInterval.getStartTime()) &&
-                    endTime.equals(dateInterval.getEndTime());
-        }catch (Exception e){
-            return false;
-        }
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DateInterval that = (DateInterval) o;
+        return startTime.equals(that.startTime) &&
+                endTime.equals(that.endTime);
+        
     }
 
     public Date getStartTime() {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
index afc3c44825..541281f793 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
@@ -119,7 +119,9 @@ public class HadoopUtils implements Closeable {
                                     fsRelatedProps.forEach((key, value) -> configuration.set(key, value));
                                 }else{
                                     logger.error("property:{} can not to be empty, please set!", Constants.FS_DEFAULTFS );
-                                    throw new RuntimeException("property:{} can not to be empty, please set!");
+                                    throw new RuntimeException(
+                                        String.format("property: %s can not to be empty, please set!", Constants.FS_DEFAULTFS)
+                                        );
                                 }
                             }else{
                                 logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", Constants.FS_DEFAULTFS, defaultFS);
@@ -219,10 +221,12 @@ public class HadoopUtils implements Closeable {
             return null;
         }
 
-        FSDataInputStream in = fs.open(new Path(hdfsFilePath));
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
-        Stream<String> stream = br.lines().skip(skipLineNums).limit(limit);
-        return stream.collect(Collectors.toList());
+        try (FSDataInputStream in = fs.open(new Path(hdfsFilePath))){
+            BufferedReader br = new BufferedReader(new InputStreamReader(in));
+            Stream<String> stream = br.lines().skip(skipLineNums).limit(limit);
+            return stream.collect(Collectors.toList());
+        }
+        
     }
 
     /**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
index 26d0f1e8e2..ac38ddd2e8 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@@ -96,7 +96,13 @@ public class DagHelper {
             for (String startNodeName : startNodeList) {
                 TaskNode startNode = findNodeByName(taskNodeList, startNodeName);
                 List<TaskNode> childNodeList = new ArrayList<>();
-                if (TaskDependType.TASK_POST == taskDependType) {
+                if (startNode == null) {
+                    logger.error("start node name [{}] is not in task node list [{}] ",
+                        startNodeName,
+                        taskNodeList
+                    );
+                    continue;
+                } else if (TaskDependType.TASK_POST == taskDependType) {
                     childNodeList = getFlowNodeListPost(startNode, taskNodeList);
                 } else if (TaskDependType.TASK_PRE == taskDependType) {
                     childNodeList = getFlowNodeListPre(startNode, recoveryNodeNameList, taskNodeList);
@@ -129,7 +135,6 @@ public class DagHelper {
             if (null != depList && null != startNode && depList.contains(startNode.getName())) {
                 resultList.addAll(getFlowNodeListPost(taskNode, taskNodeList));
             }
-
         }
         resultList.add(startNode);
         return resultList;

From d371745ddfe9d0d6fb91aa666e830db67fc3d2c4 Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Fri, 17 Jan 2020 19:17:31 +0800
Subject: [PATCH 05/35] Fix bug: Use try-with-resources or close this "Socket"
 in a "finally" clause.  (#1716)

* #1714
---
 .../api/utils/FourLetterWordMain.java         | 20 ++++------
 .../server/worker/task/sql/SqlTask.java       | 40 +++++++++++--------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
index d41830eff5..b04e773aea 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
@@ -59,23 +59,22 @@ public class FourLetterWordMain {
      */
     public static String send4LetterWord(String host, int port, String cmd, int timeout)
             throws IOException {
-        LOG.info("connecting to " + host + " " + port);
-        Socket sock = new Socket();
+        LOG.info("connecting to {} {}", host, port);
         InetSocketAddress hostaddress= host != null ? new InetSocketAddress(host, port) :
                 new InetSocketAddress(InetAddress.getByName(null), port);
-        BufferedReader reader = null;
-        try {
+        
+        try (Socket sock = new Socket();
+             OutputStream outstream = sock.getOutputStream();
+             BufferedReader reader =
+                    new BufferedReader(
+                            new InputStreamReader(sock.getInputStream()))) {
             sock.setSoTimeout(timeout);
             sock.connect(hostaddress, timeout);
-            OutputStream outstream = sock.getOutputStream();
             outstream.write(cmd.getBytes());
             outstream.flush();
             // this replicates NC - close the output stream before reading
             sock.shutdownOutput();
 
-            reader =
-                    new BufferedReader(
-                            new InputStreamReader(sock.getInputStream()));
             StringBuilder sb = new StringBuilder();
             String line;
             while((line = reader.readLine()) != null) {
@@ -84,11 +83,6 @@ public class FourLetterWordMain {
             return sb.toString();
         } catch (SocketTimeoutException e) {
             throw new IOException("Exception while executing four letter word: " + cmd, e);
-        } finally {
-            sock.close();
-            if (reader != null) {
-                reader.close();
-            }
         }
     }
 }
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 e8a97fecc5..a2f07c8be3 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
@@ -105,7 +105,7 @@ public class SqlTask extends AbstractTask {
         // set the name of the current thread
         String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT, taskProps.getTaskAppId());
         Thread.currentThread().setName(threadLoggerInfoName);
-        logger.info(sqlParameters.toString());
+        logger.info("Full sql parameters: {}", sqlParameters);
         logger.info("sql type : {}, datasource : {}, sql : {} , localParams : {},udfs : {},showType : {},connParams : {}",
                 sqlParameters.getType(),
                 sqlParameters.getDatasource(),
@@ -289,12 +289,12 @@ public class SqlTask extends AbstractTask {
                 }
             }
 
-            try (PreparedStatement  stmt = prepareStatementAndBind(connection, mainSqlBinds)) {
+            try (PreparedStatement  stmt = prepareStatementAndBind(connection, mainSqlBinds);
+                 ResultSet resultSet = stmt.executeQuery()) {
                 // decide whether to executeQuery or executeUpdate based on sqlType
                 if (sqlParameters.getSqlType() == SqlType.QUERY.ordinal()) {
                     // query statements need to be convert to JsonArray and inserted into Alert to send
                     JSONArray resultJSONArray = new JSONArray();
-                    ResultSet resultSet = stmt.executeQuery();
                     ResultSetMetaData md = resultSet.getMetaData();
                     int num = md.getColumnCount();
 
@@ -305,11 +305,10 @@ public class SqlTask extends AbstractTask {
                         }
                         resultJSONArray.add(mapOfColValues);
                     }
-                    resultSet.close();
                     logger.debug("execute sql : {}", JSONObject.toJSONString(resultJSONArray, SerializerFeature.WriteMapNullValue));
 
                     // if there is a result set
-                    if (resultJSONArray.size() > 0) {
+                    if ( !resultJSONArray.isEmpty() ) {
                         if (StringUtils.isNotEmpty(sqlParameters.getTitle())) {
                             sendAttachment(sqlParameters.getTitle(),
                                     JSONObject.toJSONString(resultJSONArray, SerializerFeature.WriteMapNullValue));
@@ -337,6 +336,12 @@ public class SqlTask extends AbstractTask {
         } catch (Exception e) {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage());
+        } finally {
+            try { 
+                connection.close(); 
+            } catch (Exception e) { 
+                logger.error(e.getMessage(), e); 
+            }
         }
         return connection;
     }
@@ -349,22 +354,23 @@ public class SqlTask extends AbstractTask {
      * @throws Exception
      */
     private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) throws Exception {
-        PreparedStatement  stmt = connection.prepareStatement(sqlBinds.getSql());
         // is the timeout set
         boolean timeoutFlag = taskProps.getTaskTimeoutStrategy() == TaskTimeoutStrategy.FAILED ||
                 taskProps.getTaskTimeoutStrategy() == TaskTimeoutStrategy.WARNFAILED;
-        if(timeoutFlag){
-            stmt.setQueryTimeout(taskProps.getTaskTimeout());
-        }
-        Map<Integer, Property> params = sqlBinds.getParamsMap();
-        if(params != null) {
-            for (Map.Entry<Integer, Property> entry : params.entrySet()) {
-                Property prop = entry.getValue();
-                ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue());
+        try (PreparedStatement  stmt = connection.prepareStatement(sqlBinds.getSql())) {
+            if(timeoutFlag){
+                stmt.setQueryTimeout(taskProps.getTaskTimeout());
+            }
+            Map<Integer, Property> params = sqlBinds.getParamsMap();
+            if(params != null) {
+                for (Map.Entry<Integer, Property> entry : params.entrySet()) {
+                    Property prop = entry.getValue();
+                    ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue());
+                }
             }
+            logger.info("prepare statement replace sql : {} ", stmt);
+            return stmt;
         }
-        logger.info("prepare statement replace sql : {} ",stmt.toString());
-        return stmt;
     }
 
     /**
@@ -452,7 +458,7 @@ public class SqlTask extends AbstractTask {
         for(int i=1;i<=sqlParamsMap.size();i++){
             logPrint.append(sqlParamsMap.get(i).getValue()+"("+sqlParamsMap.get(i).getType()+")");
         }
-        logger.info(logPrint.toString());
+        logger.info("Sql Params are {}", logPrint);
     }
 
     /**

From 16913bacd79fbbdc9caa9154e9c9161be0a6ad68 Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Fri, 17 Jan 2020 21:55:50 +0800
Subject: [PATCH 06/35] fix return, obj error (#1855)

---
 .../api/service/ExecutorService.java              |  4 +++-
 .../common/model/DateInterval.java                | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 8fa4c013c7..3296624df3 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -550,7 +550,9 @@ public class ExecutorService extends BaseService{
         }else{
             command.setCommandParam(JSONUtils.toJson(cmdParam));
             return processDao.createCommand(command);
-        }  
+        }
+
+        return 0;
     }
 
     /**
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 9dc2f34cc1..4ea764cf80 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -35,12 +35,15 @@ public class DateInterval {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DateInterval that = (DateInterval) o;
-        return startTime.equals(that.startTime) &&
-                endTime.equals(that.endTime);
-        
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else if (this == obj) {
+            return true;
+        } else {
+            DateInterval that = (DateInterval) obj;
+            return startTime.equals(that.startTime) &&
+                    endTime.equals(that.endTime);
+        }
     }
 
     public Date getStartTime() {

From 9549910fccb52b2b8726ca26c79dd6daa3aff385 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Sun, 19 Jan 2020 11:59:06 +0800
Subject: [PATCH 07/35] Fix UDF function list delete data without refresh and
 page data display widened #1851 (#1853)

* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color

* Fix UDF function list delete data without refresh and page data display widened
---
 .../resource/pages/udf/pages/function/_source/createUdf.vue | 3 ++-
 .../resource/pages/udf/pages/function/_source/list.vue      | 3 ++-
 .../src/js/module/components/transfer/resource.vue          | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
index 13a337d557..01d8d22650 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
@@ -76,7 +76,8 @@
                     filterable
                     v-model="resourceId"
                     :disabled="isUpdate"
-                    style="width: 200px">
+                    :add-title="true"
+                    style="width: 261px">
               <x-option
                       v-for="city in udfResourceList"
                       :key="city.id"
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 5f788f8223..ed441baad0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -142,7 +142,7 @@ v-ps<template>
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.$emit('_updateList')
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
@@ -156,6 +156,7 @@ v-ps<template>
           showMask: true,
           escClose: true,
           className: 'v-modal-custom',
+          width: '800px',
           transitionName: 'opacityp',
           render (h) {
             return h(mCreateUdf, {
diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index 8b7da81d37..1192ab206e 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -17,7 +17,7 @@
 <template>
   <m-popup :ok-text="$t('Submit')" :nameText="type.name + $t('Authorize')" @ok="_ok" ref="popup">
     <template slot="content">
-      <div class="clearfix transfer-model">
+      <div class="clearfix transfer-model" style="width: 660px">
         <div>
             <x-button-group v-model="checkedValue" size="small">
                 <x-button type="ghost" value="fileResource" @click="_ckFile">{{$t('File resources')}}</x-button>
@@ -195,7 +195,7 @@
   .transfer-model {
     padding: 0 20px;
     .select-list-box {
-      width: 220px;
+      width: 300px;
       float: left;
       border: 1px solid #dcdee2;
       border-radius: 3px;
@@ -237,7 +237,7 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 210px;
+              width: 290px;
               display: inline-block;
             }
             &:hover {

From 30db5c1467a972f5e851fd61c3a2039705d7a618 Mon Sep 17 00:00:00 2001
From: liwenhe1993 <32166572+liwenhe1993@users.noreply.github.com>
Date: Mon, 20 Jan 2020 16:26:23 +0800
Subject: [PATCH 08/35] Api module relp server module/1756 (#1766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts，I deleted CombinedApplicationServer.java

Co-authored-by: dailidong <dailidong66@gmail.com>
---
 .../dolphinscheduler/conf/quartz.properties   |  2 +-
 dolphinscheduler-api/pom.xml                  | 32 ++++---------------
 .../api/service/SchedulerService.java         |  4 +--
 .../src/main/resources/quartz.properties      |  2 +-
 .../dao}/quartz/DruidConnectionProvider.java  |  2 +-
 .../dao}/quartz/ProcessScheduleJob.java       |  2 +-
 .../dao}/quartz/QuartzExecutors.java          |  2 +-
 .../server/master/MasterServer.java           |  4 +--
 .../mysql/dolphinscheduler_dml.sql            |  2 +-
 9 files changed, 17 insertions(+), 35 deletions(-)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/DruidConnectionProvider.java (99%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/ProcessScheduleJob.java (98%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao}/quartz/QuartzExecutors.java (99%)

diff --git a/dockerfile/conf/dolphinscheduler/conf/quartz.properties b/dockerfile/conf/dolphinscheduler/conf/quartz.properties
index 21ebd5e29d..a83abad5bc 100644
--- a/dockerfile/conf/dolphinscheduler/conf/quartz.properties
+++ b/dockerfile/conf/dolphinscheduler/conf/quartz.properties
@@ -47,7 +47,7 @@ org.quartz.jobStore.dataSource = myDs
 #============================================================================
 # Configure Datasources
 #============================================================================
-org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
+org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider
 org.quartz.dataSource.myDs.driver = org.postgresql.Driver
 org.quartz.dataSource.myDs.URL=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
 org.quartz.dataSource.myDs.user=root
diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index ae28a48bb5..1c0ba5e33b 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -31,35 +31,19 @@
     <dependency>
       <groupId>org.apache.dolphinscheduler</groupId>
       <artifactId>dolphinscheduler-alert</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.dolphinscheduler</groupId>
-      <artifactId>dolphinscheduler-server</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-all</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google</groupId>
-          <artifactId>netty</artifactId>
-        </exclusion>
-        <exclusion>
-          <artifactId>leveldbjni-all</artifactId>
-          <groupId>org.fusesource.leveldbjni</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>protobuf-java</artifactId>
-          <groupId>com.google.protobuf</groupId>
+          <groupId>org.apache.dolphinscheduler</groupId>
+          <artifactId>dolphinscheduler-dao</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.dolphinscheduler</groupId>
+      <artifactId>dolphinscheduler-dao</artifactId>
+    </dependency>
+
     <!--springboot-->
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -92,8 +76,6 @@
       </exclusions>
     </dependency>
 
-
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-aop</artifactId>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
index 3c4a42e6cf..582107953e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
@@ -35,8 +35,8 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
 import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
-import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob;
-import org.apache.dolphinscheduler.server.quartz.QuartzExecutors;
+import org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob;
+import org.apache.dolphinscheduler.dao.quartz.QuartzExecutors;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.quartz.CronExpression;
diff --git a/dolphinscheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties
index ceec9e5d64..c9a23af991 100644
--- a/dolphinscheduler-common/src/main/resources/quartz.properties
+++ b/dolphinscheduler-common/src/main/resources/quartz.properties
@@ -58,6 +58,6 @@ org.quartz.jobStore.dataSource = myDs
 #============================================================================
 # Configure Datasources  
 #============================================================================
-org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
+org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider
 org.quartz.dataSource.myDs.maxConnections = 10
 org.quartz.dataSource.myDs.validationQuery = select 1
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
similarity index 99%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
index 05100ac374..8a4ceba927 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.quartz.SchedulerException;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
similarity index 98%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
index 9a19233cba..ac461296a9 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/ProcessScheduleJob.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 
 import org.apache.dolphinscheduler.common.Constants;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
similarity index 99%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java
rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
index d4ad08faec..054d7903fc 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/QuartzExecutors.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.quartz;
+package org.apache.dolphinscheduler.dao.quartz;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 65c5607af7..0647b9450b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -27,8 +27,8 @@ import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerThread;
-import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob;
-import org.apache.dolphinscheduler.server.quartz.QuartzExecutors;
+import org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob;
+import org.apache.dolphinscheduler.dao.quartz.QuartzExecutors;
 import org.apache.dolphinscheduler.server.zk.ZKMasterClient;
 import org.quartz.SchedulerException;
 import org.slf4j.Logger;
diff --git a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
index de56f02b27..6aeafcd700 100644
--- a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
@@ -20,6 +20,6 @@ UPDATE QRTZ_CRON_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='Ea
 UPDATE QRTZ_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_FIRED_TRIGGERS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_JOB_DETAILS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
-UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='cn.escheduler.server.quartz.ProcessScheduleJob';
+UPDATE QRTZ_JOB_DETAILS SET JOB_CLASS_NAME='org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob' WHERE JOB_CLASS_NAME='cn.escheduler.server.quartz.ProcessScheduleJob';
 UPDATE QRTZ_LOCKS SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
 UPDATE QRTZ_SCHEDULER_STATE SET SCHED_NAME='DolphinScheduler' WHERE SCHED_NAME='EasyScheduler';
\ No newline at end of file

From a1b918c3640da933c6c147dc673f7e1a9261728f Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Mon, 20 Jan 2020 16:35:17 +0800
Subject: [PATCH 09/35] [Feature] createSchedule should return schedule's Id
 (#1861)

issue: https://github.com/apache/incubator-dolphinscheduler/issues/1860
---
 .../apache/dolphinscheduler/api/service/SchedulerService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
index 582107953e..bdce9470ca 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
@@ -167,6 +167,7 @@ public class SchedulerService extends BaseService {
         processDefinitionMapper.updateById(processDefinition);
         putMsg(result, Status.SUCCESS);
 
+        result.put("scheduleId", scheduleObj.getId());
         return result;
     }
 

From 0d5c6e4e7c2a75eac44e1d8f711b2b1c3e8862ac Mon Sep 17 00:00:00 2001
From: "gabry.wu" <wu_shao_jie@qq.com>
Date: Wed, 22 Jan 2020 21:09:12 +0800
Subject: [PATCH 10/35] [Feature] set acquireTriggersWithinLock true (#1866)

issue: https://github.com/apache/incubator-dolphinscheduler/issues/1863
---
 dolphinscheduler-common/src/main/resources/quartz.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dolphinscheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties
index c9a23af991..2e3a2a0dc1 100644
--- a/dolphinscheduler-common/src/main/resources/quartz.properties
+++ b/dolphinscheduler-common/src/main/resources/quartz.properties
@@ -53,6 +53,7 @@ org.quartz.jobStore.tablePrefix = QRTZ_
 org.quartz.jobStore.isClustered = true
 org.quartz.jobStore.misfireThreshold = 60000
 org.quartz.jobStore.clusterCheckinInterval = 5000
+org.quartz.jobStore.acquireTriggersWithinLock=true
 org.quartz.jobStore.dataSource = myDs
 
 #============================================================================

From ff9009a5aeef3df1c2031f9bc2eaa094b9dc833c Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Wed, 22 Jan 2020 23:16:13 +0800
Subject: [PATCH 11/35] #1864 fix dependency and createCommand date check
 (#1865)

---
 dolphinscheduler-api/pom.xml                                  | 4 ++++
 .../apache/dolphinscheduler/api/service/ExecutorService.java  | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 1c0ba5e33b..cf2aadfcb4 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -43,6 +43,10 @@
       <groupId>org.apache.dolphinscheduler</groupId>
       <artifactId>dolphinscheduler-dao</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.dolphinscheduler</groupId>
+      <artifactId>dolphinscheduler-server</artifactId>
+    </dependency>
 
     <!--springboot-->
     <dependency>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 3296624df3..c1689c5bec 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -499,10 +499,6 @@ public class ExecutorService extends BaseService{
             }
         }
 
-        if ( start == null || end == null) {
-            return 0;
-        }
-
         if(commandType == CommandType.COMPLEMENT_DATA){
             runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
             if(null != start && null != end && start.before(end)){

From 3c9508a1473471fe50caec57315581e1fe628261 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 09:50:21 +0800
Subject: [PATCH 12/35] Update README.md (#1867)

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

diff --git a/README.md b/README.md
index 27b5312f32..fc27ad68a0 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ It is because of the shoulders of these open source projects that the birth of t
 
 ### Get Help
 1. Submit an issue
-1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org
+1. Subscribe the mail list : https://dolphinscheduler.apache.org/en-us/docs/development/subscribe.html.  then send mail to dev@dolphinscheduler.apache.org
 1. Contact WeChat group manager, ID 510570367. This is for Mandarin(CN) discussion.
 
 ### License

From 8574762b37ad83f7659e5f58ee966c6171560505 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:01:48 +0800
Subject: [PATCH 13/35] Update README_zh_CN.md (#1868)

---
 README_zh_CN.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README_zh_CN.md b/README_zh_CN.md
index c7173ad9ba..fcffd680e0 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -83,13 +83,12 @@ dolphinscheduler-dist/dolphinscheduler-src/target/apache-dolphinscheduler-incuba
 ### 感谢
 
 Dolphin Scheduler使用了很多优秀的开源项目，比如google的guava、guice、grpc，netty，ali的bonecp，quartz，以及apache的众多开源项目等等，
-正是由于站在这些开源项目的肩膀上，才有Dolphin Scheduler的诞生的可能。对此我们对使用的所有开源软件表示非常的感谢！我们也希望自己不仅是开源的受益者，也能成为开源的
-贡献者，于是我们决定把易调度贡献出来，并承诺长期维护。也希望对开源有同样热情和信念的伙伴加入进来，一起为开源献出一份力！
+正是由于站在这些开源项目的肩膀上，才有Dolphin Scheduler的诞生的可能。对此我们对使用的所有开源软件表示非常的感谢！我们也希望自己不仅是开源的受益者，也能成为开源的贡献者,也希望对开源有同样热情和信念的伙伴加入进来，一起为开源献出一份力！
 
 
 ### 获得帮助
 1. 提交issue
-1. 先订阅邮件开发列表:[订阅邮件列表](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/subscribe.html), 订阅成功后发送邮件到dev@dolphinscheduler.apache.org.
+1. 先订阅邮件开发列表:[订阅邮件列表](https://dolphinscheduler.apache.org/zh-cn/docs/development/subscribe.html), 订阅成功后发送邮件到dev@dolphinscheduler.apache.org.
 1. 联系微信群助手(ID:dailidong66). 微信仅用于中国用户讨论.
 
 ### 版权

From b5a1028f79a522f841be2600f5f77128c596995b Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:08:38 +0800
Subject: [PATCH 14/35] Update README_zh_CN.md (#1869)

fix wrong upgrade url
---
 README_zh_CN.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_zh_CN.md b/README_zh_CN.md
index fcffd680e0..e782c1030d 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -50,7 +50,7 @@ Dolphin Scheduler Official Website
 
 - [**使用手册**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/system-manual.html?_blank "系统使用手册")
 
-- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/release/upgrade.html?_blank "升级文档")
+- [**升级文档**](https://dolphinscheduler.apache.org/zh-cn/docs/1.2.0/user_doc/upgrade.html?_blank "升级文档")
 
 - <a href="http://106.75.43.194:8888" target="_blank">我要体验</a>
 

From 541f71c74a8e41abaa63c33b3564a5ca8729e194 Mon Sep 17 00:00:00 2001
From: DS <d66380022@163.com>
Date: Fri, 24 Jan 2020 10:11:30 +0800
Subject: [PATCH 15/35] Update README.md (#1870)

fix wrong upgrade url
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fc27ad68a0..3fbd6345b6 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Overload processing: Task queue mechanism, the number of schedulable tasks on a
 
 - [**User manual**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/system-manual.html?_blank "System manual")
 
-- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/release/upgrade.html?_blank "Upgrade document")
+- [**Upgrade document**](https://dolphinscheduler.apache.org/en-us/docs/1.2.0/user_doc/upgrade.html?_blank "Upgrade document")
 
 - <a href="http://106.75.43.194:8888" target="_blank">Online Demo</a>
 

From 0712ccc34284aa7a7053f8756b954eef50cd9617 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Sun, 26 Jan 2020 13:30:59 +0800
Subject: [PATCH 16/35] #1871 correct spelling (#1872)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling
---
 .../server/master/runner/MasterExecThread.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 84b1114b84..2d0e99a867 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -187,7 +187,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * execute process
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void executeProcess() throws Exception {
         prepareProcess();
@@ -197,7 +197,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * execute complement process
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void executeComplementProcess() throws Exception {
 
@@ -247,7 +247,7 @@ public class MasterExecThread implements Runnable {
             // execute process ,waiting for end
             runProcess();
 
-            // process instace failure ，no more complements
+            // process instance failure ，no more complements
             if(!processInstance.getState().typeIsSuccess()){
                 logger.info("process {} state {}, complement not completely!",
                         processInstance.getId(), processInstance.getState());
@@ -304,7 +304,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      * prepare process parameter
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void prepareProcess() throws Exception {
         // init task queue
@@ -332,7 +332,7 @@ public class MasterExecThread implements Runnable {
 
     /**
      *  generate process dag
-     * @throws Exception excpetion
+     * @throws Exception exception
      */
     private void buildFlowDag() throws Exception {
         recoverNodeIdList = getStartTaskInstanceList(processInstance.getCommandParam());
@@ -609,7 +609,7 @@ public class MasterExecThread implements Runnable {
     /**
      * query task instance by complete state
      * @param state state
-     * @return task isntance list
+     * @return task instance list
      */
     private List<TaskInstance> getCompleteTaskByState(ExecutionStatus state){
         List<TaskInstance> resultList = new ArrayList<>();
@@ -804,7 +804,7 @@ public class MasterExecThread implements Runnable {
     }
 
     /**
-     * add task to standy list
+     * add task to standby list
      * @param taskInstance task instance
      */
     private void addTaskToStandByList(TaskInstance taskInstance){

From 38eaaa98e689f1a84b416d39ea6e78140d56f2e2 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Mon, 27 Jan 2020 21:09:11 +0800
Subject: [PATCH 17/35] some updates for TaskQueueZkImpl (#1874)

small changes, no need more people review, I will merge.
---
 .../common/queue/TaskQueueZkImpl.java         | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
index 5f834a2004..d442c13ebc 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
@@ -30,7 +30,7 @@ import java.util.*;
 
 /**
  * A singleton of a task queue implemented with zookeeper
- * tasks queue implemention
+ * tasks queue implementation
  */
 @Service
 public class TaskQueueZkImpl implements ITaskQueue {
@@ -72,7 +72,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
         } catch (Exception e) {
             logger.error("get all tasks from tasks queue exception",e);
         }
-        return new ArrayList<>();
+        return Collections.emptyList();
     }
 
     /**
@@ -196,11 +196,11 @@ public class TaskQueueZkImpl implements ITaskQueue {
                     }
                 }
 
-                List<String> taskslist = getTasksListFromTreeSet(tasksNum, taskTreeSet);
+                List<String> tasksList = getTasksListFromTreeSet(tasksNum, taskTreeSet);
 
-                logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(taskslist.toArray()), size - taskslist.size());
+                logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(tasksList.toArray()), size - tasksList.size());
 
-                return taskslist;
+                return tasksList;
             }else{
                 Thread.sleep(Constants.SLEEP_TIME_MILLIS);
             }
@@ -208,7 +208,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
         } catch (Exception e) {
             logger.error("add task to tasks queue exception",e);
         }
-        return new ArrayList<String>();
+        return Collections.emptyList();
     }
 
 
@@ -221,15 +221,15 @@ public class TaskQueueZkImpl implements ITaskQueue {
     public List<String> getTasksListFromTreeSet(int tasksNum, Set<String> taskTreeSet) {
         Iterator<String> iterator = taskTreeSet.iterator();
         int j = 0;
-        List<String> taskslist = new ArrayList<>(tasksNum);
+        List<String> tasksList = new ArrayList<>(tasksNum);
         while(iterator.hasNext()){
             if(j++ >= tasksNum){
                 break;
             }
             String task = iterator.next();
-            taskslist.add(getOriginTaskFormat(task));
+            tasksList.add(getOriginTaskFormat(task));
         }
-        return taskslist;
+        return tasksList;
     }
 
     /**
@@ -330,22 +330,13 @@ public class TaskQueueZkImpl implements ITaskQueue {
      */
     @Override
     public Set<String> smembers(String key) {
-
-        Set<String> tasksSet = new HashSet<>();
-
         try {
             List<String> list = zookeeperOperator.getChildrenKeys(getTasksPath(key));
-
-            for (String task : list) {
-                tasksSet.add(task);
-            }
-
-            return tasksSet;
+            return new HashSet<>(list);
         } catch (Exception e) {
             logger.error("get all tasks from tasks queue exception",e);
         }
-
-        return tasksSet;
+        return Collections.emptySet();
     }
 
     /**

From a5536617dded33542790d4f44aa8ef6fcd3c7774 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Thu, 30 Jan 2020 19:50:04 +0800
Subject: [PATCH 18/35] remove unused properties in pom (#1876)

* #1875 remove unused properties in pom
---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d55c1e99c..ebc7ccf68c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,6 @@
 		<slf4j.api.version>1.7.5</slf4j.api.version>
 		<slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
 		<commons.collections.version>3.2.2</commons.collections.version>
-		<commons.lang.version>2.3</commons.lang.version>
-		<commons.lang3.version>3.5</commons.lang3.version>
 		<commons.httpclient>3.0.1</commons.httpclient>
 		<commons.beanutils.version>1.7.0</commons.beanutils.version>
 		<commons.configuration.version>1.10</commons.configuration.version>

From 6b0debec79205b28886ac52b1b40dcc2c5cb61d2 Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Sat, 1 Feb 2020 16:10:17 +0800
Subject: [PATCH 19/35] some updates for pom (#1879)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning
---
 dolphinscheduler-api/pom.xml                  |    5 -
 .../src/main/resources/combined_logback.xml   |   80 -
 pom.xml                                       | 1680 +++++++++--------
 3 files changed, 842 insertions(+), 923 deletions(-)
 delete mode 100644 dolphinscheduler-api/src/main/resources/combined_logback.xml

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index cf2aadfcb4..4dd2f31f8e 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -178,11 +178,6 @@
       <artifactId>hadoop-aws</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
diff --git a/dolphinscheduler-api/src/main/resources/combined_logback.xml b/dolphinscheduler-api/src/main/resources/combined_logback.xml
deleted file mode 100644
index ece13d04b9..0000000000
--- a/dolphinscheduler-api/src/main/resources/combined_logback.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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.
-  -->
-
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="120 seconds">
-    <property name="log.base" value="logs"/>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>
-                %highlight([%level]) %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{10}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-    <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.TaskLogFilter"></filter>
-        <Discriminator class="org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator">
-            <key>taskAppId</key>
-            <logBase>${log.base}</logBase>
-        </Discriminator>
-        <sift>
-            <appender name="FILE-${taskAppId}" class="ch.qos.logback.core.FileAppender">
-                <file>${log.base}/${taskAppId}.log</file>
-                <encoder>
-                    <pattern>
-                        [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-                    </pattern>
-                    <charset>UTF-8</charset>
-                </encoder>
-                <append>true</append>
-            </appender>
-        </sift>
-    </appender>
-
-    <appender name="COMBINEDLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.base}/dolphinscheduler-combined.log</file>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter">
-            <level>INFO</level>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.base}/dolphinscheduler-combined.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <maxHistory>168</maxHistory>
-            <maxFileSize>200MB</maxFileSize>
-        </rollingPolicy>
-        　　　　　
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        　　
-    </appender>
-
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="TASKLOGFILE"/>
-        <appender-ref ref="COMBINEDLOGFILE"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ebc7ccf68c..742c15e636 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,843 +16,847 @@
   ~ 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">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.dolphinscheduler</groupId>
-	<artifactId>dolphinscheduler</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>${project.artifactId}</name>
-	<url>http://dolphinscheduler.apache.org</url>
-	<description>Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated to solving the complex dependencies in data processing, making the scheduling system out of the box for data processing.</description>
-	<licenses>
-		<license>
-			<name>Apache License 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:git:https://github.com/apache/incubator-dolphinscheduler.git</connection>
-		<developerConnection>scm:git:https://github.com/apache/incubator-dolphinscheduler.git</developerConnection>
-		<url>https://github.com/apache/incubator-dolphinscheduler</url>
-		<tag>HEAD</tag>
-	</scm>
-	<mailingLists>
-		<mailingList>
-			<name>DolphinScheduler Developer List</name>
-			<post>dev@dolphinscheduler.incubator.apache.org</post>
-			<subscribe>dev-subscribe@dolphinscheduler.incubator.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@dolphinscheduler.incubator.apache.org</unsubscribe>
-		</mailingList>
-	</mailingLists>
-	<parent>
-		<groupId>org.apache</groupId>
-		<artifactId>apache</artifactId>
-		<version>21</version>
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<curator.version>2.12.0</curator.version>
-		<spring.version>5.1.5.RELEASE</spring.version>
-		<spring.boot.version>2.1.3.RELEASE</spring.boot.version>
-		<java.version>1.8</java.version>
-		<logback.version>1.2.3</logback.version>
-		<hadoop.version>2.7.3</hadoop.version>
-		<quartz.version>2.2.3</quartz.version>
-		<jackson.version>2.9.8</jackson.version>
-		<mybatis-plus.version>3.2.0</mybatis-plus.version>
-		<mybatis.spring.version>2.0.1</mybatis.spring.version>
-		<cron.utils.version>5.0.5</cron.utils.version>
-		<fastjson.version>1.2.61</fastjson.version>
-		<druid.version>1.1.14</druid.version>
-		<h2.version>1.3.163</h2.version>
-		<commons.codec.version>1.6</commons.codec.version>
-		<commons.logging.version>1.1.1</commons.logging.version>
-		<httpclient.version>4.4.1</httpclient.version>
-		<httpcore.version>4.4.1</httpcore.version>
-		<junit.version>4.12</junit.version>
-		<mysql.connector.version>5.1.34</mysql.connector.version>
-		<slf4j.api.version>1.7.5</slf4j.api.version>
-		<slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
-		<commons.collections.version>3.2.2</commons.collections.version>
-		<commons.httpclient>3.0.1</commons.httpclient>
-		<commons.beanutils.version>1.7.0</commons.beanutils.version>
-		<commons.configuration.version>1.10</commons.configuration.version>
-		<commons.email.version>1.5</commons.email.version>
-		<poi.version>3.17</poi.version>
-		<javax.servlet.api.version>3.1.0</javax.servlet.api.version>
-		<commons.collections4.version>4.1</commons.collections4.version>
-		<guava.version>20.0</guava.version>
-		<postgresql.version>42.1.4</postgresql.version>
-		<hive.jdbc.version>2.1.0</hive.jdbc.version>
-		<commons.io.version>2.4</commons.io.version>
-		<oshi.core.version>3.5.0</oshi.core.version>
-		<clickhouse.jdbc.version>0.1.52</clickhouse.jdbc.version>
-		<mssql.jdbc.version>6.1.0.jre8</mssql.jdbc.version>
-		<jsp.version>6.1.14</jsp.version>
-		<spotbugs.version>3.1.12</spotbugs.version>
-		<checkstyle.version>3.0.0</checkstyle.version>
-		<apache.rat.version>0.13</apache.rat.version>
-		<zookeeper.version>3.4.14</zookeeper.version>
-		<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
-		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-		<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
-		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-		<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
-		<maven-source-plugin.version>2.4</maven-source-plugin.version>
-		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
-		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
-		<rpm-maven-plugion.version>2.2.0</rpm-maven-plugion.version>
-		<jacoco.version>0.8.4</jacoco.version>
-		<jcip.version>1.0</jcip.version>
-		<maven.deploy.skip>false</maven.deploy.skip>
-		<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
-		<mockito.version>2.21.0</mockito.version>
-		<powermock.version>2.0.2</powermock.version>
-		<jasper-runtime.version>5.5.23</jasper-runtime.version>
-		<servlet-api.version>2.5</servlet-api.version>
-		<swagger.version>1.9.3</swagger.version>
-		<springfox.version>2.9.2</springfox.version>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.baomidou</groupId>
-				<artifactId>mybatis-plus-boot-starter</artifactId>
-				<version>${mybatis-plus.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.baomidou</groupId>
-				<artifactId>mybatis-plus</artifactId>
-				<version>${mybatis-plus.version}</version>
-			</dependency>
-			<!-- quartz-->
-			<dependency>
-				<groupId>org.quartz-scheduler</groupId>
-				<artifactId>quartz</artifactId>
-				<version>${quartz.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.quartz-scheduler</groupId>
-				<artifactId>quartz-jobs</artifactId>
-				<version>${quartz.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.cronutils</groupId>
-				<artifactId>cron-utils</artifactId>
-				<version>${cron.utils.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.alibaba</groupId>
-				<artifactId>fastjson</artifactId>
-				<version>${fastjson.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.alibaba</groupId>
-				<artifactId>druid</artifactId>
-				<version>${druid.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-parent</artifactId>
-				<version>${spring.boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-tx</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-test</artifactId>
-				<version>${spring.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>${h2.version}</version>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-server</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-common</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-dao</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-api</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-rpc</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.dolphinscheduler</groupId>
-				<artifactId>dolphinscheduler-alert</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.curator</groupId>
-				<artifactId>curator-framework</artifactId>
-				<version>${curator.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.curator</groupId>
-				<artifactId>curator-recipes</artifactId>
-				<version>${curator.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.zookeeper</groupId>
-				<artifactId>zookeeper</artifactId>
-				<exclusions>
-					<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-					</exclusion>
-					<exclusion>
-						<artifactId>netty</artifactId>
-						<groupId>io.netty</groupId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.github.spotbugs</groupId>
-						<artifactId>spotbugs-annotations</artifactId>
-					</exclusion>
-				</exclusions>
-				<version>${zookeeper.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>${commons.codec.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
-				<version>${commons.logging.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>${httpclient.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
-				<version>${httpcore.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-core</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>${mockito.version}</version>
-				<type>jar</type>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.powermock</groupId>
-				<artifactId>powermock-module-junit4</artifactId>
-				<version>${powermock.version}</version>
-				<type>jar</type>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.powermock</groupId>
-				<artifactId>powermock-api-mockito2</artifactId>
-				<version>${powermock.version}</version>
-				<type>jar</type>
-				<scope>test</scope>
-				<exclusions>
-					<exclusion>
-						<groupId>org.mockito</groupId>
-						<artifactId>mockito-core</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
-			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>${mysql.connector.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j.api.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>${slf4j.log4j12.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>${commons.collections.version}</version>
-		  	</dependency>
-
-			<dependency>
-				<groupId>commons-httpclient</groupId>
-				<artifactId>commons-httpclient</artifactId>
-				<version>${commons.httpclient}</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-beanutils</groupId>
-				<artifactId>commons-beanutils</artifactId>
-				<version>${commons.beanutils.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-configuration</groupId>
-				<artifactId>commons-configuration</artifactId>
-				<version>${commons.configuration.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-classic</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-core</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-email</artifactId>
-				<version>${commons.email.version}</version>
-			</dependency>
-
-			<!--excel poi-->
-			<dependency>
-				<groupId>org.apache.poi</groupId>
-				<artifactId>poi</artifactId>
-				<version>${poi.version}</version>
-			</dependency>
-
-			<!-- hadoop -->
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-common</artifactId>
-				<version>${hadoop.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>slf4j-log4j12</artifactId>
-						<groupId>org.slf4j</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>com.sun.jersey</artifactId>
-						<groupId>jersey-json</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-client</artifactId>
-				<version>${hadoop.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-hdfs</artifactId>
-				<version>${hadoop.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-yarn-common</artifactId>
-				<version>${hadoop.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.hadoop</groupId>
-				<artifactId>hadoop-aws</artifactId>
-				<version>${hadoop.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>${javax.servlet.api.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-collections4</artifactId>
-				<version>${commons.collections4.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>${guava.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.postgresql</groupId>
-				<artifactId>postgresql</artifactId>
-				<version>${postgresql.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.hive</groupId>
-				<artifactId>hive-jdbc</artifactId>
-				<version>${hive.jdbc.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>${commons.io.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.github.oshi</groupId>
-				<artifactId>oshi-core</artifactId>
-				<version>${oshi.core.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>ru.yandex.clickhouse</groupId>
-				<artifactId>clickhouse-jdbc</artifactId>
-				<version>${clickhouse.jdbc.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.microsoft.sqlserver</groupId>
-				<artifactId>mssql-jdbc</artifactId>
-				<version>${mssql.jdbc.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>net.jcip</groupId>
-				<artifactId>jcip-annotations</artifactId>
-				<version>${jcip.version}</version>
-				<optional>true</optional>
-			</dependency>
-			<dependency>
-				<groupId>tomcat</groupId>
-				<artifactId>jasper-runtime</artifactId>
-				<version>${jasper-runtime.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>${servlet-api.version}</version>
-			</dependency>
-      <dependency>
-        <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger2</artifactId>
-        <version>${springfox.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.springfox</groupId>
-        <artifactId>springfox-swagger-ui</artifactId>
-        <version>${springfox.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.github.xiaoymin</groupId>
-        <artifactId>swagger-bootstrap-ui</artifactId>
-        <version>${swagger.version}</version>
-      </dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<build>
-
-		<finalName>apache-dolphinscheduler-incubating-${project.version}</finalName>
-
-		<pluginManagement>
-			<plugins>
-
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>rpm-maven-plugin</artifactId>
-					<version>${rpm-maven-plugion.version}</version>
-					<inherited>false</inherited>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>${java.version}</source>
-						<target>${java.version}</target>
-						<testSource>${java.version}</testSource>
-						<testTarget>${java.version}</testTarget>
-					</configuration>
-					<version>${maven-compiler-plugin.version}</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>${maven-release-plugin.version}</version>
-					<configuration>
-						<tagNameFormat>@{project.version}</tagNameFormat>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>${maven-assembly-plugin.version}</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>${maven-javadoc-plugin.version}</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>${maven-source-plugin.version}</version>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>${maven-dependency-plugin.version}</version>
-
-				</plugin>
-			</plugins>
-
-		</pluginManagement>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<aggregate>true</aggregate>
-					<charset>${project.build.sourceEncoding}</charset>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<docencoding>${project.build.sourceEncoding}</docencoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>${maven-release-plugin.version}</version>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<tagNameFormat>@{project.version}</tagNameFormat>
-					<tagBase>${project.version}</tagBase>
-					<!--<goals>-f pom.xml deploy</goals>-->
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.scm</groupId>
-						<artifactId>maven-scm-provider-jgit</artifactId>
-						<version>1.9.5</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<skip>false</skip><!--not skip compile test classes-->
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<includes>
-						<include>**/common/utils/*.java</include>
-						<include>**/common/threadutils/*.java</include>
-						<include>**/common/graph/*.java</include>
-						<include>**/common/queue/*.java</include>
-						<include>**/api/utils/CheckUtilsTest.java</include>
-						<include>**/api/utils/FileUtilsTest.java</include>
-						<include>**/api/utils/exportprocess/DataSourceParamTest.java</include>
-						<include>**/api/utils/exportprocess/DependentParamTest.java</include>
-						<include>**/api/enums/*.java</include>
-						<include>**/api/service/AccessTokenServiceTest.java</include>
-						<include>**/api/service/QueueServiceTest.java</include>
-						<include>**/api/service/MonitorServiceTest.java</include>
-						<include>**/api/service/SessionServiceTest.java</include>
-						<include>**/api/service/UsersServiceTest.java</include>
-						<include>**/api/service/TenantServiceTest.java</include>
-						<include>**/api/service/WorkerGroupServiceTest.java</include>
-						<include>**/api/service/AlertGroupServiceTest.java</include>
-						<include>**/api/service/ProjectServiceTest.java</include>
-						<include>**/api/service/ProcessDefinitionServiceTest.java</include>
-						<include>**/api/service/UdfFuncServiceTest.java</include>
-						<include>**/api/service/ResourcesServiceTest.java</include>
-						<include>**/api/service/ExecutorService2Test.java</include>
-						<include>**/api/service/BaseServiceTest.java</include>
-						<include>**/api/service/BaseDAGServiceTest.java</include>
-						<include>**/alert/utils/ExcelUtilsTest.java</include>
-						<include>**/alert/utils/FuncUtilsTest.java</include>
-						<include>**/alert/utils/JSONUtilsTest.java</include>
-						<include>**/alert/utils/PropertyUtilsTest.java</include>
-						<include>**/server/utils/SparkArgsUtilsTest.java</include>
-						<include>**/server/utils/FlinkArgsUtilsTest.java</include>
-						<include>**/server/utils/ParamUtilsTest.java</include>
-						<include>**/server/utils/ScheduleUtilsTest.java</include>
-						<include>**/server/master/MasterExecThreadTest.java</include>
-						<include>**/dao/mapper/AccessTokenMapperTest.java</include>
-						<include>**/dao/mapper/AlertGroupMapperTest.java</include>
-						<include>**/dao/mapper/AlertMapperTest.java</include>
-						<include>**/dao/mapper/CommandMapperTest.java</include>
-						<include>**/alert/template/AlertTemplateFactoryTest.java</include>
-						<include>**/alert/template/impl/DefaultHTMLTemplateTest.java</include>
-					</includes>
-					<!-- <skip>true</skip> -->
-				</configuration>
-			</plugin>
-
-			<!-- jenkins plugin jacoco report-->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
-				<configuration>
-					<destFile>target/jacoco.exec</destFile>
-					<dataFile>target/jacoco.exec</dataFile>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jacoco-initialize</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-site</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<version>${apache.rat.version}</version>
-				<configuration>
-					<includes>
-						<include>**/*.java</include>
-						<include>**/dolphinscheduler-ui/src/**/*.scss</include>
-						<include>**/dolphinscheduler-ui/src/**/*.css</include>
-						<include>**/dolphinscheduler-ui/src/**/*.vue</include>
-						<include>**/dolphinscheduler-ui/src/**/*.js</include>
-						<include>**/dolphinscheduler-ui/src/**/*.html</include>
-					</includes>
-					<excludes>
-						<exclude>**/dolphinscheduler-ui/src/lib/**</exclude>
-						<exclude>**/dolphinscheduler-ui/src/js/module/util/cookie.js</exclude>
-						<exclude>**/dolphinscheduler-ui/src/font/awesome/font-awesome.css</exclude>
-						<exclude>**/dolphinscheduler-ui/src/sass/common/_animation.scss</exclude>
-						<exclude>**/dolphinscheduler-ui/src/sass/common/_normalize.scss</exclude>
-						<exclude>**/dolphinscheduler-ui/src/combo/1.0.0/es5.js</exclude>
-						<exclude>**/dolphinscheduler-ui/src/combo/1.0.0/base.css</exclude>
-						<exclude>**/dolphinscheduler-ui/src/view/common/outro.inc</exclude>
-						<exclude>**/dolphinscheduler-ui/src/view/common/meta.inc</exclude>
-						<exclude>**/dolphinscheduler-ui/src/combo/1.0.0/3rd.css</exclude>
-						<exclude>**/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java</exclude>
-					</excludes>
-					<consoleOutput>true</consoleOutput>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.github.spotbugs</groupId>
-				<artifactId>spotbugs-maven-plugin</artifactId>
-				<version>${spotbugs.version}</version>
-				<configuration>
-					<xmlOutput>true</xmlOutput>
-					<threshold>medium</threshold>
-					<effort>default</effort>
-					<excludeFilterFile>dev-config/spotbugs-exclude.xml</excludeFilterFile>
-					<failOnError>true</failOnError>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>com.github.spotbugs</groupId>
-						<artifactId>spotbugs</artifactId>
-						<version>4.0.0-beta4</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>${checkstyle.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.puppycrawl.tools</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>8.18</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<consoleOutput>true</consoleOutput>
-					<encoding>UTF-8</encoding>
-					<configLocation>style/checkstyle.xml</configLocation>
-					<suppressionsLocation>style/checkstyle-suppressions.xml</suppressionsLocation>
-					<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-					<failOnViolation>true</failOnViolation>
-					<violationSeverity>warning</violationSeverity>
-					<includeTestSourceDirectory>true</includeTestSourceDirectory>
-					<sourceDirectories>
-						<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-					</sourceDirectories>
-					<excludes>**\/generated-sources\/</excludes>
-					<skip>true</skip>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>${cobertura-maven-plugin.version}</version>
-				<configuration>
-					<check>
-					</check>
-					<aggregate>true</aggregate>
-					<outputDirectory>./target/cobertura</outputDirectory>
-					<encoding>${project.build.sourceEncoding}</encoding>
-					<quiet>true</quiet>
-					<format>xml</format>
-					<instrumentation>
-						<ignoreTrivial>true</ignoreTrivial>
-					</instrumentation>
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
-
-	<modules>
-		<module>dolphinscheduler-ui</module>
-		<module>dolphinscheduler-server</module>
-		<module>dolphinscheduler-common</module>
-		<module>dolphinscheduler-api</module>
-		<module>dolphinscheduler-dao</module>
-		<module>dolphinscheduler-alert</module>
-		<module>dolphinscheduler-rpc</module>
-		<module>dolphinscheduler-dist</module>
-	</modules>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.dolphinscheduler</groupId>
+    <artifactId>dolphinscheduler</artifactId>
+    <version>1.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <url>http://dolphinscheduler.apache.org</url>
+    <description>Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated
+        to solving the complex dependencies in data processing, making the scheduling system out of the box for data
+        processing.
+    </description>
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:https://github.com/apache/incubator-dolphinscheduler.git</connection>
+        <developerConnection>scm:git:https://github.com/apache/incubator-dolphinscheduler.git</developerConnection>
+        <url>https://github.com/apache/incubator-dolphinscheduler</url>
+        <tag>HEAD</tag>
+    </scm>
+    <mailingLists>
+        <mailingList>
+            <name>DolphinScheduler Developer List</name>
+            <post>dev@dolphinscheduler.incubator.apache.org</post>
+            <subscribe>dev-subscribe@dolphinscheduler.incubator.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@dolphinscheduler.incubator.apache.org</unsubscribe>
+        </mailingList>
+    </mailingLists>
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>21</version>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <curator.version>2.12.0</curator.version>
+        <spring.version>5.1.5.RELEASE</spring.version>
+        <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
+        <java.version>1.8</java.version>
+        <logback.version>1.2.3</logback.version>
+        <hadoop.version>2.7.3</hadoop.version>
+        <quartz.version>2.2.3</quartz.version>
+        <jackson.version>2.9.8</jackson.version>
+        <mybatis-plus.version>3.2.0</mybatis-plus.version>
+        <mybatis.spring.version>2.0.1</mybatis.spring.version>
+        <cron.utils.version>5.0.5</cron.utils.version>
+        <fastjson.version>1.2.61</fastjson.version>
+        <druid.version>1.1.14</druid.version>
+        <h2.version>1.3.163</h2.version>
+        <commons.codec.version>1.6</commons.codec.version>
+        <commons.logging.version>1.1.1</commons.logging.version>
+        <httpclient.version>4.4.1</httpclient.version>
+        <httpcore.version>4.4.1</httpcore.version>
+        <junit.version>4.12</junit.version>
+        <mysql.connector.version>5.1.34</mysql.connector.version>
+        <slf4j.api.version>1.7.5</slf4j.api.version>
+        <slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
+        <commons.collections.version>3.2.2</commons.collections.version>
+        <commons.httpclient>3.0.1</commons.httpclient>
+        <commons.beanutils.version>1.7.0</commons.beanutils.version>
+        <commons.configuration.version>1.10</commons.configuration.version>
+        <commons.email.version>1.5</commons.email.version>
+        <poi.version>3.17</poi.version>
+        <javax.servlet.api.version>3.1.0</javax.servlet.api.version>
+        <commons.collections4.version>4.1</commons.collections4.version>
+        <guava.version>20.0</guava.version>
+        <postgresql.version>42.1.4</postgresql.version>
+        <hive.jdbc.version>2.1.0</hive.jdbc.version>
+        <commons.io.version>2.4</commons.io.version>
+        <oshi.core.version>3.5.0</oshi.core.version>
+        <clickhouse.jdbc.version>0.1.52</clickhouse.jdbc.version>
+        <mssql.jdbc.version>6.1.0.jre8</mssql.jdbc.version>
+        <jsp.version>6.1.14</jsp.version>
+        <spotbugs.version>3.1.12</spotbugs.version>
+        <checkstyle.version>3.0.0</checkstyle.version>
+        <apache.rat.version>0.13</apache.rat.version>
+        <zookeeper.version>3.4.14</zookeeper.version>
+        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>2.4</maven-source-plugin.version>
+        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+        <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+        <rpm-maven-plugion.version>2.2.0</rpm-maven-plugion.version>
+        <jacoco.version>0.8.4</jacoco.version>
+        <jcip.version>1.0</jcip.version>
+        <maven.deploy.skip>false</maven.deploy.skip>
+        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
+        <mockito.version>2.21.0</mockito.version>
+        <powermock.version>2.0.2</powermock.version>
+        <jasper-runtime.version>5.5.23</jasper-runtime.version>
+        <servlet-api.version>2.5</servlet-api.version>
+        <swagger.version>1.9.3</swagger.version>
+        <springfox.version>2.9.2</springfox.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+            <!-- quartz-->
+            <dependency>
+                <groupId>org.quartz-scheduler</groupId>
+                <artifactId>quartz</artifactId>
+                <version>${quartz.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.quartz-scheduler</groupId>
+                <artifactId>quartz-jobs</artifactId>
+                <version>${quartz.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.cronutils</groupId>
+                <artifactId>cron-utils</artifactId>
+                <version>${cron.utils.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${h2.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-dao</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-rpc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-alert</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>netty</artifactId>
+                        <groupId>io.netty</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
+                <version>${zookeeper.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons.codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons.logging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>${powermock.version}</version>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito2</artifactId>
+                <version>${powermock.version}</version>
+                <type>jar</type>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.connector.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.api.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>${slf4j.log4j12.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>${commons.collections.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>${commons.httpclient}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>${commons.beanutils.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-configuration</groupId>
+                <artifactId>commons-configuration</artifactId>
+                <version>${commons.configuration.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-email</artifactId>
+                <version>${commons.email.version}</version>
+            </dependency>
+
+            <!--excel poi-->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- hadoop -->
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-common</artifactId>
+                <version>${hadoop.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>slf4j-log4j12</artifactId>
+                        <groupId>org.slf4j</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>com.sun.jersey</artifactId>
+                        <groupId>jersey-json</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-hdfs</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-yarn-common</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-aws</artifactId>
+                <version>${hadoop.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet.api.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>${commons.collections4.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.hive</groupId>
+                <artifactId>hive-jdbc</artifactId>
+                <version>${hive.jdbc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.core.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ru.yandex.clickhouse</groupId>
+                <artifactId>clickhouse-jdbc</artifactId>
+                <version>${clickhouse.jdbc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>mssql-jdbc</artifactId>
+                <version>${mssql.jdbc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.jcip</groupId>
+                <artifactId>jcip-annotations</artifactId>
+                <version>${jcip.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+                <version>${jasper-runtime.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>${servlet-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${springfox.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${springfox.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>swagger-bootstrap-ui</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+
+        <finalName>apache-dolphinscheduler-incubating-${project.version}</finalName>
+
+        <pluginManagement>
+            <plugins>
+
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>rpm-maven-plugin</artifactId>
+                    <version>${rpm-maven-plugion.version}</version>
+                    <inherited>false</inherited>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                        <testSource>${java.version}</testSource>
+                        <testTarget>${java.version}</testTarget>
+                    </configuration>
+                    <version>${maven-compiler-plugin.version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${maven-release-plugin.version}</version>
+                    <configuration>
+                        <tagNameFormat>@{project.version}</tagNameFormat>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${maven-assembly-plugin.version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+
+                </plugin>
+            </plugins>
+
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <charset>${project.build.sourceEncoding}</charset>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <docencoding>${project.build.sourceEncoding}</docencoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>${maven-release-plugin.version}</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <tagNameFormat>@{project.version}</tagNameFormat>
+                    <tagBase>${project.version}</tagBase>
+                    <!--<goals>-f pom.xml deploy</goals>-->
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.scm</groupId>
+                        <artifactId>maven-scm-provider-jgit</artifactId>
+                        <version>1.9.5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <skip>false</skip><!--not skip compile test classes-->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <includes>
+                        <include>**/common/utils/*.java</include>
+                        <include>**/common/threadutils/*.java</include>
+                        <include>**/common/graph/*.java</include>
+                        <include>**/common/queue/*.java</include>
+                        <include>**/api/utils/CheckUtilsTest.java</include>
+                        <include>**/api/utils/FileUtilsTest.java</include>
+                        <include>**/api/utils/exportprocess/DataSourceParamTest.java</include>
+                        <include>**/api/utils/exportprocess/DependentParamTest.java</include>
+                        <include>**/api/enums/*.java</include>
+                        <include>**/api/service/AccessTokenServiceTest.java</include>
+                        <include>**/api/service/QueueServiceTest.java</include>
+                        <include>**/api/service/MonitorServiceTest.java</include>
+                        <include>**/api/service/SessionServiceTest.java</include>
+                        <include>**/api/service/UsersServiceTest.java</include>
+                        <include>**/api/service/TenantServiceTest.java</include>
+                        <include>**/api/service/WorkerGroupServiceTest.java</include>
+                        <include>**/api/service/AlertGroupServiceTest.java</include>
+                        <include>**/api/service/ProjectServiceTest.java</include>
+                        <include>**/api/service/ProcessDefinitionServiceTest.java</include>
+                        <include>**/api/service/UdfFuncServiceTest.java</include>
+                        <include>**/api/service/ResourcesServiceTest.java</include>
+                        <include>**/api/service/ExecutorService2Test.java</include>
+                        <include>**/api/service/BaseServiceTest.java</include>
+                        <include>**/api/service/BaseDAGServiceTest.java</include>
+                        <include>**/alert/utils/ExcelUtilsTest.java</include>
+                        <include>**/alert/utils/FuncUtilsTest.java</include>
+                        <include>**/alert/utils/JSONUtilsTest.java</include>
+                        <include>**/alert/utils/PropertyUtilsTest.java</include>
+                        <include>**/server/utils/SparkArgsUtilsTest.java</include>
+                        <include>**/server/utils/FlinkArgsUtilsTest.java</include>
+                        <include>**/server/utils/ParamUtilsTest.java</include>
+                        <include>**/server/utils/ScheduleUtilsTest.java</include>
+                        <include>**/server/master/MasterExecThreadTest.java</include>
+                        <include>**/dao/mapper/AccessTokenMapperTest.java</include>
+                        <include>**/dao/mapper/AlertGroupMapperTest.java</include>
+                        <include>**/dao/mapper/AlertMapperTest.java</include>
+                        <include>**/dao/mapper/CommandMapperTest.java</include>
+                        <include>**/alert/template/AlertTemplateFactoryTest.java</include>
+                        <include>**/alert/template/impl/DefaultHTMLTemplateTest.java</include>
+                    </includes>
+                    <!-- <skip>true</skip> -->
+                </configuration>
+            </plugin>
+
+            <!-- jenkins plugin jacoco report-->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <configuration>
+                    <destFile>target/jacoco.exec</destFile>
+                    <dataFile>target/jacoco.exec</dataFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>${apache.rat.version}</version>
+                <configuration>
+                    <includes>
+                        <include>**/*.java</include>
+                        <include>**/dolphinscheduler-ui/src/**/*.scss</include>
+                        <include>**/dolphinscheduler-ui/src/**/*.css</include>
+                        <include>**/dolphinscheduler-ui/src/**/*.vue</include>
+                        <include>**/dolphinscheduler-ui/src/**/*.js</include>
+                        <include>**/dolphinscheduler-ui/src/**/*.html</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/dolphinscheduler-ui/src/lib/**</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/js/module/util/cookie.js</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/font/awesome/font-awesome.css</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/sass/common/_animation.scss</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/sass/common/_normalize.scss</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/es5.js</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/base.css</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/view/common/outro.inc</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/view/common/meta.inc</exclude>
+                        <exclude>**/dolphinscheduler-ui/src/combo/1.0.0/3rd.css</exclude>
+                        <exclude>
+                            **/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java
+                        </exclude>
+                    </excludes>
+                    <consoleOutput>true</consoleOutput>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${spotbugs.version}</version>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <threshold>medium</threshold>
+                    <effort>default</effort>
+                    <excludeFilterFile>dev-config/spotbugs-exclude.xml</excludeFilterFile>
+                    <failOnError>true</failOnError>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs</artifactId>
+                        <version>4.0.0-beta4</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>8.18</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <consoleOutput>true</consoleOutput>
+                    <encoding>UTF-8</encoding>
+                    <configLocation>style/checkstyle.xml</configLocation>
+                    <suppressionsLocation>style/checkstyle-suppressions.xml</suppressionsLocation>
+                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                    <failOnViolation>true</failOnViolation>
+                    <violationSeverity>warning</violationSeverity>
+                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
+                    <excludes>**\/generated-sources\/</excludes>
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura-maven-plugin.version}</version>
+                <configuration>
+                    <check>
+                    </check>
+                    <aggregate>true</aggregate>
+                    <outputDirectory>./target/cobertura</outputDirectory>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <quiet>true</quiet>
+                    <format>xml</format>
+                    <instrumentation>
+                        <ignoreTrivial>true</ignoreTrivial>
+                    </instrumentation>
+                </configuration>
+            </plugin>
+        </plugins>
+
+    </build>
+
+    <modules>
+        <module>dolphinscheduler-ui</module>
+        <module>dolphinscheduler-server</module>
+        <module>dolphinscheduler-common</module>
+        <module>dolphinscheduler-api</module>
+        <module>dolphinscheduler-dao</module>
+        <module>dolphinscheduler-alert</module>
+        <module>dolphinscheduler-rpc</module>
+        <module>dolphinscheduler-dist</module>
+    </modules>
 
 </project>

From 5169689c3566f67438d2224f914197c09c03d52d Mon Sep 17 00:00:00 2001
From: Yelli <amarantine@my.com>
Date: Mon, 3 Feb 2020 10:24:24 +0800
Subject: [PATCH 20/35] class overrides equals() and should therefore also
 override hashCode() (#1882)

---
 .../apache/dolphinscheduler/api/utils/ZooKeeperState.java  | 2 +-
 .../apache/dolphinscheduler/common/model/DateInterval.java | 5 +++++
 .../dolphinscheduler/common/model/TaskNodeRelation.java    | 7 +++++++
 .../server/master/runner/MasterTaskExecThread.java         | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
index 968a51ad63..5aa6be858a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java
@@ -145,7 +145,7 @@ public class ZooKeeperState {
 		sendThread.setName("FourLetterCmd:" + cmd);
 		sendThread.start();
 		try {
-			sendThread.join(waitTimeout * 1000);
+			sendThread.join(waitTimeout * 1000L);
 			return sendThread.ret;
 		} catch (InterruptedException e) {
 			logger.error("send " + cmd + " to server " + host + ":" + port + " failed!", e);
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
index 4ea764cf80..e936a444d0 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java
@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.common.model;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * date interval class
@@ -62,4 +63,8 @@ public class DateInterval {
         this.endTime = endTime;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(startTime, endTime);
+    }
 }
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
index 2fbc0e1654..e4741574e4 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dolphinscheduler.common.model;
 
+import java.util.Objects;
+
 public class TaskNodeRelation {
 
   /**
@@ -69,4 +71,9 @@ public class TaskNodeRelation {
             ", endNode='" + endNode + '\'' +
             '}';
   }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(startNode, endNode);
+  }
 }
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 1861e8a908..f2ee66b64a 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
@@ -122,7 +122,7 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
                     break;
                 }
                 if(checkTimeout){
-                    long remainTime = getRemaintime(taskTimeoutParameter.getInterval()*60);
+                    long remainTime = getRemaintime(taskTimeoutParameter.getInterval() * 60L);
                     if (remainTime < 0) {
                         logger.warn("task id: {} execution time out",taskInstance.getId());
                         // process define

From 42b3e5bd10091046a11796a477d6a799bc1b8f7a Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Mon, 3 Feb 2020 11:06:31 +0800
Subject: [PATCH 21/35] fix api server startup failure (#1886)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning

* #1885 fix api server startup failure
1. add jsp-2.1 dependency
2. remove jasper-runtime dependency
---
 dolphinscheduler-api/pom.xml |  5 +++++
 pom.xml                      | 23 ++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 4dd2f31f8e..bac74da0b0 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -183,6 +183,11 @@
       <artifactId>servlet-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1</artifactId>
+    </dependency>
+
     <!-- just for test -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 742c15e636..86d95e44a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <oshi.core.version>3.5.0</oshi.core.version>
         <clickhouse.jdbc.version>0.1.52</clickhouse.jdbc.version>
         <mssql.jdbc.version>6.1.0.jre8</mssql.jdbc.version>
-        <jsp.version>6.1.14</jsp.version>
+        <jsp-2.1.version>6.1.14</jsp-2.1.version>
         <spotbugs.version>3.1.12</spotbugs.version>
         <checkstyle.version>3.0.0</checkstyle.version>
         <apache.rat.version>0.13</apache.rat.version>
@@ -116,7 +116,6 @@
         <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
         <mockito.version>2.21.0</mockito.version>
         <powermock.version>2.0.2</powermock.version>
-        <jasper-runtime.version>5.5.23</jasper-runtime.version>
         <servlet-api.version>2.5</servlet-api.version>
         <swagger.version>1.9.3</swagger.version>
         <springfox.version>2.9.2</springfox.version>
@@ -442,12 +441,6 @@
                 <version>${hadoop.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.servlet.api.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
@@ -502,10 +495,12 @@
                 <version>${jcip.version}</version>
                 <optional>true</optional>
             </dependency>
+
+            <!-- for api module -->
             <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-                <version>${jasper-runtime.version}</version>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jsp-2.1</artifactId>
+                <version>${jsp-2.1.version}</version>
             </dependency>
 
             <dependency>
@@ -513,6 +508,12 @@
                 <artifactId>servlet-api</artifactId>
                 <version>${servlet-api.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>

From 78bfe918d002cbea06ac8430503bee62dc8fc67a Mon Sep 17 00:00:00 2001
From: Yelli <amarantine@my.com>
Date: Mon, 3 Feb 2020 11:07:19 +0800
Subject: [PATCH 22/35] change datasource null check position (#1883)

---
 .../server/worker/task/sql/SqlTask.java            | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 a2f07c8be3..eba05a0d21 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
@@ -123,19 +123,21 @@ public class SqlTask extends AbstractTask {
         }
 
         dataSource= processDao.findDataSourceById(sqlParameters.getDatasource());
-        logger.info("datasource name : {} , type : {} , desc : {}  , user_id : {} , parameter : {}",
-                dataSource.getName(),
-                dataSource.getType(),
-                dataSource.getNote(),
-                dataSource.getUserId(),
-                dataSource.getConnectionParams());
 
+        // data source is null
         if (dataSource == null){
             logger.error("datasource not exists");
             exitStatusCode = -1;
             return;
         }
 
+        logger.info("datasource name : {} , type : {} , desc : {}  , user_id : {} , parameter : {}",
+                dataSource.getName(),
+                dataSource.getType(),
+                dataSource.getNote(),
+                dataSource.getUserId(),
+                dataSource.getConnectionParams());
+
         Connection con = null;
         List<String> createFuncs = null;
         try {

From dbbc6f58da2595800b154387bc86d869e45abb6f Mon Sep 17 00:00:00 2001
From: dailidong <dailidong66@gmail.com>
Date: Wed, 5 Feb 2020 09:21:21 +0800
Subject: [PATCH 23/35] jasper-runtime jar is needed when api server start
 (#1896)

* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

Co-authored-by: DS <escheduler@outlook.com>
---
 dolphinscheduler-api/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index bac74da0b0..fd56fb8d9f 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -27,6 +27,10 @@
   <name>${project.artifactId}</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <jasper-runtime.version>5.5.23</jasper-runtime.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.dolphinscheduler</groupId>
@@ -178,6 +182,12 @@
       <artifactId>hadoop-aws</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${jasper-runtime.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

From f942e5ced397f2f6bf3cef86efd695c43b527ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=94=E6=96=B9=E4=B8=8D=E5=9C=A8=E6=89=8B?=
 <39549317+wenhemin@users.noreply.github.com>
Date: Thu, 6 Feb 2020 09:29:23 +0800
Subject: [PATCH 24/35] [feature] data synchronization function (#1881)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feature：data synchronization function

* feature：data synchronization function

* feature：data synchronization function

* fix：add license

* fix：resource close bug

* fix：remove class author

* fix：Improve test coverage

* fix：add UT

* fix：add UT

* fix：data sync node renamed to datax

* fix：add UT

* fix: UT bug

* fix：Optimize variable name

* fix：pom

* fix：Variable name error

* fix：optimize the code
---
 .../conf/env/.dolphinscheduler_env.sh         |   1 +
 .../common/enums/TaskType.java                |   4 +-
 .../common/task/datax/DataxParameters.java    | 192 +++++++
 .../common/utils/TaskParametersUtils.java     |   3 +
 .../server/utils/DataxUtils.java              | 129 +++++
 .../server/worker/task/AbstractTask.java      |   4 +
 .../server/worker/task/TaskManager.java       |   3 +
 .../server/worker/task/datax/DataxTask.java   | 522 ++++++++++++++++++
 .../server/utils/DataxUtilsTest.java          | 108 ++++
 .../worker/task/datax/DataxTaskTest.java      | 352 ++++++++++++
 .../js/conf/home/pages/dag/_source/config.js  |   4 +
 .../js/conf/home/pages/dag/_source/dag.scss   |   3 +
 .../pages/dag/_source/formModel/formModel.vue |  10 +-
 .../dag/_source/formModel/tasks/datax.vue     | 292 ++++++++++
 .../conf/home/pages/dag/img/toolbar_DATAX.png | Bin 0 -> 571 bytes
 .../conf/home/pages/dag/img/toolbar_ETL.png   | Bin 0 -> 3117 bytes
 .../src/js/module/i18n/locale/en_US.js        |  10 +-
 .../src/js/module/i18n/locale/zh_CN.js        |  10 +-
 pom.xml                                       |   2 +
 19 files changed, 1645 insertions(+), 4 deletions(-)
 create mode 100755 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java
 create mode 100755 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DataxUtils.java
 create mode 100755 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTask.java
 create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/DataxUtilsTest.java
 create mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
 create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DATAX.png
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_ETL.png

diff --git a/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh b/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh
index 960d971dd8..8e842fe28e 100644
--- a/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh
+++ b/dockerfile/conf/dolphinscheduler/conf/env/.dolphinscheduler_env.sh
@@ -18,3 +18,4 @@
 export PYTHON_HOME=/usr/bin/python
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 export PATH=$PYTHON_HOME:$JAVA_HOME/bin:$PATH
+export DATAX_HOME=/opt/datax/bin/datax.py
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
index 45f36883e3..b996c3aec9 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
@@ -33,6 +33,7 @@ public enum TaskType {
      * 7 DEPENDENT
      * 8 FLINK
      * 9 HTTP
+     * 10 DATAX
      */
     SHELL(0, "shell"),
     SQL(1, "sql"),
@@ -43,7 +44,8 @@ public enum TaskType {
     PYTHON(6, "python"),
     DEPENDENT(7, "dependent"),
     FLINK(8, "flink"),
-    HTTP(9, "http");
+    HTTP(9, "http"),
+    DATAX(10, "datax");
 
     TaskType(int code, String descp){
         this.code = code;
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java
new file mode 100755
index 0000000000..95dd505c02
--- /dev/null
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java
@@ -0,0 +1,192 @@
+/*
+ * 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.common.task.datax;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.dolphinscheduler.common.task.AbstractParameters;
+
+/**
+ * DataX parameter
+ */
+public class DataxParameters extends AbstractParameters {
+
+    /**
+     * data source type，eg  MYSQL, POSTGRES ...
+     */
+    private String dsType;
+
+    /**
+     * datasource id
+     */
+    private int dataSource;
+
+    /**
+     * data target type，eg  MYSQL, POSTGRES ...
+     */
+    private String dtType;
+
+    /**
+     * datatarget id
+     */
+    private int dataTarget;
+
+    /**
+     * sql
+     */
+    private String sql;
+
+    /**
+     * target table
+     */
+    private String targetTable;
+
+    /**
+     * Pre Statements
+     */
+    private List<String> preStatements;
+
+    /**
+     * Post Statements
+     */
+    private List<String> postStatements;
+
+    /**
+     * speed byte num
+     */
+    private int jobSpeedByte;
+
+    /**
+     * speed record count
+     */
+    private int jobSpeedRecord;
+
+    public String getDsType() {
+        return dsType;
+    }
+
+    public void setDsType(String dsType) {
+        this.dsType = dsType;
+    }
+
+    public int getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(int dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public String getDtType() {
+        return dtType;
+    }
+
+    public void setDtType(String dtType) {
+        this.dtType = dtType;
+    }
+
+    public int getDataTarget() {
+        return dataTarget;
+    }
+
+    public void setDataTarget(int dataTarget) {
+        this.dataTarget = dataTarget;
+    }
+
+    public String getSql() {
+        return sql;
+    }
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
+
+    public String getTargetTable() {
+        return targetTable;
+    }
+
+    public void setTargetTable(String targetTable) {
+        this.targetTable = targetTable;
+    }
+
+    public List<String> getPreStatements() {
+        return preStatements;
+    }
+
+    public void setPreStatements(List<String> preStatements) {
+        this.preStatements = preStatements;
+    }
+
+    public List<String> getPostStatements() {
+        return postStatements;
+    }
+
+    public void setPostStatements(List<String> postStatements) {
+        this.postStatements = postStatements;
+    }
+
+    public int getJobSpeedByte() {
+        return jobSpeedByte;
+    }
+
+    public void setJobSpeedByte(int jobSpeedByte) {
+        this.jobSpeedByte = jobSpeedByte;
+    }
+
+    public int getJobSpeedRecord() {
+        return jobSpeedRecord;
+    }
+
+    public void setJobSpeedRecord(int jobSpeedRecord) {
+        this.jobSpeedRecord = jobSpeedRecord;
+    }
+
+    @Override
+    public boolean checkParameters() {
+        if (!(dataSource != 0
+                && dataTarget != 0
+                && StringUtils.isNotEmpty(sql)
+                && StringUtils.isNotEmpty(targetTable))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public List<String> getResourceFilesList() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public String toString() {
+        return "DataxParameters{" +
+                "dsType='" + dsType + '\'' +
+                ", dataSource=" + dataSource +
+                ", dtType='" + dtType + '\'' +
+                ", dataTarget=" + dataTarget +
+                ", sql='" + sql + '\'' +
+                ", targetTable='" + targetTable + '\'' +
+                ", preStatements=" + preStatements +
+                ", postStatements=" + postStatements +
+                ", jobSpeedByte=" + jobSpeedByte +
+                ", jobSpeedRecord=" + jobSpeedRecord +
+                '}';
+    }
+}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java
index 28e2593359..a2ae6a68e3 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.common.utils;
 import org.apache.dolphinscheduler.common.enums.TaskType;
 import org.apache.dolphinscheduler.common.task.AbstractParameters;
 import org.apache.dolphinscheduler.common.task.dependent.DependentParameters;
+import org.apache.dolphinscheduler.common.task.datax.DataxParameters;
 import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
 import org.apache.dolphinscheduler.common.task.http.HttpParameters;
 import org.apache.dolphinscheduler.common.task.mr.MapreduceParameters;
@@ -68,6 +69,8 @@ public class TaskParametersUtils {
           return JSONUtils.parseObject(parameter, FlinkParameters.class);
         case HTTP:
           return JSONUtils.parseObject(parameter, HttpParameters.class);
+        case DATAX:
+          return JSONUtils.parseObject(parameter, DataxParameters.class);
         default:
           return null;
       }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DataxUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DataxUtils.java
new file mode 100755
index 0000000000..930098919b
--- /dev/null
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DataxUtils.java
@@ -0,0 +1,129 @@
+/*
+ * 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.server.utils;
+
+
+import org.apache.dolphinscheduler.common.enums.DbType;
+
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+
+
+public class DataxUtils {
+
+    public static final String DATAX_READER_PLUGIN_MYSQL = "mysqlreader";
+
+    public static final String DATAX_READER_PLUGIN_POSTGRESQL = "postgresqlreader";
+
+    public static final String DATAX_READER_PLUGIN_ORACLE = "oraclereader";
+
+    public static final String DATAX_READER_PLUGIN_SQLSERVER = "sqlserverreader";
+
+    public static final String DATAX_WRITER_PLUGIN_MYSQL = "mysqlwriter";
+
+    public static final String DATAX_WRITER_PLUGIN_POSTGRESQL = "postgresqlwriter";
+
+    public static final String DATAX_WRITER_PLUGIN_ORACLE = "oraclewriter";
+
+    public static final String DATAX_WRITER_PLUGIN_SQLSERVER = "sqlserverwriter";
+
+    public static String getReaderPluginName(DbType dbType) {
+        switch (dbType) {
+            case MYSQL:
+                return DATAX_READER_PLUGIN_MYSQL;
+            case POSTGRESQL:
+                return DATAX_READER_PLUGIN_POSTGRESQL;
+            case ORACLE:
+                return DATAX_READER_PLUGIN_ORACLE;
+            case SQLSERVER:
+                return DATAX_READER_PLUGIN_SQLSERVER;
+            default:
+                return null;
+        }
+    }
+
+    public static String getWriterPluginName(DbType dbType) {
+        switch (dbType) {
+            case MYSQL:
+                return DATAX_WRITER_PLUGIN_MYSQL;
+            case POSTGRESQL:
+                return DATAX_WRITER_PLUGIN_POSTGRESQL;
+            case ORACLE:
+                return DATAX_WRITER_PLUGIN_ORACLE;
+            case SQLSERVER:
+                return DATAX_WRITER_PLUGIN_SQLSERVER;
+            default:
+                return null;
+        }
+    }
+
+    public static SQLStatementParser getSqlStatementParser(DbType dbType, String sql) {
+        switch (dbType) {
+            case MYSQL:
+                return new MySqlStatementParser(sql);
+            case POSTGRESQL:
+                return new PGSQLStatementParser(sql);
+            case ORACLE:
+                return new OracleStatementParser(sql);
+            case SQLSERVER:
+                return new SQLServerStatementParser(sql);
+            default:
+                return null;
+        }
+    }
+
+    public static String[] convertKeywordsColumns(DbType dbType, String[] columns) {
+        if (columns == null) {
+            return null;
+        }
+
+        String[] toColumns = new String[columns.length];
+        for (int i = 0; i < columns.length; i++ ) {
+            toColumns[i] = doConvertKeywordsColumn(dbType, columns[i]);
+        }
+
+        return toColumns;
+    }
+
+    public static String doConvertKeywordsColumn(DbType dbType, String column) {
+        if (column == null) {
+            return column;
+        }
+
+        column = column.trim();
+        column = column.replace("`", "");
+        column = column.replace("\"", "");
+        column = column.replace("'", "");
+
+        switch (dbType) {
+            case MYSQL:
+                return String.format("`%s`", column);
+            case POSTGRESQL:
+                return String.format("\"%s\"", column);
+            case ORACLE:
+                return String.format("\"%s\"", column);
+            case SQLSERVER:
+                return String.format("`%s`", column);
+            default:
+                return column;
+        }
+    }
+
+}
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java
index 999863f76e..f2772d0747 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java
@@ -22,6 +22,7 @@ import org.apache.dolphinscheduler.common.enums.TaskRecordStatus;
 import org.apache.dolphinscheduler.common.enums.TaskType;
 import org.apache.dolphinscheduler.common.process.Property;
 import org.apache.dolphinscheduler.common.task.AbstractParameters;
+import org.apache.dolphinscheduler.common.task.datax.DataxParameters;
 import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
 import org.apache.dolphinscheduler.common.task.mr.MapreduceParameters;
 import org.apache.dolphinscheduler.common.task.procedure.ProcedureParameters;
@@ -194,6 +195,9 @@ public abstract class AbstractTask {
             case PYTHON:
                 paramsClass = PythonParameters.class;
                 break;
+            case DATAX:
+                paramsClass = DataxParameters.class;
+                break;
             default:
                 logger.error("not support this task type: {}", taskType);
                 throw new IllegalArgumentException("not support this task type");
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java
index 310d9cad9a..67deb7a3fa 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java
@@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.server.worker.task;
 import org.apache.dolphinscheduler.common.enums.TaskType;
 import org.apache.dolphinscheduler.common.utils.EnumUtils;
 import org.apache.dolphinscheduler.server.worker.task.dependent.DependentTask;
+import org.apache.dolphinscheduler.server.worker.task.datax.DataxTask;
 import org.apache.dolphinscheduler.server.worker.task.flink.FlinkTask;
 import org.apache.dolphinscheduler.server.worker.task.http.HttpTask;
 import org.apache.dolphinscheduler.server.worker.task.mr.MapReduceTask;
@@ -65,6 +66,8 @@ public class TaskManager {
         return new DependentTask(props, logger);
       case HTTP:
         return new HttpTask(props, logger);
+      case DATAX:
+        return new DataxTask(props, logger);
       default:
         logger.error("unsupport task type: {}", taskType);
         throw new IllegalArgumentException("not support task type");
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTask.java
new file mode 100755
index 0000000000..0de2bbc7c6
--- /dev/null
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTask.java
@@ -0,0 +1,522 @@
+/*
+ * 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.server.worker.task.datax;
+
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.DbType;
+import org.apache.dolphinscheduler.common.job.db.BaseDataSource;
+import org.apache.dolphinscheduler.common.job.db.DataSourceFactory;
+import org.apache.dolphinscheduler.common.process.Property;
+import org.apache.dolphinscheduler.common.task.AbstractParameters;
+import org.apache.dolphinscheduler.common.task.datax.DataxParameters;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.common.utils.ParameterUtils;
+import org.apache.dolphinscheduler.dao.ProcessDao;
+import org.apache.dolphinscheduler.dao.entity.DataSource;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.server.utils.DataxUtils;
+import org.apache.dolphinscheduler.server.utils.ParamUtils;
+import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;
+import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
+import org.apache.dolphinscheduler.server.worker.task.ShellCommandExecutor;
+import org.apache.dolphinscheduler.server.worker.task.TaskProps;
+import org.slf4j.Logger;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
+import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.fastjson.JSONObject;
+
+
+/**
+ * DataX task
+ */
+public class DataxTask extends AbstractTask {
+
+    /**
+     * python process(datax only supports version 2.7 by default)
+     */
+    private static final String DATAX_PYTHON = "python2.7";
+
+    /**
+     * datax home path
+     */
+    private static final String DATAX_HOME_EVN = "${DATAX_HOME}";
+
+    /**
+     * datax channel count
+     */
+    private static final int DATAX_CHANNEL_COUNT = 1;
+
+    /**
+     * datax parameters
+     */
+    private DataxParameters dataXParameters;
+
+    /**
+     * task dir
+     */
+    private String taskDir;
+
+    /**
+     * shell command executor
+     */
+    private ShellCommandExecutor shellCommandExecutor;
+
+    /**
+     * process database access
+     */
+    private ProcessDao processDao;
+
+    /**
+     * constructor
+     * 
+     * @param props
+     *            props
+     * @param logger
+     *            logger
+     */
+    public DataxTask(TaskProps props, Logger logger) {
+        super(props, logger);
+
+        this.taskDir = props.getTaskDir();
+        logger.info("task dir : {}", taskDir);
+
+        this.shellCommandExecutor = new ShellCommandExecutor(this::logHandle, props.getTaskDir(), props.getTaskAppId(),
+            props.getTaskInstId(), props.getTenantCode(), props.getEnvFile(), props.getTaskStartTime(),
+            props.getTaskTimeout(), logger);
+
+        this.processDao = SpringApplicationContext.getBean(ProcessDao.class);
+    }
+
+    /**
+     * init DataX config
+     */
+    @Override
+    public void init() {
+        logger.info("datax task params {}", taskProps.getTaskParams());
+        dataXParameters = JSONUtils.parseObject(taskProps.getTaskParams(), DataxParameters.class);
+
+        if (!dataXParameters.checkParameters()) {
+            throw new RuntimeException("datax task params is not valid");
+        }
+    }
+
+    /**
+     * run DataX process
+     * 
+     * @throws Exception
+     */
+    @Override
+    public void handle()
+        throws Exception {
+        try {
+            // set the name of the current thread
+            String threadLoggerInfoName = String.format("TaskLogInfo-%s", taskProps.getTaskAppId());
+            Thread.currentThread().setName(threadLoggerInfoName);
+
+            // run datax process
+            String jsonFilePath = buildDataxJsonFile();
+            String shellCommandFilePath = buildShellCommandFile(jsonFilePath);
+            exitStatusCode = shellCommandExecutor.run(shellCommandFilePath, processDao);
+        }
+        catch (Exception e) {
+            exitStatusCode = -1;
+            throw e;
+        }
+    }
+
+    /**
+     * cancel DataX process
+     * 
+     * @param cancelApplication
+     * @throws Exception
+     */
+    @Override
+    public void cancelApplication(boolean cancelApplication)
+        throws Exception {
+        // cancel process
+        shellCommandExecutor.cancelApplication();
+    }
+
+    /**
+     * build datax configuration file
+     * 
+     * @return
+     * @throws Exception
+     */
+    private String buildDataxJsonFile()
+        throws Exception {
+        // generate json
+        String fileName = String.format("%s/%s_job.json", taskDir, taskProps.getTaskAppId());
+
+        Path path = new File(fileName).toPath();
+        if (Files.exists(path)) {
+            return fileName;
+        }
+
+        JSONObject job = new JSONObject();
+        job.put("content", buildDataxJobContentJson());
+        job.put("setting", buildDataxJobSettingJson());
+
+        JSONObject root = new JSONObject();
+        root.put("job", job);
+        root.put("core", buildDataxCoreJson());
+
+        logger.debug("datax job json : {}", root.toString());
+
+        // create datax json file
+        FileUtils.writeStringToFile(new File(fileName), root.toString(), Charset.forName("UTF-8"));
+        return fileName;
+    }
+
+    /**
+     * build datax job config
+     * 
+     * @return
+     * @throws SQLException
+     */
+    private List<JSONObject> buildDataxJobContentJson()
+        throws SQLException {
+        DataSource dataSource = processDao.findDataSourceById(dataXParameters.getDataSource());
+        BaseDataSource dataSourceCfg = DataSourceFactory.getDatasource(dataSource.getType(),
+            dataSource.getConnectionParams());
+
+        DataSource dataTarget = processDao.findDataSourceById(dataXParameters.getDataTarget());
+        BaseDataSource dataTargetCfg = DataSourceFactory.getDatasource(dataTarget.getType(),
+            dataTarget.getConnectionParams());
+
+        List<JSONObject> readerConnArr = new ArrayList<>();
+        JSONObject readerConn = new JSONObject();
+        readerConn.put("querySql", new String[] {dataXParameters.getSql()});
+        readerConn.put("jdbcUrl", new String[] {dataSourceCfg.getJdbcUrl()});
+        readerConnArr.add(readerConn);
+
+        JSONObject readerParam = new JSONObject();
+        readerParam.put("username", dataSourceCfg.getUser());
+        readerParam.put("password", dataSourceCfg.getPassword());
+        readerParam.put("connection", readerConnArr);
+
+        JSONObject reader = new JSONObject();
+        reader.put("name", DataxUtils.getReaderPluginName(dataSource.getType()));
+        reader.put("parameter", readerParam);
+
+        List<JSONObject> writerConnArr = new ArrayList<>();
+        JSONObject writerConn = new JSONObject();
+        writerConn.put("table", new String[] {dataXParameters.getTargetTable()});
+        writerConn.put("jdbcUrl", dataTargetCfg.getJdbcUrl());
+        writerConnArr.add(writerConn);
+
+        JSONObject writerParam = new JSONObject();
+        writerParam.put("username", dataTargetCfg.getUser());
+        writerParam.put("password", dataTargetCfg.getPassword());
+        writerParam.put("column",
+            parsingSqlColumnNames(dataSource.getType(), dataTarget.getType(), dataSourceCfg, dataXParameters.getSql()));
+        writerParam.put("connection", writerConnArr);
+
+        if (CollectionUtils.isNotEmpty(dataXParameters.getPreStatements())) {
+            writerParam.put("preSql", dataXParameters.getPreStatements());
+        }
+
+        if (CollectionUtils.isNotEmpty(dataXParameters.getPostStatements())) {
+            writerParam.put("postSql", dataXParameters.getPostStatements());
+        }
+
+        JSONObject writer = new JSONObject();
+        writer.put("name", DataxUtils.getWriterPluginName(dataTarget.getType()));
+        writer.put("parameter", writerParam);
+
+        List<JSONObject> contentList = new ArrayList<>();
+        JSONObject content = new JSONObject();
+        content.put("reader", reader);
+        content.put("writer", writer);
+        contentList.add(content);
+
+        return contentList;
+    }
+
+    /**
+     * build datax setting config
+     * 
+     * @return
+     */
+    private JSONObject buildDataxJobSettingJson() {
+        JSONObject speed = new JSONObject();
+        speed.put("channel", DATAX_CHANNEL_COUNT);
+
+        if (dataXParameters.getJobSpeedByte() > 0) {
+            speed.put("byte", dataXParameters.getJobSpeedByte());
+        }
+
+        if (dataXParameters.getJobSpeedRecord() > 0) {
+            speed.put("record", dataXParameters.getJobSpeedRecord());
+        }
+
+        JSONObject errorLimit = new JSONObject();
+        errorLimit.put("record", 0);
+        errorLimit.put("percentage", 0);
+
+        JSONObject setting = new JSONObject();
+        setting.put("speed", speed);
+        setting.put("errorLimit", errorLimit);
+
+        return setting;
+    }
+
+    private JSONObject buildDataxCoreJson() {
+        JSONObject speed = new JSONObject();
+        speed.put("channel", DATAX_CHANNEL_COUNT);
+
+        if (dataXParameters.getJobSpeedByte() > 0) {
+            speed.put("byte", dataXParameters.getJobSpeedByte());
+        }
+
+        if (dataXParameters.getJobSpeedRecord() > 0) {
+            speed.put("record", dataXParameters.getJobSpeedRecord());
+        }
+
+        JSONObject channel = new JSONObject();
+        channel.put("speed", speed);
+
+        JSONObject transport = new JSONObject();
+        transport.put("channel", channel);
+
+        JSONObject core = new JSONObject();
+        core.put("transport", transport);
+
+        return core;
+    }
+
+    /**
+     * create command
+     * 
+     * @return
+     * @throws Exception
+     */
+    private String buildShellCommandFile(String jobConfigFilePath)
+        throws Exception {
+        // generate scripts
+        String fileName = String.format("%s/%s_node.sh", taskDir, taskProps.getTaskAppId());
+        Path path = new File(fileName).toPath();
+
+        if (Files.exists(path)) {
+            return fileName;
+        }
+
+        // datax python command
+        StringBuilder sbr = new StringBuilder();
+        sbr.append(DATAX_PYTHON);
+        sbr.append(" ");
+        sbr.append(DATAX_HOME_EVN);
+        sbr.append(" ");
+        sbr.append(jobConfigFilePath);
+        String dataxCommand = sbr.toString();
+
+        // find process instance by task id
+        ProcessInstance processInstance = processDao.findProcessInstanceByTaskId(taskProps.getTaskInstId());
+
+        // combining local and global parameters
+        Map<String, Property> paramsMap = ParamUtils.convert(taskProps.getUserDefParamsMap(),
+            taskProps.getDefinedParams(), dataXParameters.getLocalParametersMap(),
+            processInstance.getCmdTypeIfComplement(), processInstance.getScheduleTime());
+        if (paramsMap != null) {
+            dataxCommand = ParameterUtils.convertParameterPlaceholders(dataxCommand, ParamUtils.convert(paramsMap));
+        }
+
+        logger.debug("raw script : {}", dataxCommand);
+
+        // create shell command file
+        Set<PosixFilePermission> perms = PosixFilePermissions.fromString(Constants.RWXR_XR_X);
+        FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(perms);
+        Files.createFile(path, attr);
+        Files.write(path, dataxCommand.getBytes(), StandardOpenOption.APPEND);
+
+        return fileName;
+    }
+
+    /**
+     * parsing synchronized column names in SQL statements
+     * 
+     * @param dsType
+     *            the database type of the data source
+     * @param dtType
+     *            the database type of the data target
+     * @param dataSourceCfg
+     *            the database connection parameters of the data source
+     * @param sql
+     *            sql for data synchronization
+     * @return
+     */
+    private String[] parsingSqlColumnNames(DbType dsType, DbType dtType, BaseDataSource dataSourceCfg, String sql) {
+        String[] columnNames = tryGrammaticalAnalysisSqlColumnNames(dsType, sql);
+
+        if (columnNames == null || columnNames.length == 0) {
+            logger.info("try to execute sql analysis query column name");
+            columnNames = tryExecuteSqlResolveColumnNames(dataSourceCfg, sql);
+        }
+
+        notNull(columnNames, String.format("parsing sql columns failed : %s", sql));
+
+        return DataxUtils.convertKeywordsColumns(dtType, columnNames);
+    }
+
+    /**
+     * try grammatical parsing column
+     * 
+     * @param dbType
+     *            database type
+     * @param sql
+     *            sql for data synchronization
+     * @return column name array
+     * @throws RuntimeException
+     */
+    private String[] tryGrammaticalAnalysisSqlColumnNames(DbType dbType, String sql) {
+        String[] columnNames;
+
+        try {
+            SQLStatementParser parser = DataxUtils.getSqlStatementParser(dbType, sql);
+            notNull(parser, String.format("database driver [%s] is not support", dbType.toString()));
+
+            SQLStatement sqlStatement = parser.parseStatement();
+            SQLSelectStatement sqlSelectStatement = (SQLSelectStatement)sqlStatement;
+            SQLSelect sqlSelect = sqlSelectStatement.getSelect();
+
+            List<SQLSelectItem> selectItemList = null;
+            if (sqlSelect.getQuery() instanceof SQLSelectQueryBlock) {
+                SQLSelectQueryBlock block = (SQLSelectQueryBlock)sqlSelect.getQuery();
+                selectItemList = block.getSelectList();
+            } else if (sqlSelect.getQuery() instanceof SQLUnionQuery) {
+                SQLUnionQuery unionQuery = (SQLUnionQuery)sqlSelect.getQuery();
+                SQLSelectQueryBlock block = (SQLSelectQueryBlock)unionQuery.getRight();
+                selectItemList = block.getSelectList();
+            }
+
+            notNull(selectItemList,
+                String.format("select query type [%s] is not support", sqlSelect.getQuery().toString()));
+
+            columnNames = new String[selectItemList.size()];
+            for (int i = 0; i < selectItemList.size(); i++ ) {
+                SQLSelectItem item = selectItemList.get(i);
+
+                String columnName = null;
+
+                if (item.getAlias() != null) {
+                    columnName = item.getAlias();
+                } else if (item.getExpr() != null) {
+                    if (item.getExpr() instanceof SQLPropertyExpr) {
+                        SQLPropertyExpr expr = (SQLPropertyExpr)item.getExpr();
+                        columnName = expr.getName();
+                    } else if (item.getExpr() instanceof SQLIdentifierExpr) {
+                        SQLIdentifierExpr expr = (SQLIdentifierExpr)item.getExpr();
+                        columnName = expr.getName();
+                    }
+                } else {
+                    throw new RuntimeException(
+                        String.format("grammatical analysis sql column [ %s ] failed", item.toString()));
+                }
+
+                if (columnName == null) {
+                    throw new RuntimeException(
+                        String.format("grammatical analysis sql column [ %s ] failed", item.toString()));
+                }
+
+                columnNames[i] = columnName;
+            }
+        }
+        catch (Exception e) {
+            logger.warn(e.getMessage(), e);
+            return null;
+        }
+
+        return columnNames;
+    }
+
+    /**
+     * try to execute sql to resolve column names
+     * 
+     * @param baseDataSource
+     *            the database connection parameters
+     * @param sql
+     *            sql for data synchronization
+     * @return column name array
+     */
+    public String[] tryExecuteSqlResolveColumnNames(BaseDataSource baseDataSource, String sql) {
+        String[] columnNames;
+        sql = String.format("SELECT t.* FROM ( %s ) t WHERE 0 = 1", sql);
+        sql = sql.replace(";", "");
+
+        try (
+            Connection connection = DriverManager.getConnection(baseDataSource.getJdbcUrl(), baseDataSource.getUser(),
+                baseDataSource.getPassword());
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            ResultSet resultSet = stmt.executeQuery()) {
+
+            ResultSetMetaData md = resultSet.getMetaData();
+            int num = md.getColumnCount();
+            columnNames = new String[num];
+            for (int i = 1; i <= num; i++ ) {
+                columnNames[i - 1] = md.getColumnName(i);
+            }
+        }
+        catch (SQLException e) {
+            logger.warn(e.getMessage(), e);
+            return null;
+        }
+
+        return columnNames;
+    }
+
+    @Override
+    public AbstractParameters getParameters() {
+        return dataXParameters;
+    }
+
+    private void notNull(Object obj, String message) {
+        if (obj == null) {
+            throw new RuntimeException(message);
+        }
+    }
+
+}
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/DataxUtilsTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/DataxUtilsTest.java
new file mode 100644
index 0000000000..2720bb8a28
--- /dev/null
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/DataxUtilsTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.server.utils;
+
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
+import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser;
+import org.apache.dolphinscheduler.common.enums.DbType;
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * DataxUtils Tester.
+ */
+public class DataxUtilsTest {
+
+    /**
+     *
+     * Method: getReaderPluginName(DbType dbType)
+     *
+     */
+    @Test
+    public void testGetReaderPluginName() {
+        assertEquals(DataxUtils.DATAX_READER_PLUGIN_MYSQL, DataxUtils.getReaderPluginName(DbType.MYSQL));
+        assertEquals(DataxUtils.DATAX_READER_PLUGIN_POSTGRESQL, DataxUtils.getReaderPluginName(DbType.POSTGRESQL));
+        assertEquals(DataxUtils.DATAX_READER_PLUGIN_SQLSERVER, DataxUtils.getReaderPluginName(DbType.SQLSERVER));
+        assertEquals(DataxUtils.DATAX_READER_PLUGIN_ORACLE, DataxUtils.getReaderPluginName(DbType.ORACLE));
+        assertTrue(DataxUtils.getReaderPluginName(DbType.DB2) == null);
+    }
+
+    /**
+     *
+     * Method: getWriterPluginName(DbType dbType)
+     *
+     */
+    @Test
+    public void testGetWriterPluginName() {
+        assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_MYSQL, DataxUtils.getWriterPluginName(DbType.MYSQL));
+        assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_POSTGRESQL, DataxUtils.getWriterPluginName(DbType.POSTGRESQL));
+        assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_SQLSERVER, DataxUtils.getWriterPluginName(DbType.SQLSERVER));
+        assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_ORACLE, DataxUtils.getWriterPluginName(DbType.ORACLE));
+        assertTrue(DataxUtils.getWriterPluginName(DbType.DB2) == null);
+    }
+
+    /**
+     *
+     * Method: getSqlStatementParser(DbType dbType, String sql)
+     *
+     */
+    @Test
+    public void testGetSqlStatementParser() throws Exception {
+        assertTrue(DataxUtils.getSqlStatementParser(DbType.MYSQL, "select 1") instanceof MySqlStatementParser);
+        assertTrue(DataxUtils.getSqlStatementParser(DbType.POSTGRESQL, "select 1") instanceof PGSQLStatementParser);
+        assertTrue(DataxUtils.getSqlStatementParser(DbType.ORACLE, "select 1") instanceof OracleStatementParser);
+        assertTrue(DataxUtils.getSqlStatementParser(DbType.SQLSERVER, "select 1") instanceof SQLServerStatementParser);
+        assertTrue(DataxUtils.getSqlStatementParser(DbType.DB2, "select 1") == null);
+    }
+
+    /**
+     *
+     * Method: convertKeywordsColumns(DbType dbType, String[] columns)
+     *
+     */
+    @Test
+    public void testConvertKeywordsColumns() throws Exception {
+        String[] fromColumns = new String[]{"`select`", "from", "\"where\"", " table "};
+        String[] targetColumns = new String[]{"`select`", "`from`", "`where`", "`table`"};
+
+        String[] toColumns = DataxUtils.convertKeywordsColumns(DbType.MYSQL, fromColumns);
+
+        assertTrue(fromColumns.length == toColumns.length);
+
+        for (int i = 0; i < toColumns.length; i++) {
+            assertEquals(targetColumns[i], toColumns[i]);
+        }
+    }
+
+    /**
+     *
+     * Method: doConvertKeywordsColumn(DbType dbType, String column)
+     *
+     */
+    @Test
+    public void testDoConvertKeywordsColumn() throws Exception {
+        assertEquals("`select`", DataxUtils.doConvertKeywordsColumn(DbType.MYSQL, " \"`select`\" "));
+        assertEquals("\"select\"", DataxUtils.doConvertKeywordsColumn(DbType.POSTGRESQL, " \"`select`\" "));
+        assertEquals("`select`", DataxUtils.doConvertKeywordsColumn(DbType.SQLSERVER, " \"`select`\" "));
+        assertEquals("\"select\"", DataxUtils.doConvertKeywordsColumn(DbType.ORACLE, " \"`select`\" "));
+        assertEquals("select", DataxUtils.doConvertKeywordsColumn(DbType.DB2, " \"`select`\" "));
+    }
+}
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java
new file mode 100644
index 0000000000..7a6073e05d
--- /dev/null
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java
@@ -0,0 +1,352 @@
+/*
+ * 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.server.worker.task.datax;
+
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.common.enums.DbType;
+import org.apache.dolphinscheduler.common.job.db.BaseDataSource;
+import org.apache.dolphinscheduler.common.job.db.DataSourceFactory;
+import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;
+import org.apache.dolphinscheduler.dao.ProcessDao;
+import org.apache.dolphinscheduler.dao.entity.DataSource;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.server.utils.DataxUtils;
+import org.apache.dolphinscheduler.server.worker.task.ShellCommandExecutor;
+import org.apache.dolphinscheduler.server.worker.task.TaskProps;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * DataxTask Tester.
+ */
+public class DataxTaskTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(DataxTaskTest.class);
+
+    private DataxTask dataxTask;
+
+    private ProcessDao processDao;
+
+    private ShellCommandExecutor shellCommandExecutor;
+
+    private ApplicationContext applicationContext;
+
+    @Before
+    public void before()
+        throws Exception {
+        processDao = Mockito.mock(ProcessDao.class);
+        shellCommandExecutor = Mockito.mock(ShellCommandExecutor.class);
+
+        applicationContext = Mockito.mock(ApplicationContext.class);
+        SpringApplicationContext springApplicationContext = new SpringApplicationContext();
+        springApplicationContext.setApplicationContext(applicationContext);
+        Mockito.when(applicationContext.getBean(ProcessDao.class)).thenReturn(processDao);
+
+        TaskProps props = new TaskProps();
+        props.setTaskDir("/tmp");
+        props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
+        props.setTaskInstId(1);
+        props.setTenantCode("1");
+        props.setEnvFile(".dolphinscheduler_env.sh");
+        props.setTaskStartTime(new Date());
+        props.setTaskTimeout(0);
+        props.setTaskParams(
+            "{\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}");
+        dataxTask = PowerMockito.spy(new DataxTask(props, logger));
+        dataxTask.init();
+
+        Mockito.when(processDao.findDataSourceById(1)).thenReturn(getDataSource());
+        Mockito.when(processDao.findDataSourceById(2)).thenReturn(getDataSource());
+        Mockito.when(processDao.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance());
+
+        String fileName = String.format("%s/%s_node.sh", props.getTaskDir(), props.getTaskAppId());
+        Mockito.when(shellCommandExecutor.run(fileName, processDao)).thenReturn(0);
+    }
+
+    private DataSource getDataSource() {
+        DataSource dataSource = new DataSource();
+        dataSource.setType(DbType.MYSQL);
+        dataSource.setConnectionParams(
+                "{\"user\":\"root\",\"password\":\"123456\",\"address\":\"jdbc:mysql://127.0.0.1:3306\",\"database\":\"test\",\"jdbcUrl\":\"jdbc:mysql://127.0.0.1:3306/test\"}");
+        dataSource.setUserId(1);
+        return dataSource;
+    }
+
+    private ProcessInstance getProcessInstance() {
+        ProcessInstance processInstance = new ProcessInstance();
+        processInstance.setCommandType(CommandType.START_PROCESS);
+        processInstance.setScheduleTime(new Date());
+        return processInstance;
+    }
+
+    @After
+    public void after()
+        throws Exception {}
+
+    /**
+     * Method: DataxTask()
+     */
+    @Test
+    public void testDataxTask()
+            throws Exception {
+        TaskProps props = new TaskProps();
+        props.setTaskDir("/tmp");
+        props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
+        props.setTaskInstId(1);
+        props.setTenantCode("1");
+        Assert.assertNotNull(new DataxTask(props, logger));
+    }
+
+    /**
+     * Method: init
+     */
+    @Test
+    public void testInit()
+            throws Exception {
+        try {
+            dataxTask.init();
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: handle()
+     */
+    @Test
+    public void testHandle()
+            throws Exception {
+        try {
+            dataxTask.handle();
+        } catch (RuntimeException e) {
+            if (e.getMessage().indexOf("process error . exitCode is :  -1") < 0) {
+                Assert.fail();
+            }
+        }
+    }
+
+    /**
+     * Method: cancelApplication()
+     */
+    @Test
+    public void testCancelApplication()
+            throws Exception {
+        try {
+            dataxTask.cancelApplication(true);
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: parsingSqlColumnNames(DbType dsType, DbType dtType, BaseDataSource
+     * dataSourceCfg, String sql)
+     */
+    @Test
+    public void testParsingSqlColumnNames()
+        throws Exception {
+        try {
+            BaseDataSource dataSource = DataSourceFactory.getDatasource(getDataSource().getType(),
+                    getDataSource().getConnectionParams());
+
+            Method method = DataxTask.class.getDeclaredMethod("parsingSqlColumnNames", DbType.class, DbType.class, BaseDataSource.class, String.class);
+            method.setAccessible(true);
+            String[] columns = (String[]) method.invoke(dataxTask, DbType.MYSQL, DbType.MYSQL, dataSource, "select 1 as a, 2 as `table` from dual");
+
+            Assert.assertNotNull(columns);
+
+            Assert.assertTrue(columns.length == 2);
+
+            Assert.assertEquals("[`a`, `table`]", Arrays.toString(columns));
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: tryGrammaticalParsingSqlColumnNames(DbType dbType, String sql)
+     */
+    @Test
+    public void testTryGrammaticalAnalysisSqlColumnNames()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("tryGrammaticalAnalysisSqlColumnNames", DbType.class, String.class);
+            method.setAccessible(true);
+            String[] columns = (String[]) method.invoke(dataxTask, DbType.MYSQL, "select t1.a, t1.b from test t1 union all select a, t2.b from (select a, b from test) t2");
+
+            Assert.assertNotNull(columns);
+
+            Assert.assertTrue(columns.length == 2);
+
+            Assert.assertEquals("[a, b]", Arrays.toString(columns));
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: tryExecuteSqlResolveColumnNames(BaseDataSource baseDataSource,
+     * String sql)
+     */
+    @Test
+    public void testTryExecuteSqlResolveColumnNames()
+        throws Exception {
+        // TODO: Test goes here...
+    }
+
+    /**
+     * Method: buildDataxJsonFile()
+     */
+    @Test
+    public void testBuildDataxJsonFile()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile");
+            method.setAccessible(true);
+            String filePath = (String) method.invoke(dataxTask, null);
+            Assert.assertNotNull(filePath);
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: buildDataxJobContentJson()
+     */
+    @Test
+    public void testBuildDataxJobContentJson()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("buildDataxJobContentJson");
+            method.setAccessible(true);
+            List<JSONObject> contentList = (List<JSONObject>) method.invoke(dataxTask, null);
+            Assert.assertNotNull(contentList);
+
+            JSONObject content = contentList.get(0);
+            JSONObject reader = (JSONObject) content.get("reader");
+            Assert.assertNotNull(reader);
+
+            String readerPluginName = (String) reader.get("name");
+            Assert.assertEquals(DataxUtils.DATAX_READER_PLUGIN_MYSQL, readerPluginName);
+
+            JSONObject writer = (JSONObject) content.get("writer");
+            Assert.assertNotNull(writer);
+
+            String writerPluginName = (String) writer.get("name");
+            Assert.assertEquals(DataxUtils.DATAX_WRITER_PLUGIN_MYSQL, writerPluginName);
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: buildDataxJobSettingJson()
+     */
+    @Test
+    public void testBuildDataxJobSettingJson()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("buildDataxJobSettingJson");
+            method.setAccessible(true);
+            JSONObject setting = (JSONObject) method.invoke(dataxTask, null);
+            Assert.assertNotNull(setting);
+            Assert.assertNotNull(setting.get("speed"));
+            Assert.assertNotNull(setting.get("errorLimit"));
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: buildDataxCoreJson()
+     */
+    @Test
+    public void testBuildDataxCoreJson()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("buildDataxCoreJson");
+            method.setAccessible(true);
+            JSONObject coreConfig = (JSONObject) method.invoke(dataxTask, null);
+            Assert.assertNotNull(coreConfig);
+            Assert.assertNotNull(coreConfig.get("transport"));
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: buildShellCommandFile(String jobConfigFilePath)
+     */
+    @Test
+    public void testBuildShellCommandFile()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("buildShellCommandFile", String.class);
+            method.setAccessible(true);
+            Assert.assertNotNull(method.invoke(dataxTask, "test.json"));
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Method: getParameters
+     */
+    @Test
+    public void testGetParameters()
+            throws Exception {
+        Assert.assertTrue(dataxTask.getParameters() != null);
+    }
+
+    /**
+     * Method: notNull(Object obj, String message)
+     */
+    @Test
+    public void testNotNull()
+        throws Exception {
+        try {
+            Method method = DataxTask.class.getDeclaredMethod("notNull", Object.class, String.class);
+            method.setAccessible(true);
+            method.invoke(dataxTask, "abc", "test throw RuntimeException");
+        }
+        catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index 62ca8103e5..e8187043bf 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -279,6 +279,10 @@ let tasksType = {
   'HTTP': {
     desc: 'HTTP',
     color: '#E46F13'
+  },
+  'DATAX': {
+    desc: 'DataX',
+    color: '#1fc747'
   }
 }
 
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index fbb4f418d0..420bae8c89 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -101,6 +101,9 @@
   .icos-HTTP {
     background: url("../img/toobar_HTTP.png") no-repeat 50% 50%;
   }
+  .icos-DATAX {
+    background: url("../img/toolbar_DATAX.png") no-repeat 50% 50%;
+  }
   .toolbar {
     width: 60px;
     height: 100%;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 3f009eb75c..682dd5b51a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -191,7 +191,13 @@
           ref="HTTP"
           :backfill-item="backfillItem">
         </m-http>
-
+        <m-datax
+          v-if="taskType === 'DATAX'"
+          @on-params="_onParams"
+          @on-cache-params="_onCacheParams"
+          ref="DATAX"
+          :backfill-item="backfillItem">
+        </m-datax>
       </div>
     </div>
     <div class="bottom-box">
@@ -216,6 +222,7 @@
   import mProcedure from './tasks/procedure'
   import mDependent from './tasks/dependent'
   import mHttp from './tasks/http'
+  import mDatax from './tasks/datax'
   import mSubProcess from './tasks/sub_process'
   import mSelectInput from './_source/selectInput'
   import mTimeoutAlarm from './_source/timeoutAlarm'
@@ -565,6 +572,7 @@
       mPython,
       mDependent,
       mHttp,
+      mDatax,
       mSelectInput,
       mTimeoutAlarm,
       mPriority,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
new file mode 100755
index 0000000000..ce918f49cf
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
@@ -0,0 +1,292 @@
+/*
+* 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>
+  <div class="datax-model">
+    <m-list-box>
+      <div slot="text">{{$t('Datasource')}}</div>
+      <div slot="content">
+        <m-datasource
+                ref="refDs"
+                @on-dsData="_onDsData"
+                :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
+                :data="{ type:dsType,datasource:datasource }">
+        </m-datasource>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">{{$t('SQL Statement')}}</div>
+      <div slot="content">
+        <div class="from-mirror">
+          <textarea
+            id="code-sql-mirror"
+            name="code-sql-mirror"
+            style="opacity: 0;">
+          </textarea>
+        </div>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">{{$t('TargetDataBase')}}</div>
+      <div slot="content">
+        <m-datasource
+                ref="refDt"
+                @on-dsData="_onDtData"
+                :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
+                :data="{ type:dtType,datasource:datatarget }">
+        </m-datasource>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">{{$t('TargetTable')}}</div>
+      <div slot="content">
+        <x-input
+          type="input"
+          v-model="targetTable"
+          :placeholder="$t('Please enter the table of target')"
+          autocomplete="off">
+        </x-input>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">{{$t('TargetDataBase')}}{{$t('Pre Statement')}}</div>
+      <div slot="content">
+        <m-statement-list
+          ref="refPreStatements"
+          @on-statement-list="_onPreStatements"
+          :statement-list="preStatements">
+        </m-statement-list>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">{{$t('TargetDataBase')}}{{$t('Post Statement')}}</div>
+      <div slot="content">
+        <m-statement-list
+          ref="refPostStatements"
+          @on-statement-list="_onPostStatements"
+          :statement-list="postStatements">
+        </m-statement-list>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">
+        <span>{{$t('SpeedByte')}}</span>
+      </div>
+      <div slot="content">
+        <m-select-input v-model="jobSpeedByte" :list="[0,1,10,50,100,512]">
+        </m-select-input>
+        <span>({{$t('0 means unlimited by byte')}})</span>
+      </div>
+    </m-list-box>
+    <m-list-box>
+      <div slot="text">
+        <span>{{$t('SpeedRecord')}}</span>
+      </div>
+      <div slot="content">
+        <m-select-input v-model="jobSpeedRecord" :list="[0,500,1000,1500,2000,2500,3000]">
+        </m-select-input>
+        <span>({{$t('0 means unlimited by count')}})</span>
+      </div>
+    </m-list-box>
+  </div>
+</template>
+<script>
+  import _ from 'lodash'
+  import i18n from '@/module/i18n'
+  import mListBox from './_source/listBox'
+  import mDatasource from './_source/datasource'
+  import mLocalParams from './_source/localParams'
+  import mStatementList from './_source/statementList'
+  import disabledState from '@/module/mixin/disabledState'
+  import mSelectInput from '../_source/selectInput'
+  import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
+
+  let editor
+
+  export default {
+    name: 'datax',
+
+    data () {
+      return {
+        // Data source type
+        dsType: '',
+        // data source
+        datasource: '',
+        // Data source type
+        dtType: '',
+        // data source
+        datatarget: '',
+        // Return to the selected data source
+        rtDatasource: '',
+        // Return to the selected data target
+        rtDatatarget: '',
+        // Sql statement
+        sql: '',
+        // target table
+        targetTable: '',
+        // Pre statements
+        preStatements: [],
+        // Post statements
+        postStatements: [],
+        // speed byte
+        jobSpeedByte: 0,
+        // speed record
+        jobSpeedRecord: 1000,
+      }
+    },
+    mixins: [disabledState],
+    props: {
+      backfillItem: Object,
+      createNodeId: Number
+    },
+    methods: {
+      /**
+       * return data source
+       */
+      _onDsData (o) {
+        this.dsType = o.type
+        this.rtDatasource = o.datasource
+      },
+      /**
+       * return data target
+       */
+      _onDtData (o) {
+        this.dtType = o.type
+        this.rtDatatarget = o.datasource
+      },
+      /**
+       * return pre statements
+       */
+      _onPreStatements (a) {
+        this.preStatements = a
+      },
+      /**
+       * return post statements
+       */
+      _onPostStatements (a) {
+        this.postStatements = a
+      },
+      /**
+       * verification
+       */
+      _verification () {
+        if (!editor.getValue()) {
+          this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
+          return false
+        }
+
+        // datasource Subcomponent verification
+        if (!this.$refs.refDs._verifDatasource()) {
+          return false
+        }
+
+        // datasource Subcomponent verification
+        if (!this.$refs.refDt._verifDatasource()) {
+          return false
+        }
+
+        if (!this.targetTable) {
+          this.$message.warning(`${i18n.$t('Please enter a Target Table(required)')}`)
+          return false
+        }
+
+        // preStatements Subcomponent verification
+        if (!this.$refs.refPreStatements._verifProp()) {
+          return false
+        }
+
+        // postStatements Subcomponent verification
+        if (!this.$refs.refPostStatements._verifProp()) {
+          return false
+        }
+
+        // storage
+        this.$emit('on-params', {
+          dsType: this.dsType,
+          dataSource: this.rtDatasource,
+          dtType: this.dtType,
+          dataTarget: this.rtDatatarget,
+          sql: editor.getValue(),
+          targetTable: this.targetTable,
+          jobSpeedByte: this.jobSpeedByte * 1024,
+          jobSpeedRecord: this.jobSpeedRecord,
+          preStatements: this.preStatements,
+          postStatements: this.postStatements
+        })
+        return true
+      },
+      /**
+       * Processing code highlighting
+       */
+      _handlerEditor () {
+        // editor
+        editor = codemirror('code-sql-mirror', {
+          mode: 'sql',
+          readOnly: this.isDetails
+        })
+
+        this.keypress = () => {
+          if (!editor.getOption('readOnly')) {
+            editor.showHint({
+              completeSingle: false
+            })
+          }
+        }
+
+        // Monitor keyboard
+        editor.on('keypress', this.keypress)
+
+        editor.setValue(this.sql)
+
+        return editor
+      }
+    },
+    created () {
+      let o = this.backfillItem
+
+      // Non-null objects represent backfill
+      if (!_.isEmpty(o)) {
+        // backfill
+        this.dsType = o.params.dsType || ''
+        this.datasource = o.params.dataSource || ''
+        this.dtType = o.params.dtType || ''
+        this.datatarget = o.params.dataTarget || ''
+        this.sql = o.params.sql || ''
+        this.targetTable = o.params.targetTable || ''
+        this.jobSpeedByte = o.params.jobSpeedByte / 1024 || 0
+        this.jobSpeedRecord = o.params.jobSpeedRecord || 0
+        this.preStatements = o.params.preStatements || []
+        this.postStatements = o.params.postStatements || []
+      }
+    },
+    mounted () {
+      setTimeout(() => {
+        this._handlerEditor()
+      }, 200)
+    },
+    destroyed () {
+      /**
+       * Destroy the editor instance
+       */
+      if (editor) {
+        editor.toTextArea() // Uninstall
+        editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
+      }
+    },
+    computed: {},
+    components: { mListBox, mDatasource, mLocalParams, mStatementList, mSelectInput }
+  }
+</script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DATAX.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DATAX.png
new file mode 100644
index 0000000000000000000000000000000000000000..b59c7592081977f8ed36359df9a4467ce9d22f66
GIT binary patch
literal 571
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIC)C9V-ADTyViR=N2pnQ4^_Mg~R(x&}tN1|}f}7FGu4R)&_^1_o9J1~w}t
z6HzoI7o`IA;nv{$W#L_*2CV>}5LaXO^X>&cW?mP73=r~wk!TF}^OK^dRReYLl?3?(
z|7YO#eSPQW@#1#%sVnC^-mq&T(DlZiE{-7@=aU6km=tddv9WzW-KAj0+;RUD1Djx1
z0HZLQMnM~ghmnfIj~pK1gG}r<60{^L9GE6?*f}3^S<t}9ER-OYB2eTYmJpaSA;DS9
zBO@gs(SgyAM=jAq>QKZS$uv&Wh8ss2c{p?CY>HVe*%ju&6gy?ZMurTA)f*m*v@Kxm
zz9Fuc9u^atwB%sI6^UaHwj8)ny*1#O)8h+M+t~TIHaD_xMTm)+uo-Od&Ec5D!rh`1
zqLZQHkr8uaL!e~F$0pY^Nxcq?c{2~Rg*vo4YOBngrmr*O#yQ2y7OtBLn4G63Ft<-g
zbexi~bHT%$!evi+!kr`}yds4oP6;21jAe@0E6Ee^_t2RITzu9XY;CCm%f1^jaVT>b
zGDm)3Xgc3)yQm>>Cd0<-lHn=MlbNHfR4f@7Vv@a1Z#T7i1PoXPPgg&ebxsLQ0Dm98
A_y7O^

literal 0
HcmV?d00001

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_ETL.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_ETL.png
new file mode 100755
index 0000000000000000000000000000000000000000..913af420c6c76ed051ecf44f27b522419fea7ecc
GIT binary patch
literal 3117
zcmZ{mc{J2*8^?c%Axj}4*&_-wW8agVvBZ!qWf{Xv%#a!To{+L+k0N3SHCY;iGK6?!
ziwY&?5pT*e*^T`jo%fu#_c`Z1zjNK!`F+2i>wDjSUdcArrd;eo>;M38nVT8G8D0Fa
z*g%XE7aqRGXv{wPR{8+&nfYto7p6lKVFtGXfbeqw5PKT{wi#0F4*&>)0>GR*0BAh`
z0D*u<&9*uW1LSF8Y6Kh{e#I>nSqz00Z*FDGI(_6A6Ps$>ExlC$I96(Iq;K!kQJ5Q%
zBJwG!ThGUvwiC5U>z!1OzArScq0w+2ZD938F#gmf+YA>W(u_n#88(}{#L1rRJS_eT
zjDV>c&NM=s!_Ckv=a0F=S?-M3bYDLzG4|^E2J+YZ<g3jnA6nld+;;c+Hi=lGJM8~`
zS8+B{Z#E>FiZfY?LG5fTPH$+_Ji~8frun4>sN9;?U}N5jEP}O|=<v+G5DS}$8azKa
zAMdZXA($Lm5E-4kA9n=A3K|RQIF217$<#y)(g1gU4wi#TvAr5qP30F|)+x0$0l7Ur
zAMimzxF5c5dk05%_YmoJ;JnYld+WRNCt|o8_uAqp#DRem%tzxE;guro(C|nqS!d8c
zyhxom<=Ahsy4a*#f6`5tPRNM~-HrIV*%T4BRFbsS)p4RFCU$7Z_B($bT2q0xv*44`
z-Fh&nJ+k>+Z>%+X&-BR<3ewJozT}H)RfV08q>d8j9eN4FoqY>^C%ntci|FrZXE-h&
z(9Hu23w7{6;x<{AI<pQyF7-8yf)jPfUPqHeQ_B6GvIwpZMi&y`;fvy2&3l(FBv1Ig
zBM{yWEiWgtUR?c2)mtGM#+b<SPfxM7M)yEhSHdXE&s*D|%=NhXDJtb>M+{}EfNQg2
zxH5Z0JjY<3!?Rj$6jqXLWS*SOOW;dH3k^B>L3vXrcfVO2tar(5EI!=Yn(9aq(GCxa
zP2Z<oryZ>5zx&kHaz@QB5-OUWRQ6GpFjS@RG~2*DAydGJkWH_SB76~dImw<-hiVW#
zEwbnA6XK}K&8c{EZYE53IxyDqT(6t%c1ROtpEB6(S-UjHzFt+ck}=%9sjEZnZjpWc
zDWGLlf*_gI9|`3>Cf0cHw}4_N;S~iWo&(G5_XeF@rr+V7y^#9J1{DQfcOg42?t~VF
zBtM<K#z(w|bT-)DFRV;+?F(M8SbNrcgejNhM;ThkLjrukZi3cecy>S^O|YdHRRzC;
zfLs?@<vBj6jD&=QbYCNXYP`_4yQ@R_g(iP$SK;KFdp%*pbo-K9rb(*F*__TiOwx~g
zog}!Cfxe4E_sfS?9kqqkKJE*hf|OtLsb|#dh-6l2&X*u*zUpQdU(VWsM_1HQWspGu
zx2vv*0??4n{m=Q%uA^@;*Vt>yLF@^VZ@;laC~LTLGE`|nHtrfrrrcy?fnZ`BH`C1`
z&`Sr@M8gxZ%gLgo*@!Y;#d9(;`T2!8`IaWmxj{hyfzRO1$V%X3#CE=qrdlwQv~=7h
zpjS!J>ZpgSEa&r2VG*#(`;_#M0f{M_`+?{Lx7XVibL-(9b$z*Er`rk?#z?*b#U0A^
zI7Ud(V+x(O!uoO@VkdZeWZk`BBw^a_v34TKpr=93mD+)6VpGAr)v>etz<19$v&ZY{
zXFp~zc}gg@h=v6eb#x@tUhh*wi@N(3PUo%|^Db+Awk*J3FqY!&Qc);ds})HKZ!sr1
zl)5~BlHFcs>7tMaZ?ZI1Gra5w#;+7ooht3;<^X@n);XA5&}d=E&FLatVeN}18p2&r
z=7wpga!8`x^huS6TwfhH265vXT(`}nvZU<H4NACS7Yh2d%HMyD9>?s?*6Wqn$a1rT
zUK|eyjuxeEhHd3IHto=;XEQ7V7shT1k%W5e6TOto)gEF-@A-*YCZgT*`5UU8<j4A~
z)hb7X1e@RPUkxtFe)DndC5!<70)^=Ajecc0YS<x57#UAnWo`Jtjva4EEt&Fo3Fo`V
zB3zLSK}OUdJ@fg6`YS(!l1%fQU58|Oy4X6G@G0uu_g>Riu4do$nQecve~rgdlcVKC
z+vi#0qd4CeE&LL<Nsk84{Ia$}kX`&HBNZO1`+EnV?!X8Jr9*8E7~$>`f)rvp=z2`4
zfm)V0+n7~F)UBg1-?_A&NOW=a0!H-ZTq>M46UDbr=G+|;qgwb75mI@*6ZP4HSIg11
zU`Hn~UoGaLjjW}-=-DF6%mJ?&WJ*kohme9Q+;C#KlFX+~-mrW2MSiAw7Ob4vP`z`t
zcK`90`HSCcexC5y)*JD5_w-~+bs$eRyUB5VsK*&SQPiOlY~<@|8qIodF1ZT0!LI9x
zNV(M=Bk<BC6HljQ-btX-Cl@0r+CA|Hbaqo}fiYWh<qfjn^I=hmtAiHGQUBt^Z>(hw
z&L%O%wdw9`L`k}jAGff$=j0HJk~h&2mB}!>Zzcu3b@TduP&}`q%TFvwoh$H1(Y44e
zJMFQi%7-OEXzZk>r7?>}aC!1H%p&PY@7z$*@zpNQ6ul<?;+O!o!PT7`>s`7TW>Sq2
zo7g%L&3AHg_SL7d;Sb8qWrYn2Y@;;=ibWT_W{!63_C8+t-o`cmqu+>)W!z3i^2ob}
z?>;BhtVCkn%X+leD{RsRdt^qjakD$J(zBRxu<#je9=R*Nel0XDZ1c~K?03@d{-q=*
zC--b7uX0NtU!Lw>l^4%yGNze5Lt19KET-Eb<L}hH@rE;IYnP82*8Aq?c<gDIcyG`N
z36%_b&NcDd#n)f-8<*D3`gQNOfBPm$3XgXsW(^Doi!=q(;lp^<dHh|chCJ%r<)yyl
zFv@B$m&m+3;_dWj0c)IVx!@OF%PO#Q(cK!QLb3kHKtwgYG=#`moKRd}-JJ)Iu6B6t
zXD-DnmdaD%dftwhok5AAwKKguH;=vKqpoO+`kQ`hKIC{tDyuU%n=QR_t1vVZZUJ>X
zW>XoQdquz1KAgZL$?Q6%#z*X!nvFJ)FM3dq*{PR%+g_gob7of=LS@@)St;d63a7b0
zIH%pt;pLT6d$&yHl)LYMrxd1UuRvZq(atrCKc!6K^hY{e=gqAcS2Ty$;ydtz{QM~d
znKnB!?*Bpkee1We4UVGufkvXXxVQ)#^D{FQ1IY}j!hzwO<gA=i{DvY%(?_;FK}`>g
zm1OTca2Krk_<rTDSG06$ew7%EQ(BH#{rAvwM-ULYxyGy=GST^0InNxad38C8ETVmL
z*Kx3sxC0}(^o&+rv3)W6)w>isI!|hD4Q%imOnaO^lAnyaoNk%eSN#6zU5jaYW<hAs
z@XmMNiUO*z;GI*i$eqqw6gJcShQgbZrHif8;05n^S090&_{5m)4XWVIuSR8_bZOo<
zHnNhO5|M+r)GpYnz({I;$>jqy_G)_5MG^jzgo3J6>n&UbEe%XOz@}nGWkUBWokP8r
z+H+e4+HQ<T%rCy)*tXr6+~tuRGTU)f5Hw;N+E)#^))j%3XxX%L9rYdJIrXSg*19iD
zSof1;7W90SBFTI5;K*w0m4;LJYG=j<Cyh6D!h3n(ky?mAB%=XJP(@7zsG<T?(;lj%
z1=Y|}RhDC%P$<u97xDiY!1#Niy~F<hfcw<9M~nf(!y9n^-uMuYKqLSO!UaP7{1G00
z5H!Za2gxWj!WV)=F-(Y;KLTQYs9OD271SXRG}a3l3P#~Eel4W1!_8LkFwPzogz?nU
zGV(_RVUSq7mX-};2nQ%u9K3@3gZZ7OrDcXh`=IcEqLPMTq<$=e5%?qLKa3;V3y(TP
z-ly_RFp$%KAXaD$5+4?T1b)975`gv5t8=jaM~;;}g8~#)Rn#=qp_<CdYwdkz421WO
z96NOQA)%qBWU$%io6B%L|8TFs%>i$;A5seffuQ^`NC;!U2=w>IL$JsY92)=oAB^<C
zg`pAtSTGiehakML3TTYae?<fqa+rXFC_*(3OGz234rV-e09*@Z+y<B%TN@D#+;9CG
DaU;2P

literal 0
HcmV?d00001

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 2af54533ce..6e8c113b30 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -509,5 +509,13 @@ export default {
   'IP address cannot be empty': 'IP address cannot be empty',
   'Please enter the correct IP': 'Please enter the correct IP',
   'Please generate token': 'Please generate token',
-  'Spark Version': 'Spark Version'
+  'Spark Version': 'Spark Version',
+  'TargetDataBase': 'target database',
+  'TargetTable': 'target table',
+  'Please enter the table of target': 'Please enter the table of target',
+  'Please enter a Target Table(required)': 'Please enter a Target Table(required)',
+  'SpeedByte': 'speed(byte count)',
+  'SpeedRecord': 'speed(record count)',
+  '0 means unlimited by byte': '0 means unlimited',
+  '0 means unlimited by count': '0 means unlimited',
 }
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 1c68e8ead1..52a98773a6 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -509,5 +509,13 @@ export default {
   'IP address cannot be empty': 'IP地址不能为空',
   'Please enter the correct IP': '请输入正确的IP',
   'Please generate token': '请生成Token',
-  'Spark Version': 'Spark版本'
+  'Spark Version': 'Spark版本',
+  'TargetDataBase': '目标库',
+  'TargetTable': '目标表',
+  'Please enter the table of target': '请输入目标表名',
+  'Please enter a Target Table(required)': '请输入目标表(必填)',
+  'SpeedByte': '限流(字节数)',
+  'SpeedRecord': '限流(记录数)',
+  '0 means unlimited by byte': 'KB，0代表不限制',
+  '0 means unlimited by count': '0代表不限制',
 }
diff --git a/pom.xml b/pom.xml
index 86d95e44a7..0ff2f65f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -713,6 +713,8 @@
                         <include>**/dao/mapper/CommandMapperTest.java</include>
                         <include>**/alert/template/AlertTemplateFactoryTest.java</include>
                         <include>**/alert/template/impl/DefaultHTMLTemplateTest.java</include>
+                        <include>**/server/worker/task/datax/DataxTaskTest.java</include>
+                        <include>**/server/utils/DataxUtilsTest.java</include>
                     </includes>
                     <!-- <skip>true</skip> -->
                 </configuration>

From c63cd3e237d7a32b7cad529dd99c4051abd8b86d Mon Sep 17 00:00:00 2001
From: dailidong <dailidong66@gmail.com>
Date: Thu, 6 Feb 2020 11:08:06 +0800
Subject: [PATCH 25/35] combine logback config of master/worker/alert/api
 server to one (#1898)

* combine logback config of master/worker/alert/api server to one logback.xml
---
 .../conf/combined_logback.xml                 |   6 +-
 .../dolphinscheduler/conf/worker_logback.xml  |   6 +-
 .../src/main/resources/alert_logback.xml      |  49 -----
 .../src/main/resources/apiserver_logback.xml  |  60 ------
 .../main/resources/application-api.properties |   2 -
 dolphinscheduler-common/pom.xml               |   7 +
 .../common}/log/MasterLogFilter.java          |   2 +-
 .../common}/log/SensitiveDataConverter.java   |   6 +-
 .../common}/log/TaskLogDiscriminator.java     |   4 +-
 .../common}/log/TaskLogFilter.java            |   4 +-
 .../common}/log/WorkerLogFilter.java          |   6 +-
 .../common}/utils/LoggerUtils.java            |   9 +-
 .../common/utils/SensitiveLogUtils.java       |   4 +-
 .../src/main/resources/logback.xml            | 169 +++++++++++++++++
 .../common/log/MasterLogFilterTest.java       | 118 ++++++++++++
 .../log/SensitiveDataConverterTest.java       | 179 ++++++++++++++++++
 .../common/log/TaskLogDiscriminatorTest.java  | 155 +++++++++++++++
 .../common/log/TaskLogFilterTest.java         | 120 ++++++++++++
 .../common/log/WorkerLogFilterTest.java       | 119 ++++++++++++
 .../common/utils/LoggerUtilsTest.java         |  43 +++++
 .../common/utils/SensitiveLogUtilsTest.java   |   8 +-
 .../server/utils/ProcessUtils.java            |   1 +
 .../worker/runner/TaskScheduleThread.java     |   4 +-
 .../worker/task/AbstractCommandExecutor.java  |   2 +-
 .../src/main/resources/master_logback.xml     |  52 -----
 .../src/main/resources/worker_logback.xml     |  81 --------
 .../log/SensitiveDataConverterTest.java       |  92 ---------
 .../shell/ShellCommandExecutorTest.java       |   2 +-
 .../server/worker/sql/SqlExecutorTest.java    |   2 +-
 pom.xml                                       |   1 +
 script/dolphinscheduler-daemon.sh             |  12 +-
 31 files changed, 955 insertions(+), 370 deletions(-)
 delete mode 100644 dolphinscheduler-alert/src/main/resources/alert_logback.xml
 delete mode 100644 dolphinscheduler-api/src/main/resources/apiserver_logback.xml
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/log/MasterLogFilter.java (96%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/log/SensitiveDataConverter.java (92%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/log/TaskLogDiscriminator.java (94%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/log/TaskLogFilter.java (93%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/log/WorkerLogFilter.java (91%)
 rename {dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common}/utils/LoggerUtils.java (91%)
 rename dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtil.java => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtils.java (93%)
 create mode 100644 dolphinscheduler-common/src/main/resources/logback.xml
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/MasterLogFilterTest.java
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverterTest.java
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminatorTest.java
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogFilterTest.java
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/WorkerLogFilterTest.java
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/LoggerUtilsTest.java
 rename dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtilTest.java => dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java (83%)
 delete mode 100644 dolphinscheduler-server/src/main/resources/master_logback.xml
 delete mode 100644 dolphinscheduler-server/src/main/resources/worker_logback.xml
 delete mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverterTest.java

diff --git a/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml b/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml
index 6bdb97cf00..7a9a5b4621 100644
--- a/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml
+++ b/dockerfile/conf/dolphinscheduler/conf/combined_logback.xml
@@ -31,8 +31,8 @@
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.TaskLogFilter"></filter>
-        <Discriminator class="org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator">
+        <filter class="org.apache.dolphinscheduler.common.log.TaskLogFilter"></filter>
+        <Discriminator class="org.apache.dolphinscheduler.common.log.TaskLogDiscriminator">
             <key>taskAppId</key>
             <logBase>${log.base}</logBase>
         </Discriminator>
@@ -52,7 +52,7 @@
 
     <appender name="COMBINEDLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-combined.log</file>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter">
+        <filter class="org.apache.dolphinscheduler.common.log.WorkerLogFilter">
             <level>INFO</level>
         </filter>
 
diff --git a/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml b/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml
index 9bbd9615c4..bf4a651e7c 100644
--- a/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml
+++ b/dockerfile/conf/dolphinscheduler/conf/worker_logback.xml
@@ -31,8 +31,8 @@
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.TaskLogFilter"></filter>
-        <Discriminator class="org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator">
+        <filter class="org.apache.dolphinscheduler.common.log.TaskLogFilter"></filter>
+        <Discriminator class="org.apache.dolphinscheduler.common.log.TaskLogDiscriminator">
             <key>taskAppId</key>
             <logBase>${log.base}</logBase>
         </Discriminator>
@@ -52,7 +52,7 @@
 
     <appender name="WORKERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-worker.log</file>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter">
+        <filter class="org.apache.dolphinscheduler.common.log.WorkerLogFilter">
             <level>INFO</level>
         </filter>
 
diff --git a/dolphinscheduler-alert/src/main/resources/alert_logback.xml b/dolphinscheduler-alert/src/main/resources/alert_logback.xml
deleted file mode 100644
index 3474df8d2e..0000000000
--- a/dolphinscheduler-alert/src/main/resources/alert_logback.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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.
-  -->
-
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<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>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-			<maxHistory>20</maxHistory>
-			<maxFileSize>64MB</maxFileSize>
-		</rollingPolicy>
-		<encoder>
-			<pattern>
-				[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-
-	<root level="INFO">
-		<appender-ref ref="ALERTLOGFILE"/>
-	</root>
-</configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-api/src/main/resources/apiserver_logback.xml b/dolphinscheduler-api/src/main/resources/apiserver_logback.xml
deleted file mode 100644
index 4c2ce0d2b3..0000000000
--- a/dolphinscheduler-api/src/main/resources/apiserver_logback.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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.
-  -->
-
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="120 seconds">
-	<logger name="org.apache.zookeeper" level="WARN"/>
- 	<logger name="org.apache.hbase" level="WARN"/>
- 	<logger name="org.apache.hadoop" level="WARN"/>
-
-	<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="APISERVERLOGFILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<!-- Log level filter -->
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-        <file>${log.base}/dolphinscheduler-api-server.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-			<maxHistory>168</maxHistory>
-			<maxFileSize>64MB</maxFileSize>
-		</rollingPolicy>
-
-		<encoder>
-			<pattern>
-				[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-
-	</appender>
-
-	<root level="INFO">
-		<appender-ref ref="APISERVERLOGFILE" />
-	</root>
-</configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties b/dolphinscheduler-api/src/main/resources/application-api.properties
index 6ec304a397..21f940baaf 100644
--- a/dolphinscheduler-api/src/main/resources/application-api.properties
+++ b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-logging.config=classpath:apiserver_logback.xml
-
 # server port
 server.port=12345
 
diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml
index 955e956251..bd2448eee7 100644
--- a/dolphinscheduler-common/pom.xml
+++ b/dolphinscheduler-common/pom.xml
@@ -29,6 +29,7 @@
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<codehaus.janino.version>3.1.0</codehaus.janino.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -604,5 +605,11 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.codehaus.janino</groupId>
+			<artifactId>janino</artifactId>
+			<version>${codehaus.janino.version}</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/MasterLogFilter.java
similarity index 96%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/MasterLogFilter.java
index d6de484074..7b5d53a032 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/MasterLogFilter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.master.log;
+package org.apache.dolphinscheduler.common.log;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverter.java
similarity index 92%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverter.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverter.java
index 4a98e66c6c..971ce7149c 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverter.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverter.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.log;
+package org.apache.dolphinscheduler.common.log;
 
 
 import ch.qos.logback.classic.pattern.MessageConverter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.SensitiveLogUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.apache.dolphinscheduler.server.utils.SensitiveLogUtil;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -77,7 +77,7 @@ public class SensitiveDataConverter extends MessageConverter {
 
             String password = matcher.group();
 
-            String maskPassword = SensitiveLogUtil.maskDataSourcePwd(password);
+            String maskPassword = SensitiveLogUtils.maskDataSourcePwd(password);
 
             matcher.appendReplacement(sb, maskPassword);
         }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminator.java
similarity index 94%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminator.java
index fa00aed772..fd2b0766a8 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.log;
+package org.apache.dolphinscheduler.common.log;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.sift.AbstractDiscriminator;
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 
 /**
  * Task Log Discriminator
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogFilter.java
similarity index 93%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogFilter.java
index 6398135481..ac258daf20 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/TaskLogFilter.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.log;
+package org.apache.dolphinscheduler.common.log;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.FilterReply;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 
 /**
  *  task log filter
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/WorkerLogFilter.java
similarity index 91%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/WorkerLogFilter.java
index 23758f918a..abcc8bc619 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/log/WorkerLogFilter.java
@@ -14,12 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.log;
+package org.apache.dolphinscheduler.common.log;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+
+import java.util.Arrays;
 
 /**
  *  worker log filter
@@ -40,6 +43,7 @@ public class WorkerLogFilter extends Filter<ILoggingEvent> {
         if (event.getThreadName().startsWith("Worker-")){
             return FilterReply.ACCEPT;
         }
+
         return FilterReply.DENY;
     }
     public void setLevel(String level) {
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/LoggerUtils.java
similarity index 91%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/LoggerUtils.java
index 8b40d943c0..fc08eb645b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/LoggerUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.utils;
+package org.apache.dolphinscheduler.common.utils;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.slf4j.Logger;
@@ -44,6 +44,11 @@ public class LoggerUtils {
      */
     public static final String TASK_LOGGER_THREAD_NAME = "TaskLogInfo";
 
+    /**
+     * Task Logger Thread's name
+     */
+    public static final String TASK_APPID_LOG_FORMAT = "[taskAppId=";
+
     /**
      * build job id
      *
@@ -58,7 +63,7 @@ public class LoggerUtils {
                                   int processInstId,
                                   int taskId){
         // - [taskAppId=TASK_79_4084_15210]
-        return String.format(" - [taskAppId=%s-%s-%s-%s]",affix,
+        return String.format(" - %s%s-%s-%s-%s]",TASK_APPID_LOG_FORMAT,affix,
                 processDefId,
                 processInstId,
                 taskId);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtil.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtils.java
similarity index 93%
rename from dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtil.java
rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtils.java
index 948e92cb24..eab6c4f124 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtil.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.utils;
+package org.apache.dolphinscheduler.common.utils;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.dolphinscheduler.common.Constants;
@@ -22,7 +22,7 @@ import org.apache.dolphinscheduler.common.Constants;
 /**
  *  sensitive log Util
  */
-public class SensitiveLogUtil {
+public class SensitiveLogUtils {
 
     /**
      * @param dataSourcePwd data source password
diff --git a/dolphinscheduler-common/src/main/resources/logback.xml b/dolphinscheduler-common/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7f634da975
--- /dev/null
+++ b/dolphinscheduler-common/src/main/resources/logback.xml
@@ -0,0 +1,169 @@
+<?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.
+  -->
+
+<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
+<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>
+
+
+    <!-- master server logback config start -->
+    <appender name="MASTERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.base}/dolphinscheduler-master.log</file>
+        <!--<filter class="org.apache.dolphinscheduler.common.log.MasterLogFilter">
+            <level>INFO</level>
+        </filter>-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.base}/dolphinscheduler-master.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+            <maxHistory>168</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <!-- master server logback config end -->
+
+
+    <!-- worker server logback config start -->
+    <conversionRule conversionWord="messsage"
+                    converterClass="org.apache.dolphinscheduler.common.log.SensitiveDataConverter"/>
+    <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <filter class="org.apache.dolphinscheduler.common.log.TaskLogFilter"/>
+        <Discriminator class="org.apache.dolphinscheduler.common.log.TaskLogDiscriminator">
+            <key>taskAppId</key>
+            <logBase>${log.base}</logBase>
+        </Discriminator>
+        <sift>
+            <appender name="FILE-${taskAppId}" class="ch.qos.logback.core.FileAppender">
+                <file>${log.base}/${taskAppId}.log</file>
+                <encoder>
+                    <pattern>
+                        [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %messsage%n
+                    </pattern>
+                    <charset>UTF-8</charset>
+                </encoder>
+                <append>true</append>
+            </appender>
+        </sift>
+    </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">
+            <level>INFO</level>
+        </filter>
+        <filter class="org.apache.dolphinscheduler.common.log.WorkerLogFilter"/>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+            <maxHistory>168</maxHistory>
+            <maxFileSize>200MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %messsage%n
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <!-- worker server logback config end -->
+
+
+    <!-- alert server logback config start -->
+    <appender name="ALERTLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.base}/dolphinscheduler-alert.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+            <maxHistory>20</maxHistory>
+            <maxFileSize>64MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+    <!-- alert server logback config end -->
+
+
+    <!-- api server logback config start -->
+    <appender name="APILOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.base}/dolphinscheduler-api-server.log</file>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
+            <maxHistory>168</maxHistory>
+            <maxFileSize>64MB</maxFileSize>
+        </rollingPolicy>
+        <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 end -->
+
+    <logger name="org.apache.zookeeper" level="WARN"/>
+    <logger name="org.apache.hbase" level="WARN"/>
+    <logger name="org.apache.hadoop" level="WARN"/>
+
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+
+        <if condition='p("server").contains("master-server")'>
+            <then>
+                <appender-ref ref="MASTERLOGFILE"/>
+            </then>
+        </if>
+        <if condition='p("server").contains("worker-server")'>
+            <then>
+                <appender-ref ref="TASKLOGFILE"/>
+                <appender-ref ref="WORKERLOGFILE"/>
+            </then>
+        </if>
+        <if condition='p("server").contains("alert-server")'>
+            <then>
+                <appender-ref ref="ALERTLOGFILE"/>
+            </then>
+        </if>
+        <if condition='p("server").contains("api-server")'>
+            <then>
+                <appender-ref ref="APILOGFILE"/>
+            </then>
+        </if>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/MasterLogFilterTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/MasterLogFilterTest.java
new file mode 100644
index 0000000000..8cf6cfc2df
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/MasterLogFilterTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+import java.util.Map;
+
+public class MasterLogFilterTest {
+
+    @Test
+    public void decide() {
+        MasterLogFilter masterLogFilter = new MasterLogFilter();
+
+
+        FilterReply filterReply = masterLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return Constants.THREAD_NAME_MASTER_SERVER;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "master insert into queue success, task : shell2";
+//                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "master insert into queue success, task : shell2";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverterTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverterTest.java
new file mode 100644
index 0000000000..727ab41002
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/SensitiveDataConverterTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.common.log;
+
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.SensitiveLogUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SensitiveDataConverterTest {
+
+    private final Logger logger = LoggerFactory.getLogger(SensitiveDataConverterTest.class);
+
+    /**
+     * password pattern
+     */
+    private final Pattern pwdPattern = Pattern.compile(Constants.DATASOURCE_PASSWORD_REGEX);
+
+    private final String logMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
+            "\"database\":\"carbond\"," +
+            "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
+            "\"user\":\"view\"," +
+            "\"password\":\"view1\"}";
+
+    private final String maskLogMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
+            "\"database\":\"carbond\"," +
+            "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
+            "\"user\":\"view\"," +
+            "\"password\":\"******\"}";
+    @Test
+    public void convert() {
+        SensitiveDataConverter sensitiveDataConverter = new SensitiveDataConverter();
+        String result = sensitiveDataConverter.convert(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return null;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return null;
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return logMsg;
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
+
+    }
+
+    /**
+     * mask sensitive logMsg - sql task datasource password
+     */
+    @Test
+    public void testPwdLogMsgConverter() {
+        logger.info("parameter : {}", logMsg);
+        logger.info("parameter : {}", passwordHandler(pwdPattern, logMsg));
+
+        Assert.assertNotEquals(logMsg, passwordHandler(pwdPattern, logMsg));
+        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
+
+    }
+
+    /**
+     * password regex test
+     *
+     * @param logMsg original log
+     */
+    private static String passwordHandler(Pattern pattern, String logMsg) {
+
+        Matcher matcher = pattern.matcher(logMsg);
+
+        StringBuffer sb = new StringBuffer(logMsg.length());
+
+        while (matcher.find()) {
+
+            String password = matcher.group();
+
+            String maskPassword = SensitiveLogUtils.maskDataSourcePwd(password);
+
+            matcher.appendReplacement(sb, maskPassword);
+        }
+        matcher.appendTail(sb);
+
+        return sb.toString();
+    }
+
+
+
+}
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminatorTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminatorTest.java
new file mode 100644
index 0000000000..8745a4f6b4
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogDiscriminatorTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class TaskLogDiscriminatorTest {
+
+    /**
+     * log base
+     */
+    private String logBase = "logs";
+
+    TaskLogDiscriminator taskLogDiscriminator;
+
+    @Before
+    public void before(){
+        taskLogDiscriminator = new TaskLogDiscriminator();
+        taskLogDiscriminator.setLogBase("logs");
+        taskLogDiscriminator.setKey("123");
+    }
+
+    @Test
+    public void getDiscriminatingValue() {
+       String result = taskLogDiscriminator.getDiscriminatingValue(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return null;
+            }
+
+            @Override
+            public Level getLevel() {
+                return null;
+            }
+
+            @Override
+            public String getMessage() {
+                return null;
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return null;
+            }
+
+            @Override
+            public String getLoggerName() {
+                return "[taskAppId=TASK-1-1-1";
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+        Assert.assertEquals("1/1/", result);
+    }
+
+    @Test
+    public void start() {
+        taskLogDiscriminator.start();
+        Assert.assertEquals(true, taskLogDiscriminator.isStarted());
+    }
+
+    @Test
+    public void getKey() {
+        Assert.assertEquals("123", taskLogDiscriminator.getKey());
+    }
+
+    @Test
+    public void setKey() {
+
+        taskLogDiscriminator.setKey("123");
+    }
+
+    @Test
+    public void getLogBase() {
+        Assert.assertEquals("logs", taskLogDiscriminator.getLogBase());
+    }
+
+    @Test
+    public void setLogBase() {
+       taskLogDiscriminator.setLogBase("logs");
+    }
+}
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogFilterTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogFilterTest.java
new file mode 100644
index 0000000000..52767074da
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/TaskLogFilterTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+
+public class TaskLogFilterTest {
+
+    @Test
+    public void decide() {
+        TaskLogFilter taskLogFilter = new TaskLogFilter();
+
+
+        FilterReply filterReply = taskLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return LoggerUtils.TASK_LOGGER_THREAD_NAME;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "raw script : echo 222";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "raw script : echo 222";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/WorkerLogFilterTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/WorkerLogFilterTest.java
new file mode 100644
index 0000000000..90b154407f
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/log/WorkerLogFilterTest.java
@@ -0,0 +1,119 @@
+/*
+ * 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.common.log;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.IThrowableProxy;
+import ch.qos.logback.classic.spi.LoggerContextVO;
+import ch.qos.logback.core.spi.FilterReply;
+import org.apache.dolphinscheduler.common.Constants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Marker;
+
+import java.util.Map;
+
+
+public class WorkerLogFilterTest {
+
+    @Test
+    public void decide() {
+        WorkerLogFilter workerLogFilter = new WorkerLogFilter();
+
+
+        FilterReply filterReply = workerLogFilter.decide(new ILoggingEvent() {
+            @Override
+            public String getThreadName() {
+                return Constants.THREAD_NAME_WORKER_SERVER;
+            }
+
+            @Override
+            public Level getLevel() {
+                return Level.INFO;
+            }
+
+            @Override
+            public String getMessage() {
+                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public Object[] getArgumentArray() {
+                return new Object[0];
+            }
+
+            @Override
+            public String getFormattedMessage() {
+                return "consume tasks: [2_177_2_704_-1],there still have 0 tasks need to be executed";
+            }
+
+            @Override
+            public String getLoggerName() {
+                return null;
+            }
+
+            @Override
+            public LoggerContextVO getLoggerContextVO() {
+                return null;
+            }
+
+            @Override
+            public IThrowableProxy getThrowableProxy() {
+                return null;
+            }
+
+            @Override
+            public StackTraceElement[] getCallerData() {
+                return new StackTraceElement[0];
+            }
+
+            @Override
+            public boolean hasCallerData() {
+                return false;
+            }
+
+            @Override
+            public Marker getMarker() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMDCPropertyMap() {
+                return null;
+            }
+
+            @Override
+            public Map<String, String> getMdc() {
+                return null;
+            }
+
+            @Override
+            public long getTimeStamp() {
+                return 0;
+            }
+
+            @Override
+            public void prepareForDeferredProcessing() {
+
+            }
+        });
+
+        Assert.assertEquals(FilterReply.ACCEPT, filterReply);
+
+    }
+}
\ No newline at end of file
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/LoggerUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/LoggerUtilsTest.java
new file mode 100644
index 0000000000..5a80e388ba
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/LoggerUtilsTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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.common.utils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class LoggerUtilsTest {
+    private Logger logger = LoggerFactory.getLogger(LoggerUtilsTest.class);
+
+    @Test
+    public void buildTaskId() {
+
+      String taskId = LoggerUtils.buildTaskId(LoggerUtils.TASK_LOGGER_INFO_PREFIX,79,4084,15210);
+
+      Assert.assertEquals(" - [taskAppId=TASK-79-4084-15210]", taskId);
+    }
+
+    @Test
+    public void getAppIds() {
+       List<String> appIdList =  LoggerUtils.getAppIds("Running job: application_1_1",logger);
+       Assert.assertEquals("application_1_1", appIdList.get(0));
+
+    }
+}
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtilTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java
similarity index 83%
rename from dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtilTest.java
rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java
index 2e5bfcf3e5..03880b69cc 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/SensitiveLogUtilTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.utils;
+package org.apache.dolphinscheduler.common.utils;
 
 
 import org.apache.dolphinscheduler.common.Constants;
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 
-public class SensitiveLogUtilTest {
+public class SensitiveLogUtilsTest {
 
     @Test
     public void testMaskDataSourcePwd() {
@@ -30,8 +30,8 @@ public class SensitiveLogUtilTest {
         String password = "123456";
         String emptyPassword = "";
 
-        Assert.assertEquals(Constants.PASSWORD_DEFAULT, SensitiveLogUtil.maskDataSourcePwd(password));
-        Assert.assertEquals("", SensitiveLogUtil.maskDataSourcePwd(emptyPassword));
+        Assert.assertEquals(Constants.PASSWORD_DEFAULT, SensitiveLogUtils.maskDataSourcePwd(password));
+        Assert.assertEquals("", SensitiveLogUtils.maskDataSourcePwd(emptyPassword));
 
     }
 }
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 0b621a9bb0..fd0a08cd8e 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
@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.server.utils;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.utils.CommonUtils;
+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.dao.entity.TaskInstance;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java
index 5f66c3477d..f179d6344a 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java
@@ -35,8 +35,8 @@ import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.dao.permission.PermissionCheck;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
-import org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.log.TaskLogDiscriminator;
 import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
 import org.apache.dolphinscheduler.server.worker.task.TaskManager;
 import org.apache.dolphinscheduler.server.worker.task.TaskProps;
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 8774186bc5..0c62f0648a 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
@@ -23,7 +23,7 @@ import org.apache.dolphinscheduler.common.utils.HadoopUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 import org.apache.dolphinscheduler.server.utils.ProcessUtils;
 import org.slf4j.Logger;
 
diff --git a/dolphinscheduler-server/src/main/resources/master_logback.xml b/dolphinscheduler-server/src/main/resources/master_logback.xml
deleted file mode 100644
index 54c3cf5781..0000000000
--- a/dolphinscheduler-server/src/main/resources/master_logback.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.
-  -->
-
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<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="MASTERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.base}/dolphinscheduler-master.log</file>
-		<filter class="org.apache.dolphinscheduler.server.master.log.MasterLogFilter">
-			<level>INFO</level>
-		</filter>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.base}/dolphinscheduler-master.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-			<maxHistory>168</maxHistory>
-			<maxFileSize>200MB</maxFileSize>
-		</rollingPolicy>
-		<encoder>
-			<pattern>
-				[%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-			</pattern>
-			<charset>UTF-8</charset>
-		</encoder>
-	</appender>
-
-	<root level="INFO">
-		<appender-ref ref="MASTERLOGFILE"/>
-	</root>
-</configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/main/resources/worker_logback.xml b/dolphinscheduler-server/src/main/resources/worker_logback.xml
deleted file mode 100644
index 7ba0c9b8ab..0000000000
--- a/dolphinscheduler-server/src/main/resources/worker_logback.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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.
-  -->
-
-<!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
-<configuration scan="true" scanPeriod="120 seconds">
-    <conversionRule conversionWord="msg"
-                    converterClass="org.apache.dolphinscheduler.server.worker.log.SensitiveDataConverter"/>
-    <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="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.TaskLogFilter"/>
-        <Discriminator class="org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator">
-            <key>taskAppId</key>
-            <logBase>${log.base}</logBase>
-        </Discriminator>
-        <sift>
-            <appender name="FILE-${taskAppId}" class="ch.qos.logback.core.FileAppender">
-                <file>${log.base}/${taskAppId}.log</file>
-                <encoder>
-                    <pattern>
-                        [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-                    </pattern>
-                    <charset>UTF-8</charset>
-                </encoder>
-                <append>true</append>
-            </appender>
-        </sift>
-    </appender>
-
-    <appender name="WORKERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.base}/dolphinscheduler-worker.log</file>
-        <filter class="org.apache.dolphinscheduler.server.worker.log.WorkerLogFilter">
-            <level>INFO</level>
-        </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>
-            <maxFileSize>200MB</maxFileSize>
-        </rollingPolicy>
-        　　　　　
-        <encoder>
-            <pattern>
-                [%level] %date{yyyy-MM-dd HH:mm:ss.SSS} %logger{96}:[%line] - %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        　　
-    </appender>
-
-
-    <root level="INFO">
-        <appender-ref ref="TASKLOGFILE"/>
-        <appender-ref ref="WORKERLOGFILE"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverterTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverterTest.java
deleted file mode 100644
index fb564a22fb..0000000000
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverterTest.java
+++ /dev/null
@@ -1,92 +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.server.worker.log;
-
-
-import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.server.utils.SensitiveLogUtil;
-import org.junit.Assert;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SensitiveDataConverterTest {
-
-    private final Logger logger = LoggerFactory.getLogger(SensitiveDataConverterTest.class);
-
-    /**
-     * password pattern
-     */
-    private final Pattern pwdPattern = Pattern.compile(Constants.DATASOURCE_PASSWORD_REGEX);
-
-
-    /**
-     * mask sensitive logMsg - sql task datasource password
-     */
-    @Test
-    public void testPwdLogMsgConverter() {
-
-        String logMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
-                "\"database\":\"carbond\"," +
-                "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
-                "\"user\":\"view\"," +
-                "\"password\":\"view1\"}";
-
-        String maskLogMsg = "{\"address\":\"jdbc:mysql://192.168.xx.xx:3306\"," +
-                "\"database\":\"carbond\"," +
-                "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\"," +
-                "\"user\":\"view\"," +
-                "\"password\":\"******\"}";
-
-
-        logger.info("parameter : {}", logMsg);
-        logger.info("parameter : {}", passwordHandler(pwdPattern, logMsg));
-
-        Assert.assertNotEquals(logMsg, passwordHandler(pwdPattern, logMsg));
-        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
-
-    }
-
-    /**
-     * password regex test
-     *
-     * @param logMsg original log
-     */
-    private static String passwordHandler(Pattern pattern, String logMsg) {
-
-        Matcher matcher = pattern.matcher(logMsg);
-
-        StringBuffer sb = new StringBuffer(logMsg.length());
-
-        while (matcher.find()) {
-
-            String password = matcher.group();
-
-            String maskPassword = SensitiveLogUtil.maskDataSourcePwd(password);
-
-            matcher.appendReplacement(sb, maskPassword);
-        }
-        matcher.appendTail(sb);
-
-        return sb.toString();
-    }
-
-
-}
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java
index 1117fe0015..04c844827f 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java
@@ -23,7 +23,7 @@ import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;
 import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
 import org.apache.dolphinscheduler.server.worker.task.TaskManager;
 import org.apache.dolphinscheduler.server.worker.task.TaskProps;
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java
index 7cf4b874d1..7da3f710b6 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.utils.SpringApplicationContext;
 import org.apache.dolphinscheduler.dao.ProcessDao;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
 import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
 import org.apache.dolphinscheduler.server.worker.task.TaskManager;
 import org.apache.dolphinscheduler.server.worker.task.TaskProps;
diff --git a/pom.xml b/pom.xml
index 0ff2f65f60..59278f73cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -675,6 +675,7 @@
                 <configuration>
                     <includes>
                         <include>**/common/utils/*.java</include>
+                        <include>**/common/log/*.java</include>
                         <include>**/common/threadutils/*.java</include>
                         <include>**/common/graph/*.java</include>
                         <include>**/common/queue/*.java</include>
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
index b3310c384f..d4db103fe1 100644
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -57,16 +57,16 @@ pid=$DOLPHINSCHEDULER_LOG_DIR/dolphinscheduler-$command.pid
 cd $DOLPHINSCHEDULER_HOME
 
 if [ "$command" = "api-server" ]; then
-  LOG_FILE="-Dlogging.config=classpath:apiserver_logback.xml -Dspring.profiles.active=api"
+  LOG_FILE="-Dserver=api-server -Dspring.profiles.active=api"
   CLASS=org.apache.dolphinscheduler.api.ApiApplicationServer
 elif [ "$command" = "master-server" ]; then
-  LOG_FILE="-Dlogging.config=classpath:master_logback.xml -Ddruid.mysql.usePingMethod=false"
+  LOG_FILE="-Dserver=master-server -Ddruid.mysql.usePingMethod=false"
   CLASS=org.apache.dolphinscheduler.server.master.MasterServer
 elif [ "$command" = "worker-server" ]; then
-  LOG_FILE="-Dlogging.config=classpath:worker_logback.xml -Ddruid.mysql.usePingMethod=false"
+  LOG_FILE="-Dserver=worker-server -Ddruid.mysql.usePingMethod=false"
   CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer
 elif [ "$command" = "alert-server" ]; then
-  LOG_FILE="-Dlogback.configurationFile=conf/alert_logback.xml"
+  LOG_FILE="-Dserver=alert-server"
   CLASS=org.apache.dolphinscheduler.alert.AlertServer
 elif [ "$command" = "logger-server" ]; then
   CLASS=org.apache.dolphinscheduler.server.rpc.LoggerServer
@@ -93,8 +93,8 @@ case $startStop in
 
     exec_command="$LOG_FILE $DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS"
 
-    echo "nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 < /dev/null &"
-    nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 < /dev/null &
+    echo "nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 > /dev/null &"
+    nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 > /dev/null &
     echo $! > $pid
     ;;
 

From 18750dfc0881180a068edb92a5fbde6d66ac6ef6 Mon Sep 17 00:00:00 2001
From: dailidong <dailidong66@gmail.com>
Date: Thu, 6 Feb 2020 18:52:44 +0800
Subject: [PATCH 26/35] remove jasper-runtime jar, not need anymore (#1900)

* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

* combine logback config of master/worker/alert/api server to one logback.xml

* remove tomcat runtime jar

* add UT

* add license

* remove jasper-runtime jar, not need anymore

Co-authored-by: DS <escheduler@outlook.com>
---
 dolphinscheduler-api/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index fd56fb8d9f..bac74da0b0 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -27,10 +27,6 @@
   <name>${project.artifactId}</name>
   <packaging>jar</packaging>
 
-  <properties>
-    <jasper-runtime.version>5.5.23</jasper-runtime.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.dolphinscheduler</groupId>
@@ -182,12 +178,6 @@
       <artifactId>hadoop-aws</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>${jasper-runtime.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

From b3b075d9157fc865cc8a090a8f31142bdfa8223f Mon Sep 17 00:00:00 2001
From: Jave-Chen <acc4hf@126.com>
Date: Thu, 6 Feb 2020 19:32:31 +0800
Subject: [PATCH 27/35]  Fix bug: Use try-with-resources or close this
 "Statement" in a "finally" clause. (#1702)

* #1701  Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause.

* fix some indent

* refix code smell
---
 .../common/utils/ScriptRunner.java            | 152 ++++++++----------
 1 file changed, 65 insertions(+), 87 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java
index 529052c7cf..bbc937c89f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java
@@ -16,13 +16,17 @@
  */
 package org.apache.dolphinscheduler.common.utils;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.Reader;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * Slightly modified version of the com.ibatis.common.jdbc.ScriptRunner class
@@ -94,9 +98,7 @@ public class ScriptRunner {
 			} finally {
 				connection.setAutoCommit(originalAutoCommit);
 			}
-		} catch (IOException e) {
-			throw e;
-		} catch (SQLException e) {
+		} catch (IOException | SQLException e) {
 			throw e;
 		} catch (Exception e) {
 			throw new RuntimeException("Error running script.  Cause: " + e, e);
@@ -114,9 +116,7 @@ public class ScriptRunner {
 			} finally {
 				connection.setAutoCommit(originalAutoCommit);
 			}
-		} catch (IOException e) {
-			throw e;
-		} catch (SQLException e) {
+		} catch (IOException | SQLException e) {
 			throw e;
 		} catch (Exception e) {
 			throw new RuntimeException("Error running script.  Cause: " + e, e);
@@ -161,44 +161,34 @@ public class ScriptRunner {
 						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
 					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
 					command.append(" ");
-					Statement statement = conn.createStatement();
-					boolean hasResults = false;
-					logger.info("sql:"+command.toString());
-					if (stopOnError) {
-						hasResults = statement.execute(command.toString());
-					} else {
-						try {
-							statement.execute(command.toString());
-						} catch (SQLException e) {
-							logger.error(e.getMessage(),e);
-							throw e;
-						}
-					}
-
-					ResultSet rs = statement.getResultSet();
-					if (hasResults && rs != null) {
-						ResultSetMetaData md = rs.getMetaData();
-						int cols = md.getColumnCount();
-						for (int i = 0; i < cols; i++) {
-							String name = md.getColumnLabel(i);
-							logger.info(name + "\t");
-						}
-						logger.info("");
-						while (rs.next()) {
-							for (int i = 0; i < cols; i++) {
-								String value = rs.getString(i);
-								logger.info(value + "\t");
-							}
-							logger.info("");
-						}
-					}
+                    logger.info("sql: {}", command);
 
+                    try (Statement statement = conn.createStatement()) {
+                        statement.execute(command.toString());
+                        try (ResultSet rs = statement.getResultSet()) {
+                            if (stopOnError && rs != null) {
+                                ResultSetMetaData md = rs.getMetaData();
+                                int cols = md.getColumnCount();
+                                for (int i = 0; i < cols; i++) {
+                                    String name = md.getColumnLabel(i);
+                                    logger.info("{} \t", name);
+                                }
+                                logger.info("");
+                                while (rs.next()) {
+                                    for (int i = 0; i < cols; i++) {
+                                        String value = rs.getString(i);
+                                        logger.info("{} \t", value);
+                                    }
+                                    logger.info("");
+                                }
+                            }
+                        }   
+                    } catch (SQLException e) {
+                        logger.error("SQLException", e);
+                        throw e;
+                    }
+                    
 					command = null;
-					try {
-						statement.close();
-					} catch (Exception e) {
-						// Ignore to workaround a bug in Jakarta DBCP
-					}
 					Thread.yield();
 				} else {
 					command.append(line);
@@ -207,11 +197,11 @@ public class ScriptRunner {
 			}
 
 		} catch (SQLException e) {
-			logger.error("Error executing: " + command.toString());
+			logger.error("Error executing: {}", command);
 			throw e;
 		} catch (IOException e) {
 			e.fillInStackTrace();
-			logger.error("Error executing: " + command.toString());
+			logger.error("Error executing: {}", command);
 			throw e;
 		}
 	}
@@ -243,46 +233,35 @@ public class ScriptRunner {
 						|| fullLineDelimiter && trimmedLine.equals(getDelimiter())) {
 					command.append(line.substring(0, line.lastIndexOf(getDelimiter())));
 					command.append(" ");
-					Statement statement = conn.createStatement();
-
 					sql = command.toString().replaceAll("\\{\\{APPDB\\}\\}", dbName);
-					boolean hasResults = false;
-					logger.info("sql : " + sql);
-					if (stopOnError) {
-						hasResults = statement.execute(sql);
-					} else {
-						try {
-							statement.execute(sql);
-						} catch (SQLException e) {
-							logger.error(e.getMessage(),e);
-							throw e;
-						}
-					}
-
-					ResultSet rs = statement.getResultSet();
-					if (hasResults && rs != null) {
-						ResultSetMetaData md = rs.getMetaData();
-						int cols = md.getColumnCount();
-						for (int i = 0; i < cols; i++) {
-							String name = md.getColumnLabel(i);
-							logger.info(name + "\t");
-						}
-						logger.info("");
-						while (rs.next()) {
-							for (int i = 0; i < cols; i++) {
-								String value = rs.getString(i);
-								logger.info(value + "\t");
-							}
-							logger.info("");
-						}
-					}
+                    logger.info("sql : {}", sql);
+                    
+                    try (Statement statement = conn.createStatement()) {
+                        statement.execute(sql);
+                        try (ResultSet rs = statement.getResultSet()) {
+                            if (stopOnError && rs != null) {
+                                ResultSetMetaData md = rs.getMetaData();
+                                int cols = md.getColumnCount();
+                                for (int i = 0; i < cols; i++) {
+                                    String name = md.getColumnLabel(i);
+                                    logger.info("{} \t", name);
+                                }
+                                logger.info("");
+                                while (rs.next()) {
+                                    for (int i = 0; i < cols; i++) {
+                                        String value = rs.getString(i);
+                                        logger.info("{} \t", value);
+                                    }
+                                    logger.info("");
+                                }
+                            }
+                        }   
+                    } catch (SQLException e) {
+                        logger.error("SQLException", e);
+                        throw e;
+                    }
 
 					command = null;
-					try {
-						statement.close();
-					} catch (Exception e) {
-						// Ignore to workaround a bug in Jakarta DBCP
-					}
 					Thread.yield();
 				} else {
 					command.append(line);
@@ -291,11 +270,10 @@ public class ScriptRunner {
 			}
 
 		} catch (SQLException e) {
-			logger.error("Error executing: " + sql);
 			throw e;
 		} catch (IOException e) {
 			e.fillInStackTrace();
-			logger.error("Error executing: " + sql);
+			logger.error("Error executing: {}", sql);
 			throw e;
 		}
 	}

From 662233e0dd5b09d6099bddeeb8d5812dac05ab19 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 10:15:42 +0800
Subject: [PATCH 28/35] =?UTF-8?q?Remove=20ScheduleUtil=EF=BC=8Cuse=20the?=
 =?UTF-8?q?=20existing=20CronUtils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CronUtils is a public quartz tools, then the project dolphinscheduler-api can remove dolphinscheduler-server
---
 dolphinscheduler-api/pom.xml                  |  4 -
 .../api/service/ExecutorService.java          | 14 +++-
 .../master/runner/MasterExecThread.java       | 15 +++-
 .../server/utils/ScheduleUtils.java           | 79 -------------------
 .../server/utils/ScheduleUtilsTest.java       | 44 -----------
 pom.xml                                       |  1 -
 6 files changed, 23 insertions(+), 134 deletions(-)
 delete mode 100644 dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ScheduleUtils.java
 delete mode 100644 dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ScheduleUtilsTest.java

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index bac74da0b0..c10f443384 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -43,10 +43,6 @@
       <groupId>org.apache.dolphinscheduler</groupId>
       <artifactId>dolphinscheduler-dao</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.dolphinscheduler</groupId>
-      <artifactId>dolphinscheduler-server</artifactId>
-    </dependency>
 
     <!--springboot-->
     <dependency>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index c1689c5bec..7c0a8637ad 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -30,7 +30,8 @@ import org.apache.dolphinscheduler.dao.entity.*;
 import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
-import org.apache.dolphinscheduler.server.utils.ScheduleUtils;
+import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
+import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -512,8 +513,15 @@ public class ExecutorService extends BaseService{
                     List<Date> listDate = new LinkedList<>();
                     if(!CollectionUtils.isEmpty(schedules)){
                         for (Schedule item : schedules) {
-                            List<Date> list = ScheduleUtils.getRecentTriggerTime(item.getCrontab(), start, end);
-                            listDate.addAll(list);
+                            CronExpression cronExpression = null;
+                            try {
+                                cronExpression = CronUtils.parse2CronExpression(item.getCrontab());
+                                List<Date> list = CronUtils.getSelfFireDateList(start, end, cronExpression);
+                                listDate.addAll(list);
+                            } catch (ParseException e) {
+                                logger.error(e.getMessage(), e);
+                                continue;
+                            }
                         }
                     }
                     if(!CollectionUtils.isEmpty(listDate)){
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 2d0e99a867..1e876239de 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -33,14 +33,16 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.Schedule;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.dao.utils.DagHelper;
+import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.server.utils.AlertManager;
-import org.apache.dolphinscheduler.server.utils.ScheduleUtils;
+import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -213,8 +215,15 @@ public class MasterExecThread implements Runnable {
         List<Date> listDate = Lists.newLinkedList();
         if(!CollectionUtils.isEmpty(schedules)){
             for (Schedule schedule : schedules) {
-                List<Date> list = ScheduleUtils.getRecentTriggerTime(schedule.getCrontab(), startDate, endDate);
-                listDate.addAll(list);
+                CronExpression cronExpression = null;
+                try {
+                    cronExpression = CronUtils.parse2CronExpression(schedule.getCrontab());
+                    List<Date> list = CronUtils.getSelfFireDateList(startDate, endDate, cronExpression);
+                    listDate.addAll(list);
+                } catch (ParseException e) {
+                    logger.error(e.getMessage(), e);
+                    continue;
+                }
             }
         }
         // get first fire date
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ScheduleUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ScheduleUtils.java
deleted file mode 100644
index 11730b9545..0000000000
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ScheduleUtils.java
+++ /dev/null
@@ -1,79 +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.server.utils;
-
-import org.quartz.impl.triggers.CronTriggerImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.ParseException;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * ScheduleUtils
- */
-public class ScheduleUtils {
-
-    private static final Logger logger = LoggerFactory.getLogger(ScheduleUtils.class);
-
-    /**
-     * Get the execution time of the time interval
-     * @param cron
-     * @param from
-     * @param to
-     * @return
-     */
-    public static List<Date> getRecentTriggerTime(String cron, Date from, Date to) {
-        return getRecentTriggerTime(cron, Integer.MAX_VALUE, from, to);
-    }
-
-    /**
-     * Get the execution time of the time interval
-     * @param cron
-     * @param size
-     * @param from
-     * @param to
-     * @return
-     */
-    public static List<Date> getRecentTriggerTime(String cron, int size, Date from, Date to) {
-        List list = new LinkedList<Date>();
-        if(to.before(from)){
-            logger.error("schedule date from:{} must before date to:{}!", from, to);
-            return list;
-        }
-        try {
-            CronTriggerImpl trigger = new CronTriggerImpl();
-            trigger.setCronExpression(cron);
-            trigger.setStartTime(from);
-            trigger.setEndTime(to);
-            trigger.computeFirstFireTime(null);
-            for (int i = 0; i < size; i++) {
-                Date schedule = trigger.getNextFireTime();
-                if(null == schedule){
-                    break;
-                }
-                list.add(schedule);
-                trigger.triggered(null);
-            }
-        } catch (ParseException e) {
-            logger.error("cron:{} error:{}", cron, e.getMessage());
-        }
-        return java.util.Collections.unmodifiableList(list);
-    }
-}
\ No newline at end of file
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ScheduleUtilsTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ScheduleUtilsTest.java
deleted file mode 100644
index 4fbbdab70f..0000000000
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ScheduleUtilsTest.java
+++ /dev/null
@@ -1,44 +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.server.utils;
-
-import org.apache.dolphinscheduler.common.utils.DateUtils;
-import org.junit.Test;
-import java.util.Date;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test ScheduleUtils
- */
-public class ScheduleUtilsTest {
-
-    /**
-     * Test the getRecentTriggerTime method
-     */
-    @Test
-    public void testGetRecentTriggerTime() {
-        Date from = DateUtils.stringToDate("2020-01-01 00:00:00");
-        Date to = DateUtils.stringToDate("2020-01-31 01:00:00");
-        // test date
-        assertEquals(0, ScheduleUtils.getRecentTriggerTime("0 0 0 * * ? ", to, from).size());
-        // test error cron
-        assertEquals(0, ScheduleUtils.getRecentTriggerTime("0 0 0 * *", from, to).size());
-        // test cron
-        assertEquals(31, ScheduleUtils.getRecentTriggerTime("0 0 0 * * ? ", from, to).size());
-    }
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 59278f73cd..d1141eed96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,6 @@
                         <include>**/server/utils/SparkArgsUtilsTest.java</include>
                         <include>**/server/utils/FlinkArgsUtilsTest.java</include>
                         <include>**/server/utils/ParamUtilsTest.java</include>
-                        <include>**/server/utils/ScheduleUtilsTest.java</include>
                         <include>**/server/master/MasterExecThreadTest.java</include>
                         <include>**/dao/mapper/AccessTokenMapperTest.java</include>
                         <include>**/dao/mapper/AlertGroupMapperTest.java</include>

From 9d944d3f76dafb421f352e0afaa88312f9321ec8 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 15:47:07 +0800
Subject: [PATCH 29/35] Optimize duplicate code

Use public methods to simplify duplicate code
---
 .../api/service/ExecutorService.java            | 11 +----------
 .../dao/utils/cron/CronUtils.java               | 17 +++++++++++++++++
 .../server/master/runner/MasterExecThread.java  | 12 +-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 7c0a8637ad..257f15d580 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -31,7 +31,6 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
-import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -513,15 +512,7 @@ public class ExecutorService extends BaseService{
                     List<Date> listDate = new LinkedList<>();
                     if(!CollectionUtils.isEmpty(schedules)){
                         for (Schedule item : schedules) {
-                            CronExpression cronExpression = null;
-                            try {
-                                cronExpression = CronUtils.parse2CronExpression(item.getCrontab());
-                                List<Date> list = CronUtils.getSelfFireDateList(start, end, cronExpression);
-                                listDate.addAll(list);
-                            } catch (ParseException e) {
-                                logger.error(e.getMessage(), e);
-                                continue;
-                            }
+                            listDate.addAll(CronUtils.getSelfFireDateList(start, end, item.getCrontab()));
                         }
                     }
                     if(!CollectionUtils.isEmpty(listDate)){
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
index 8649462110..fc5681356d 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
@@ -156,6 +156,23 @@ public class CronUtils {
     return dateList;
   }
 
+  /**
+   * gets all scheduled times for a period of time based on self dependency
+   * @param startTime startTime
+   * @param endTime endTime
+   * @param cron cron
+   * @return date list
+   */
+  public static List<Date> getSelfFireDateList(Date startTime, Date endTime, String cron) {
+    CronExpression cronExpression = null;
+    try {
+      cronExpression = CronUtils.parse2CronExpression(cron);
+    }catch (ParseException e){
+      logger.error(e.getMessage(), e);
+      return Collections.EMPTY_LIST;
+    }
+    return getSelfFireDateList(startTime, endTime, cronExpression);
+  }
 
   /**
    * get expiration time
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 1e876239de..2b1ff4d23f 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -36,13 +36,11 @@ import org.apache.dolphinscheduler.dao.utils.DagHelper;
 import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.server.utils.AlertManager;
-import org.quartz.CronExpression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -215,15 +213,7 @@ public class MasterExecThread implements Runnable {
         List<Date> listDate = Lists.newLinkedList();
         if(!CollectionUtils.isEmpty(schedules)){
             for (Schedule schedule : schedules) {
-                CronExpression cronExpression = null;
-                try {
-                    cronExpression = CronUtils.parse2CronExpression(schedule.getCrontab());
-                    List<Date> list = CronUtils.getSelfFireDateList(startDate, endDate, cronExpression);
-                    listDate.addAll(list);
-                } catch (ParseException e) {
-                    logger.error(e.getMessage(), e);
-                    continue;
-                }
+                listDate.addAll(CronUtils.getSelfFireDateList(startDate, endDate, schedule.getCrontab()));
             }
         }
         // get first fire date

From fccbcc8d7df592cc591568f6e7b328abdbce7602 Mon Sep 17 00:00:00 2001
From: Rubik <39549317+wenhemin@users.noreply.github.com>
Date: Fri, 7 Feb 2020 16:13:50 +0800
Subject: [PATCH 30/35] fix: The constructor has passed in an taskAppId, no
 need to get from taskAppId. (#1906)

---
 .../server/worker/task/AbstractCommandExecutor.java            | 3 ---
 1 file changed, 3 deletions(-)

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 0c62f0648a..04098215dd 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
@@ -147,9 +147,6 @@ public abstract class AbstractCommandExecutor {
             // get process id
             int pid = getProcessId(process);
 
-            // task instance id
-            int taskInstId = Integer.parseInt(taskAppId.split("_")[2]);
-
             processDao.updatePidByTaskInstId(taskInstId, pid, "");
 
             logger.info("process start, process id is: {}", pid);

From a09d2d9d0a49127f0c7ba7eb86cef54ca5928d81 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 16:43:24 +0800
Subject: [PATCH 31/35] add CronUtils ut

---
 .../dao/utils/cron/CronUtils.java                 |  2 +-
 .../dolphinscheduler/dao/cron/CronUtilsTest.java  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
index fc5681356d..8a9087a33c 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java
@@ -166,7 +166,7 @@ public class CronUtils {
   public static List<Date> getSelfFireDateList(Date startTime, Date endTime, String cron) {
     CronExpression cronExpression = null;
     try {
-      cronExpression = CronUtils.parse2CronExpression(cron);
+      cronExpression = parse2CronExpression(cron);
     }catch (ParseException e){
       logger.error(e.getMessage(), e);
       return Collections.EMPTY_LIST;
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
index c375143d7b..05ebde9c0f 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.dao.cron;
 
 import org.apache.dolphinscheduler.common.enums.CycleEnum;
+import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;
 import com.cronutils.builder.CronBuilder;
 import com.cronutils.model.Cron;
@@ -31,6 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.ParseException;
+import java.util.Date;
 
 import static com.cronutils.model.field.expression.FieldExpressionFactory.*;
 
@@ -180,4 +182,17 @@ public class CronUtilsTest {
             }
         }
     }
+
+
+    @Test
+    public void test3(){
+        Date from = DateUtils.stringToDate("2020-01-01 00:00:00");
+        Date to = DateUtils.stringToDate("2020-01-31 01:00:00");
+        // test date
+        Assert.assertEquals(0, CronUtils.getSelfFireDateList(to, from, "0 0 0 * * ? ").size());
+        // test error cron
+        Assert.assertEquals(0, CronUtils.getSelfFireDateList(from, to, "0 0 0 * *").size());
+        // test cron
+        Assert.assertEquals(30, CronUtils.getSelfFireDateList(from, to, "0 0 0 * * ? ").size());
+    }
 }

From 515255b9199eecb944b498a1506b0c1b5ff65563 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 17:18:27 +0800
Subject: [PATCH 32/35] ut

---
 .../dolphinscheduler/server/master/MasterExecThreadTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterExecThreadTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterExecThreadTest.java
index 6f31e66213..d7c3de13a5 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterExecThreadTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterExecThreadTest.java
@@ -134,7 +134,7 @@ public class MasterExecThreadTest {
             method.setAccessible(true);
             method.invoke(masterExecThread);
             // one create save, and 15(1 to 31 step 2) for next save, and last day 31 no save
-            verify(processDao, times(16)).saveProcessInstance(processInstance);
+            verify(processDao, times(15)).saveProcessInstance(processInstance);
         }catch (Exception e){
             Assert.assertTrue(false);
         }

From 61593cfe6b2a36a287b9e6a60ec3aba516e953e4 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 17:35:12 +0800
Subject: [PATCH 33/35] ut change

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

diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
index b4f3e7e31f..66c7a3ebab 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
@@ -203,7 +203,7 @@ public class ExecutorService2Test {
                     "", "", RunMode.RUN_MODE_PARALLEL,
                     Priority.LOW, 0, 110);
             Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
-            verify(processDao, times(16)).createCommand(any(Command.class));
+            verify(processDao, times(15)).createCommand(any(Command.class));
         }catch (Exception e){
             Assert.assertTrue(false);
         }

From 6b586f31fc0416f72363db31039c7d41c4500cbd Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 18:34:38 +0800
Subject: [PATCH 34/35] =?UTF-8?q?pom=20add=20ut=EF=BC=8C=20add=20cronutils?=
 =?UTF-8?q?=20ut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/cron/CronUtilsTest.java               | 36 ++++++++++++++++---
 pom.xml                                       |  1 +
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
index 05ebde9c0f..8cf1b6eaf3 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
@@ -70,9 +70,9 @@ public class CronUtilsTest {
     @Test
     public void testCronParse() throws ParseException {
         String strCrontab = "0 1 2 3 * ? *";
-        strCrontab = "0/50 0/59 * * * ? *";
-        strCrontab = "3/5 * 0/5 * * ? *";
-        strCrontab = "1/5 3/5 1/5 3/30 * ? *";
+//        strCrontab = "0/50 0/59 * * * ? *";
+//        strCrontab = "3/5 * 0/5 * * ? *";
+//        strCrontab = "1/5 3/5 1/5 3/30 * ? *";
 
         Cron depCron = CronUtils.parse2Cron(strCrontab);
         Assert.assertEquals(depCron.retrieve(CronFieldName.SECOND).getExpression().asString(), "0");
@@ -90,11 +90,14 @@ public class CronUtilsTest {
     @Test
     public void testScheduleType() throws ParseException {
 
-        CycleEnum cycleEnum = CronUtils.getMaxCycle("0 */1 * * * ? *");
+        CycleEnum cycleEnum = CronUtils.getMaxCycle(CronUtils.parse2Cron("0 */1 * * * ? *"));
         Assert.assertEquals(cycleEnum.name(), "MINUTE");
 
         CycleEnum cycleEnum2 = CronUtils.getMaxCycle("0 * * * * ? *");
         Assert.assertEquals(cycleEnum2.name(), "MINUTE");
+
+        CycleEnum cycleEnum3 = CronUtils.getMiniCycle(CronUtils.parse2Cron("0 * * * * ? *"));
+        Assert.assertEquals(cycleEnum3.name(), "MINUTE");
     }
 
     /**
@@ -185,7 +188,12 @@ public class CronUtilsTest {
 
 
     @Test
-    public void test3(){
+    public void parse2Cron(){
+
+    }
+
+    @Test
+    public void getSelfFireDateList() throws ParseException{
         Date from = DateUtils.stringToDate("2020-01-01 00:00:00");
         Date to = DateUtils.stringToDate("2020-01-31 01:00:00");
         // test date
@@ -194,5 +202,23 @@ public class CronUtilsTest {
         Assert.assertEquals(0, CronUtils.getSelfFireDateList(from, to, "0 0 0 * *").size());
         // test cron
         Assert.assertEquals(30, CronUtils.getSelfFireDateList(from, to, "0 0 0 * * ? ").size());
+        // test other
+        Assert.assertEquals(30, CronUtils.getFireDateList(from, to, CronUtils.parse2CronExpression("0 0 0 * * ? ")).size());
+        Assert.assertEquals(5, CronUtils.getSelfFireDateList(from, to, CronUtils.parse2CronExpression("0 0 0 * * ? "), 5).size());
+    }
+
+    @Test
+    public void getExpirationTime(){
+        Date startTime = DateUtils.stringToDate("2020-02-07 18:30:00");
+        Date expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.HOUR);
+        Assert.assertEquals("2020-02-07 19:30:00", DateUtils.dateToString(expirationTime));
+        expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.DAY);
+        Assert.assertEquals("2020-02-07 23:59:59", DateUtils.dateToString(expirationTime));
+        expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.WEEK);
+        Assert.assertEquals("2020-02-07 23:59:59", DateUtils.dateToString(expirationTime));
+        expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.MONTH);
+        Assert.assertEquals("2020-02-07 23:59:59", DateUtils.dateToString(expirationTime));
+        expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.YEAR);
+        Assert.assertEquals("2020-02-07 18:30:00", DateUtils.dateToString(expirationTime));
     }
 }
diff --git a/pom.xml b/pom.xml
index d1141eed96..875577c672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -711,6 +711,7 @@
                         <include>**/dao/mapper/AlertGroupMapperTest.java</include>
                         <include>**/dao/mapper/AlertMapperTest.java</include>
                         <include>**/dao/mapper/CommandMapperTest.java</include>
+                        <include>**/dao/cron/CronUtilsTest.java</include>
                         <include>**/alert/template/AlertTemplateFactoryTest.java</include>
                         <include>**/alert/template/impl/DefaultHTMLTemplateTest.java</include>
                         <include>**/server/worker/task/datax/DataxTaskTest.java</include>

From 0eec3b8661adc6153409b8cf2c8674b855c8aa65 Mon Sep 17 00:00:00 2001
From: zhangzy <zhangzy@zenmen.com>
Date: Fri, 7 Feb 2020 19:17:47 +0800
Subject: [PATCH 35/35] Remove useless code

---
 .../dao/cron/CronUtilsTest.java               | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
index 8cf1b6eaf3..1135cf20f5 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java
@@ -37,6 +37,7 @@ import java.util.Date;
 import static com.cronutils.model.field.expression.FieldExpressionFactory.*;
 
 /**
+ * CronUtilsTest
  */
 public class CronUtilsTest {
 
@@ -57,8 +58,9 @@ public class CronUtilsTest {
                 .withSecond(on(0))
                 .instance();
         // Obtain the string expression
-        String cronAsString = cron.asString(); // 0 */5 * * * ? *  Every five minutes(once every 5 minutes)
+        String cronAsString = cron.asString();
 
+        // 0 */5 * * * ? *  Every five minutes(once every 5 minutes)
         Assert.assertEquals(cronAsString, "0 */5 * * * ? *");
     }
 
@@ -70,9 +72,6 @@ public class CronUtilsTest {
     @Test
     public void testCronParse() throws ParseException {
         String strCrontab = "0 1 2 3 * ? *";
-//        strCrontab = "0/50 0/59 * * * ? *";
-//        strCrontab = "3/5 * 0/5 * * ? *";
-//        strCrontab = "1/5 3/5 1/5 3/30 * ? *";
 
         Cron depCron = CronUtils.parse2Cron(strCrontab);
         Assert.assertEquals(depCron.retrieve(CronFieldName.SECOND).getExpression().asString(), "0");
@@ -89,7 +88,6 @@ public class CronUtilsTest {
      */
     @Test
     public void testScheduleType() throws ParseException {
-
         CycleEnum cycleEnum = CronUtils.getMaxCycle(CronUtils.parse2Cron("0 */1 * * * ? *"));
         Assert.assertEquals(cycleEnum.name(), "MINUTE");
 
@@ -114,26 +112,9 @@ public class CronUtilsTest {
                 .withMinute(every(5))
                 .withSecond(on(0))
                 .instance();
-
-        String cronAsString = cron1.asString(); // 0 */5 * * * ? * once every 5 minutes
-        //logger.info(cronAsString);
-        // Obtain the string expression
-        //String minCrontab = "0 0 * * * ? *";
-        //String minCrontab = "0 0 10,14,16 * * ?";
-        //String minCrontab = "0 0-5 14 * * ? *";
-        //String minCrontab = "0 0 2 ? * SUN *";
-        //String minCrontab = "* 0,3 2 SUN * 1#1 *";
-        //String minCrontab = "* 0,3 * 1W * ? *";
-        //cron = CronUtils.parse2Cron("0 * * * * ? *");
-        // month cycle
-        /*String[] cronArayy = new String[]{"* 0,3 * 1W * ? *","* 0 0 1W * ? *",
-                "0 0 0 L 3/5 ? *","0 0 0 ? 3/5 2/2 *"};*/
         // minute cycle
         String[] cronArayy = new String[]{"* * * * * ? *","* 0 * * * ? *",
                 "* 5 * * 3/5 ? *","0 0 * * * ? *"};
-        // week cycle
-        /*String[] cronArayy = new String[]{"* * * ? * 2/1 *","0 *//*5 * ? * 2/1 *",
-                "* * *//*5 ? * 2/1 *"};*/
         for(String minCrontab:cronArayy){
             if (!org.quartz.CronExpression.isValidExpression(minCrontab)) {
                 throw new RuntimeException(minCrontab+" verify failure, cron expression not valid");
@@ -176,7 +157,6 @@ public class CronUtilsTest {
             logger.info("dayOfWeekField instanceof And:"+(dayOfWeekField.getExpression() instanceof And));
             logger.info("dayOfWeekField instanceof QuestionMark:"+(dayOfWeekField.getExpression() instanceof QuestionMark));
 
-
             CycleEnum cycleEnum = CronUtils.getMaxCycle(minCrontab);
             if(cycleEnum !=null){
                 logger.info(cycleEnum.name());
@@ -186,22 +166,16 @@ public class CronUtilsTest {
         }
     }
 
-
-    @Test
-    public void parse2Cron(){
-
-    }
-
     @Test
     public void getSelfFireDateList() throws ParseException{
         Date from = DateUtils.stringToDate("2020-01-01 00:00:00");
-        Date to = DateUtils.stringToDate("2020-01-31 01:00:00");
+        Date to = DateUtils.stringToDate("2020-01-31 00:00:00");
         // test date
         Assert.assertEquals(0, CronUtils.getSelfFireDateList(to, from, "0 0 0 * * ? ").size());
         // test error cron
         Assert.assertEquals(0, CronUtils.getSelfFireDateList(from, to, "0 0 0 * *").size());
         // test cron
-        Assert.assertEquals(30, CronUtils.getSelfFireDateList(from, to, "0 0 0 * * ? ").size());
+        Assert.assertEquals(29, CronUtils.getSelfFireDateList(from, to, "0 0 0 * * ? ").size());
         // test other
         Assert.assertEquals(30, CronUtils.getFireDateList(from, to, CronUtils.parse2CronExpression("0 0 0 * * ? ")).size());
         Assert.assertEquals(5, CronUtils.getSelfFireDateList(from, to, CronUtils.parse2CronExpression("0 0 0 * * ? "), 5).size());
@@ -221,4 +195,4 @@ public class CronUtilsTest {
         expirationTime = CronUtils.getExpirationTime(startTime, CycleEnum.YEAR);
         Assert.assertEquals("2020-02-07 18:30:00", DateUtils.dateToString(expirationTime));
     }
-}
+}
\ No newline at end of file