Merge pull request #7 from apache/dev

update

docker/postgres/docker-entrypoint-initdb/init.sql

@@ -234,7 +234,7 @@ CREATE TABLE t_ds_command (
   dependence varchar(255) DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64),
   PRIMARY KEY (id)
 ) ;
 
@@ -275,7 +275,7 @@ CREATE TABLE t_ds_error_command (
   update_time timestamp DEFAULT NULL ,
   dependence text ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64),
   message text ,
   PRIMARY KEY (id)
 );
@@ -748,7 +748,7 @@ CREATE SEQUENCE  t_ds_worker_server_id_sequence;
 ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_server_id_sequence');
 
 
--- Records of t_ds_user，user : admin , password : dolphinscheduler123
+-- Records of t_ds_user?user : admin , password : dolphinscheduler123
 INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
 
 -- Records of t_ds_alertgroup，dolphinscheduler warning group

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactory.java

@@ -17,9 +17,6 @@
 package org.apache.dolphinscheduler.alert.template;
 
 import org.apache.dolphinscheduler.alert.template.impl.DefaultHTMLTemplate;
-import org.apache.dolphinscheduler.alert.utils.Constants;
-import org.apache.dolphinscheduler.alert.utils.PropertyUtils;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,8 +27,6 @@ public class AlertTemplateFactory {
 
     private static final Logger logger = LoggerFactory.getLogger(AlertTemplateFactory.class);
 
-    private static final String alertTemplate = PropertyUtils.getString(Constants.ALERT_TEMPLATE);
-
     private AlertTemplateFactory(){}
 
     /**
@@ -39,16 +34,6 @@ public class AlertTemplateFactory {
      * @return a template, default is DefaultHTMLTemplate
      */
     public static AlertTemplate getMessageTemplate() {
-
-        if(StringUtils.isEmpty(alertTemplate)){
-            return new DefaultHTMLTemplate();
-        }
-
-        switch (alertTemplate){
-            case "html":
         return new DefaultHTMLTemplate();
-            default:
-                throw new IllegalArgumentException(String.format("not support alert template: %s",alertTemplate));
-        }
     }
 }

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java

@@ -77,8 +77,6 @@ public class Constants {
 
     public static final int NUMBER_1000 = 1000;
 
-    public static final String ALERT_TEMPLATE = "alert.template";
-
     public static final String SPRING_DATASOURCE_DRIVER_CLASS_NAME = "spring.datasource.driver-class-name";
 
     public static final String SPRING_DATASOURCE_URL = "spring.datasource.url";

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java

@@ -48,7 +48,7 @@ public class EnterpriseWeChatUtils {
     private static final String ENTERPRISE_WE_CHAT_SECRET = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_SECRET);
 
     private static final String ENTERPRISE_WE_CHAT_TOKEN_URL = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_TOKEN_URL);
-    private static final String ENTERPRISE_WE_CHAT_TOKEN_URL_REPLACE = ENTERPRISE_WE_CHAT_TOKEN_URL
+    private static final String ENTERPRISE_WE_CHAT_TOKEN_URL_REPLACE = ENTERPRISE_WE_CHAT_TOKEN_URL == null ? null : ENTERPRISE_WE_CHAT_TOKEN_URL
             .replaceAll("\\$corpId", ENTERPRISE_WE_CHAT_CORP_ID)
             .replaceAll("\\$secret", ENTERPRISE_WE_CHAT_SECRET);
 
@@ -266,5 +266,4 @@ public class EnterpriseWeChatUtils {
         return result;
 
     }
-
 }

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java

@@ -260,9 +260,14 @@ public class MailUtils {
         part1.setContent(partContent, Constants.TEXT_HTML_CHARSET_UTF_8);
         // set attach file
         MimeBodyPart part2 = new MimeBodyPart();
+        File file = new File(xlsFilePath + Constants.SINGLE_SLASH +  title + Constants.EXCEL_SUFFIX_XLS);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
         // make excel file
+
         ExcelUtils.genExcelFile(content,title,xlsFilePath);
-        File file = new File(xlsFilePath + Constants.SINGLE_SLASH +  title + Constants.EXCEL_SUFFIX_XLS);
+
         part2.attachFile(file);
         part2.setFileName(MimeUtility.encodeText(title + Constants.EXCEL_SUFFIX_XLS,Constants.UTF_8,"B"));
         // add components to collection

dolphinscheduler-alert/src/main/resources/alert.properties

@@ -18,9 +18,6 @@
 #alert type is EMAIL/SMS
 alert.type=EMAIL
 
-# alter msg template, default is html template
-#alert.template=html
-
 # mail server configuration
 mail.protocol=SMTP
 mail.server.host=xxx.xxx.com

dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/template/AlertTemplateFactoryTest.java

@@ -47,7 +47,6 @@ public class AlertTemplateFactoryTest {
     public void testGetMessageTemplate(){
 
         PowerMockito.mockStatic(PropertyUtils.class);
-        when(PropertyUtils.getString(Constants.ALERT_TEMPLATE)).thenReturn("html");
 
         AlertTemplate defaultTemplate = AlertTemplateFactory.getMessageTemplate();
 

dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java

@@ -17,13 +17,21 @@
 package org.apache.dolphinscheduler.alert.utils;
 
 import com.alibaba.fastjson.JSON;
+import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.enums.ShowType;
+import org.apache.dolphinscheduler.dao.entity.Alert;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collection;
 
 /**
  * Please manually modify the configuration file before testing.
@@ -36,84 +44,211 @@ import java.util.Collection;
  *   enterprise.wechat.agent.id
  *   enterprise.wechat.users
  */
-@Ignore
+@PrepareForTest(PropertyUtils.class)
+@RunWith(PowerMockRunner.class)
 public class EnterpriseWeChatUtilsTest {
 
-    private String agentId = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_AGENT_ID); // app id
+    private static final String toParty = "wwc99134b6fc1edb6";
-    private Collection<String> listUserId = Arrays.asList(PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_USERS).split(","));
+    private static final String enterpriseWechatSecret = "Uuv2KFrkdf7SeKOsTDCpsTkpawXBMNRhFy6VKX5FV";
+    private static final String enterpriseWechatAgentId = "1000004";
+    private static final String enterpriseWechatUsers="LiGang,journey";
+    private static final String msg = "hello world";
+
 
-    // Please change
-    private String partyId = "2";
-    private Collection<String> listPartyId = Arrays.asList("2","4");
     @Test
-    public void testSendSingleTeamWeChat() {
+    public void testIsEnable(){
-        try {
+        PowerMockito.mockStatic(PropertyUtils.class);
-            String token = EnterpriseWeChatUtils.getToken();
+        Mockito.when(PropertyUtils.getBoolean(Constants.ENTERPRISE_WECHAT_ENABLE)).thenReturn(true);
-            String msg = EnterpriseWeChatUtils.makeTeamSendMsg(partyId, agentId, "hello world");
+        Boolean weChartEnable = EnterpriseWeChatUtils.isEnable();
-            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+        Assert.assertTrue(weChartEnable);
-
-            String errmsg = JSON.parseObject(resp).getString("errmsg");
-            Assert.assertEquals("ok",errmsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
+
     @Test
-    public void testSendMultiTeamWeChat() {
+    public void testMakeTeamSendMsg1(){
+        String sendMsg = EnterpriseWeChatUtils.makeTeamSendMsg(toParty, enterpriseWechatSecret, msg);
+        Assert.assertTrue(sendMsg.contains(toParty));
+        Assert.assertTrue(sendMsg.contains(enterpriseWechatSecret));
+        Assert.assertTrue(sendMsg.contains(msg));
+
+    }
 
-        try {
-            String token = EnterpriseWeChatUtils.getToken();
-            String msg = EnterpriseWeChatUtils.makeTeamSendMsg(listPartyId, agentId, "hello world");
-            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
 
-            String errmsg = JSON.parseObject(resp).getString("errmsg");
+    @Test
-            Assert.assertEquals("ok",errmsg);
+    public void testMakeTeamSendMsg2(){
-        } catch (IOException e) {
+        List<String> parties = new ArrayList<>();
-            e.printStackTrace();
+        parties.add(toParty);
+        parties.add("test1");
+
+        String sendMsg = EnterpriseWeChatUtils.makeTeamSendMsg(parties, enterpriseWechatSecret, msg);
+        Assert.assertTrue(sendMsg.contains(toParty));
+        Assert.assertTrue(sendMsg.contains(enterpriseWechatSecret));
+        Assert.assertTrue(sendMsg.contains(msg));
     }
+
+    @Test
+    public void tesMakeUserSendMsg1(){
+        String sendMsg = EnterpriseWeChatUtils.makeUserSendMsg(enterpriseWechatUsers, enterpriseWechatAgentId, msg);
+        Assert.assertTrue(sendMsg.contains(enterpriseWechatUsers));
+        Assert.assertTrue(sendMsg.contains(enterpriseWechatAgentId));
+        Assert.assertTrue(sendMsg.contains(msg));
     }
 
     @Test
-    public void testSendSingleUserWeChat() {
+    public void tesMakeUserSendMsg2(){
-        try {
+        List<String> users = new ArrayList<>();
-            String token = EnterpriseWeChatUtils.getToken();
+        users.add("user1");
-            String msg = EnterpriseWeChatUtils.makeUserSendMsg(listUserId.stream().findFirst().get(), agentId, "your meeting room has been booked and will be synced to the 'mailbox' later \n" +
+        users.add("user2");
-                    ">**matter details** \n" +
+
-                    ">matter：<font color='info'>meeting</font> <br>" +
+        String sendMsg = EnterpriseWeChatUtils.makeUserSendMsg(users, enterpriseWechatAgentId, msg);
-                    ">organizer：@miglioguan \n" +
+        Assert.assertTrue(sendMsg.contains(users.get(0)));
-                    ">participant：@miglioguan、@kunliu、@jamdeezhou、@kanexiong、@kisonwang \n" +
+        Assert.assertTrue(sendMsg.contains(users.get(1)));
-                    "> \n" +
+        Assert.assertTrue(sendMsg.contains(enterpriseWechatAgentId));
-                    ">meeting room：<font color='info'>Guangzhou TIT 1st Floor 301</font> \n" +
+        Assert.assertTrue(sendMsg.contains(msg));
-                    ">date：<font color='warning'>May 18, 2018</font> \n" +
-                    ">time：<font color='comment'>9:00-11:00 am</font> \n" +
-                    "> \n" +
-                    ">please attend the meeting on time\n" +
-                    "> \n" +
-                    ">to modify the meeting information, please click: [Modify Meeting Information](https://work.weixin.qq.com)\"");
-
-            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
-
-            String errmsg = JSON.parseObject(resp).getString("errmsg");
-            Assert.assertEquals("ok",errmsg);
-        } catch (IOException e) {
-            e.printStackTrace();
     }
+
+    @Test
+    public void testMarkdownByAlertForText(){
+        Alert alertForText = createAlertForText();
+        String result = EnterpriseWeChatUtils.markdownByAlert(alertForText);
+        Assert.assertNotNull(result);
     }
 
     @Test
-    public void testSendMultiUserWeChat() {
+    public void testMarkdownByAlertForTable(){
-        try {
+        Alert alertForText = createAlertForTable();
-            String token = EnterpriseWeChatUtils.getToken();
+        String result = EnterpriseWeChatUtils.markdownByAlert(alertForText);
+        Assert.assertNotNull(result);
+    }
 
-            String msg = EnterpriseWeChatUtils.makeUserSendMsg(listUserId, agentId, "hello world");
+    private Alert createAlertForText(){
-            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+        String content ="[\"id:69\"," +
+                "\"name:UserBehavior-0--1193959466\"," +
+                "\"Job name: Start workflow\"," +
+                "\"State: SUCCESS\"," +
+                "\"Recovery:NO\"," +
+                "\"Run time: 1\"," +
+                "\"Start time: 2018-08-06 10:31:34.0\"," +
+                "\"End time: 2018-08-06 10:31:49.0\"," +
+                "\"Host: 192.168.xx.xx\"," +
+                "\"Notify group :4\"]";
+
+        Alert alert = new Alert();
+        alert.setTitle("Mysql Exception");
+        alert.setShowType(ShowType.TEXT);
+        alert.setContent(content);
+        alert.setAlertType(AlertType.EMAIL);
+        alert.setAlertGroupId(4);
+
+        return alert;
+    }
 
-            String errmsg = JSON.parseObject(resp).getString("errmsg");
+    private String list2String(){
-            Assert.assertEquals("ok",errmsg);
+
-        } catch (IOException e) {
+        LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
-            e.printStackTrace();
+        map1.put("mysql service name","mysql200");
+        map1.put("mysql address","192.168.xx.xx");
+        map1.put("port","3306");
+        map1.put("no index of number","80");
+        map1.put("database client connections","190");
+
+        LinkedHashMap<String, Object> map2 = new LinkedHashMap<>();
+        map2.put("mysql service name","mysql210");
+        map2.put("mysql address","192.168.xx.xx");
+        map2.put("port", "3306");
+        map2.put("no index of number", "10");
+        map2.put("database client connections", "90");
+
+        List<LinkedHashMap<String, Object>> maps = new ArrayList<>();
+        maps.add(0, map1);
+        maps.add(1, map2);
+        String mapjson = JSONUtils.toJsonString(maps);
+        return mapjson;
     }
+
+    private Alert createAlertForTable(){
+        Alert alert = new Alert();
+        alert.setTitle("Mysql Exception");
+        alert.setShowType(ShowType.TABLE);
+        String content= list2String();
+        alert.setContent(content);
+        alert.setAlertType(AlertType.EMAIL);
+        alert.setAlertGroupId(1);
+        return alert;
     }
 
+
+
+
+//    @Test
+//    public void testSendSingleTeamWeChat() {
+//        try {
+//            String token = EnterpriseWeChatUtils.getToken();
+//            String msg = EnterpriseWeChatUtils.makeTeamSendMsg(partyId, agentId, "hello world");
+//            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+//
+//            String errmsg = JSON.parseObject(resp).getString("errmsg");
+//            Assert.assertEquals("ok",errmsg);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    @Test
+//    public void testSendMultiTeamWeChat() {
+//
+//        try {
+//            String token = EnterpriseWeChatUtils.getToken();
+//            String msg = EnterpriseWeChatUtils.makeTeamSendMsg(listPartyId, agentId, "hello world");
+//            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+//
+//            String errmsg = JSON.parseObject(resp).getString("errmsg");
+//            Assert.assertEquals("ok",errmsg);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    @Test
+//    public void testSendSingleUserWeChat() {
+//        try {
+//            String token = EnterpriseWeChatUtils.getToken();
+//            String msg = EnterpriseWeChatUtils.makeUserSendMsg(listUserId.stream().findFirst().get(), agentId, "your meeting room has been booked and will be synced to the 'mailbox' later \n" +
+//                    ">**matter details** \n" +
+//                    ">matter：<font color='info'>meeting</font> <br>" +
+//                    ">organizer：@miglioguan \n" +
+//                    ">participant：@miglioguan、@kunliu、@jamdeezhou、@kanexiong、@kisonwang \n" +
+//                    "> \n" +
+//                    ">meeting room：<font color='info'>Guangzhou TIT 1st Floor 301</font> \n" +
+//                    ">date：<font color='warning'>May 18, 2018</font> \n" +
+//                    ">time：<font color='comment'>9:00-11:00 am</font> \n" +
+//                    "> \n" +
+//                    ">please attend the meeting on time\n" +
+//                    "> \n" +
+//                    ">to modify the meeting information, please click: [Modify Meeting Information](https://work.weixin.qq.com)\"");
+//
+//            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+//
+//            String errmsg = JSON.parseObject(resp).getString("errmsg");
+//            Assert.assertEquals("ok",errmsg);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    @Test
+//    public void testSendMultiUserWeChat() {
+//        try {
+//            String token = EnterpriseWeChatUtils.getToken();
+//
+//            String msg = EnterpriseWeChatUtils.makeUserSendMsg(listUserId, agentId, "hello world");
+//            String resp = EnterpriseWeChatUtils.sendEnterpriseWeChat("utf-8", msg, token);
+//
+//            String errmsg = JSON.parseObject(resp).getString("errmsg");
+//            Assert.assertEquals("ok",errmsg);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java

@@ -16,6 +16,7 @@
  */
 package org.apache.dolphinscheduler.api.controller;
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.AlertGroupService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -37,6 +38,8 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * alert group controller
  */
@@ -53,6 +56,7 @@ public class AlertGroupController extends  BaseController{
 
     /**
      * create alert group
+     *
      * @param loginUser   login user
      * @param groupName   group name
      * @param groupType   group type
@@ -67,39 +71,32 @@ public class AlertGroupController extends  BaseController{
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_ALERT_GROUP_ERROR)
     public Result createAlertgroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam(value = "groupName") String groupName,
                                    @RequestParam(value = "groupType") AlertType groupType,
                                    @RequestParam(value = "description", required = false) String description) {
         logger.info("loginUser user {}, create alertgroup, groupName: {}, groupType: {}, desc: {}",
                 loginUser.getUserName(), groupName, groupType, description);
-        try {
         Map<String, Object> result = alertGroupService.createAlertgroup(loginUser, groupName, groupType, description);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.CREATE_ALERT_GROUP_ERROR.getMsg(),e);
-            return error(Status.CREATE_ALERT_GROUP_ERROR.getCode(), Status.CREATE_ALERT_GROUP_ERROR.getMsg());
-        }
     }
 
     /**
      * alert group list
+     *
      * @param loginUser login user
      * @return alert group list
      */
     @ApiOperation(value = "list", notes = "QUERY_ALERT_GROUP_LIST_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_ALL_ALERTGROUP_ERROR)
     public Result list(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login  user {}, query all alertGroup",
                 loginUser.getUserName());
-        try {
         HashMap<String, Object> result = alertGroupService.queryAlertgroup();
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg(), e);
-            return error(Status.QUERY_ALL_ALERTGROUP_ERROR.getCode(), Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg());
-        }
     }
 
     /**
@@ -119,13 +116,13 @@ public class AlertGroupController extends  BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(LIST_PAGING_ALERT_GROUP_ERROR)
     public Result listPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                              @RequestParam("pageNo") Integer pageNo,
                              @RequestParam(value = "searchVal", required = false) String searchVal,
                              @RequestParam("pageSize") Integer pageSize) {
         logger.info("login  user {}, list paging, pageNo: {}, searchVal: {}, pageSize: {}",
                 loginUser.getUserName(), pageNo, searchVal, pageSize);
-        try{
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
             return returnDataListPaging(result);
@@ -134,14 +131,11 @@ public class AlertGroupController extends  BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = alertGroupService.listPaging(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.LIST_PAGING_ALERT_GROUP_ERROR.getMsg(),e);
-            return error(Status.LIST_PAGING_ALERT_GROUP_ERROR.getCode(), Status.LIST_PAGING_ALERT_GROUP_ERROR.getMsg());
-        }
     }
 
     /**
      * updateProcessInstance alert group
+     *
      * @param loginUser   login user
      * @param id          alert group id
      * @param groupName   group name
@@ -158,6 +152,7 @@ public class AlertGroupController extends  BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_ALERT_GROUP_ERROR)
     public Result updateAlertgroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam(value = "id") int id,
                                    @RequestParam(value = "groupName") String groupName,
@@ -165,18 +160,13 @@ public class AlertGroupController extends  BaseController{
                                    @RequestParam(value = "description", required = false) String description) {
         logger.info("login  user {}, updateProcessInstance alertgroup, groupName: {}, groupType: {}, desc: {}",
                 loginUser.getUserName(), groupName, groupType, description);
-        try {
         Map<String, Object> result = alertGroupService.updateAlertgroup(loginUser, id, groupName, groupType, description);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.UPDATE_ALERT_GROUP_ERROR.getMsg(),e);
-            return error(Status.UPDATE_ALERT_GROUP_ERROR.getCode(), Status.UPDATE_ALERT_GROUP_ERROR.getMsg());
-        }
     }
 
     /**
      * delete alert group by id
+     *
      * @param loginUser login user
      * @param id        alert group id
      * @return delete result code
@@ -187,22 +177,18 @@ public class AlertGroupController extends  BaseController{
     })
     @PostMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_ALERT_GROUP_ERROR)
     public Result delAlertgroupById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam(value = "id") int id) {
         logger.info("login user {}, delete AlertGroup, id: {},", loginUser.getUserName(), id);
-        try {
         Map<String, Object> result = alertGroupService.delAlertgroupById(loginUser, id);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.DELETE_ALERT_GROUP_ERROR.getMsg(),e);
-            return error(Status.DELETE_ALERT_GROUP_ERROR.getCode(), Status.DELETE_ALERT_GROUP_ERROR.getMsg());
-        }
     }
 
 
     /**
      * check alert group exist
+     *
      * @param loginUser login user
      * @param groupName group name
      * @return check result code
@@ -245,17 +231,12 @@ public class AlertGroupController extends  BaseController{
     })
     @PostMapping(value = "/grant-user")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(ALERT_GROUP_GRANT_USER_ERROR)
     public Result grantUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                             @RequestParam(value = "alertgroupId") int alertgroupId,
                             @RequestParam(value = "userIds") String userIds) {
         logger.info("login user {}, grant user, alertGroupId: {},userIds : {}", loginUser.getUserName(), alertgroupId, userIds);
-        try {
         Map<String, Object> result = alertGroupService.grantUser(loginUser, alertgroupId, userIds);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.ALERT_GROUP_GRANT_USER_ERROR.getMsg(),e);
-            return error(Status.ALERT_GROUP_GRANT_USER_ERROR.getCode(), Status.ALERT_GROUP_GRANT_USER_ERROR.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.DataAnalysisService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -25,7 +26,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.dolphinscheduler.api.enums.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +35,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * data analysis controller
  */
@@ -66,19 +68,15 @@ public class DataAnalysisController extends BaseController{
     })
     @GetMapping(value = "/task-state-count")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(TASK_INSTANCE_STATE_COUNT_ERROR)
     public Result countTaskState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam(value = "startDate", required = false) String startDate,
                                  @RequestParam(value = "endDate", required = false) String endDate,
                                  @RequestParam(value = "projectId", required = false, defaultValue = "0") int projectId) {
-        try{
         logger.info("count task state, user:{}, start date: {}, end date:{}, project id {}",
                 loginUser.getUserName(), startDate, endDate, projectId);
         Map<String, Object> result = dataAnalysisService.countTaskStateByProject(loginUser, projectId, startDate, endDate);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.TASK_INSTANCE_STATE_COUNT_ERROR.getMsg(),e);
-            return error(Status.TASK_INSTANCE_STATE_COUNT_ERROR.getCode(), Status.TASK_INSTANCE_STATE_COUNT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -98,19 +96,15 @@ public class DataAnalysisController extends BaseController{
     })
     @GetMapping(value = "/process-state-count")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(COUNT_PROCESS_INSTANCE_STATE_ERROR)
     public Result countProcessInstanceState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                             @RequestParam(value = "startDate", required = false) String startDate,
                                             @RequestParam(value = "endDate", required = false) String endDate,
                                             @RequestParam(value = "projectId", required = false, defaultValue = "0") int projectId) {
-        try{
         logger.info("count process instance state, user:{}, start date: {}, end date:{}, project id:{}",
                 loginUser.getUserName(), startDate, endDate, projectId);
         Map<String, Object> result = dataAnalysisService.countProcessInstanceStateByProject(loginUser, projectId, startDate, endDate);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg(),e);
-            return error(Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getCode(), Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -126,17 +120,13 @@ public class DataAnalysisController extends BaseController{
     })
     @GetMapping(value = "/define-user-count")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(COUNT_PROCESS_DEFINITION_USER_ERROR)
     public Result countDefinitionByUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @RequestParam(value = "projectId", required = false, defaultValue = "0") int projectId) {
-        try{
         logger.info("count process definition , user:{}, project id:{}",
                 loginUser.getUserName(), projectId);
         Map<String, Object> result = dataAnalysisService.countDefinitionByUser(loginUser, projectId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg(),e);
-            return error(Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getCode(), Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg());
-        }
     }
 
 
@@ -157,19 +147,15 @@ public class DataAnalysisController extends BaseController{
     })
     @GetMapping(value = "/command-state-count")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(COMMAND_STATE_COUNT_ERROR)
     public Result countCommandState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam(value = "startDate", required = false) String startDate,
                                     @RequestParam(value = "endDate", required = false) String endDate,
                                     @RequestParam(value = "projectId", required = false, defaultValue = "0") int projectId) {
-        try{
         logger.info("count command state, user:{}, start date: {}, end date:{}, project id {}",
                 loginUser.getUserName(), startDate, endDate, projectId);
         Map<String, Object> result = dataAnalysisService.countCommandState(loginUser, projectId, startDate, endDate);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.COMMAND_STATE_COUNT_ERROR.getMsg(),e);
-            return error(Status.COMMAND_STATE_COUNT_ERROR.getCode(), Status.COMMAND_STATE_COUNT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -185,17 +171,13 @@ public class DataAnalysisController extends BaseController{
     })
     @GetMapping(value = "/queue-count")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUEUE_COUNT_ERROR)
     public Result countQueueState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                   @RequestParam(value = "projectId", required = false, defaultValue = "0") int projectId) {
-        try{
         logger.info("count command state, user:{}, project id {}",
                 loginUser.getUserName(), projectId);
         Map<String, Object> result = dataAnalysisService.countQueueState(loginUser, projectId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUEUE_COUNT_ERROR.getMsg(),e);
-            return error(Status.QUEUE_COUNT_ERROR.getCode(), Status.QUEUE_COUNT_ERROR.getMsg());
-        }
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.DataSourceService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -39,6 +40,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 
 import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * data source controller
  */
@@ -54,6 +56,7 @@ public class DataSourceController extends BaseController {
 
     /**
      * create data source
+     *
      * @param loginUser login user
      * @param name      data source name
      * @param note      data source description
@@ -82,6 +85,7 @@ public class DataSourceController extends BaseController {
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_DATASOURCE_ERROR)
     public Result createDataSource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("name") String name,
                                    @RequestParam(value = "note", required = false) String note,
@@ -96,15 +100,9 @@ public class DataSourceController extends BaseController {
                                    @RequestParam(value = "other") String other) {
         logger.info("login user {} create datasource name: {}, note: {}, type: {}, host: {}, port: {}, database : {}, principal: {}, userName : {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, host, port, database, principal, userName, connectType, other);
-        try {
         String parameter = dataSourceService.buildParameter(name, note, type, host, port, database, principal, userName, password, connectType, other);
         Map<String, Object> result = dataSourceService.createDataSource(loginUser, name, note, type, parameter);
         return returnDataList(result);
-
-        } catch (Exception e) {
-            logger.error(CREATE_DATASOURCE_ERROR.getMsg(),e);
-            return error(Status.CREATE_DATASOURCE_ERROR.getCode(), Status.CREATE_DATASOURCE_ERROR.getMsg());
-        }
     }
 
 
@@ -141,6 +139,7 @@ public class DataSourceController extends BaseController {
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_DATASOURCE_ERROR)
     public Result updateDataSource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("id") int id,
                                    @RequestParam("name") String name,
@@ -156,16 +155,9 @@ public class DataSourceController extends BaseController {
                                    @RequestParam(value = "other") String other) {
         logger.info("login user {} updateProcessInstance datasource name: {}, note: {}, type: {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
-        try {
         String parameter = dataSourceService.buildParameter(name, note, type, host, port, database, principal, userName, password, connectType, other);
         Map<String, Object> dataSource = dataSourceService.updateDataSource(id, loginUser, name, note, type, parameter);
         return returnDataList(dataSource);
-        } catch (Exception e) {
-            logger.error(UPDATE_DATASOURCE_ERROR.getMsg(),e);
-            return error(UPDATE_DATASOURCE_ERROR.getCode(), UPDATE_DATASOURCE_ERROR.getMsg());
-        }
-
-
     }
 
     /**
@@ -182,19 +174,13 @@ public class DataSourceController extends BaseController {
     })
     @PostMapping(value = "/update-ui")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATASOURCE_ERROR)
     public Result queryDataSource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                   @RequestParam("id") int id) {
         logger.info("login user {}, query datasource: {}",
                 loginUser.getUserName(), id);
-        try {
         Map<String, Object> result = dataSourceService.queryDataSource(id);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_DATASOURCE_ERROR.getMsg(),e);
-            return error(Status.QUERY_DATASOURCE_ERROR.getCode(), Status.QUERY_DATASOURCE_ERROR.getMsg());
-        }
-
-
     }
 
     /**
@@ -210,15 +196,11 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATASOURCE_ERROR)
     public Result queryDataSourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                       @RequestParam("type") DbType type) {
-        try {
         Map<String, Object> result = dataSourceService.queryDataSourceList(loginUser, type.ordinal());
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_DATASOURCE_ERROR.getMsg(),e);
-            return error(Status.QUERY_DATASOURCE_ERROR.getCode(), Status.QUERY_DATASOURCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -238,11 +220,11 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATASOURCE_ERROR)
     public Result queryDataSourceListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                             @RequestParam(value = "searchVal", required = false) String searchVal,
                                             @RequestParam("pageNo") Integer pageNo,
                                             @RequestParam("pageSize") Integer pageSize) {
-        try {
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
             return returnDataListPaging(result);
@@ -250,10 +232,6 @@ public class DataSourceController extends BaseController {
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = dataSourceService.queryDataSourceListPaging(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        } catch (Exception e) {
-            logger.error(QUERY_DATASOURCE_ERROR.getMsg(),e);
-            return error(QUERY_DATASOURCE_ERROR.getCode(), QUERY_DATASOURCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -287,6 +265,7 @@ public class DataSourceController extends BaseController {
     })
     @PostMapping(value = "/connect")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(CONNECT_DATASOURCE_FAILURE)
     public Result connectDataSource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam("name") String name,
                                     @RequestParam(value = "note", required = false) String note,
@@ -301,7 +280,6 @@ public class DataSourceController extends BaseController {
                                     @RequestParam(value = "other") String other) {
         logger.info("login user {}, connect datasource: {} failure, note: {}, type: {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
-        try {
         String parameter = dataSourceService.buildParameter(name, note, type, host, port, database, principal, userName, password, connectType, other);
         Boolean isConnection = dataSourceService.checkConnection(type, parameter);
         Result result = new Result();
@@ -312,10 +290,6 @@ public class DataSourceController extends BaseController {
             putMsg(result, CONNECT_DATASOURCE_FAILURE);
         }
         return result;
-        } catch (Exception e) {
-            logger.error(CONNECT_DATASOURCE_FAILURE.getMsg(),e);
-            return error(CONNECT_DATASOURCE_FAILURE.getCode(), CONNECT_DATASOURCE_FAILURE.getMsg());
-        }
     }
 
     /**
@@ -331,11 +305,11 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/connect-by-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(CONNECTION_TEST_FAILURE)
     public Result connectionTest(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam("id") int id) {
         logger.info("connection test, login user:{}, id:{}", loginUser.getUserName(), id);
 
-        try {
         Boolean isConnection = dataSourceService.connectionTest(loginUser, id);
         Result result = new Result();
 
@@ -345,11 +319,6 @@ public class DataSourceController extends BaseController {
             putMsg(result, CONNECTION_TEST_FAILURE);
         }
         return result;
-        } catch (Exception e) {
-            logger.error(CONNECTION_TEST_FAILURE.getMsg(),e);
-            return error(CONNECTION_TEST_FAILURE.getCode(), CONNECTION_TEST_FAILURE.getMsg());
-        }
-
     }
 
     /**
@@ -365,15 +334,11 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_DATA_SOURCE_FAILURE)
     public Result delete(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                          @RequestParam("id") int id) {
-        try {
         logger.info("delete datasource,login user:{}, id:{}", loginUser.getUserName(), id);
         return dataSourceService.delete(loginUser, id);
-        } catch (Exception e) {
-            logger.error(DELETE_DATA_SOURCE_FAILURE.getMsg(),e);
-            return error(DELETE_DATA_SOURCE_FAILURE.getCode(), DELETE_DATA_SOURCE_FAILURE.getMsg());
-        }
     }
 
     /**
@@ -389,20 +354,15 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/verify-name")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_DATASOURCE_NAME_FAILURE)
     public Result verifyDataSourceName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                        @RequestParam(value = "name") String name
     ) {
         logger.info("login user {}, verfiy datasource name: {}",
                 loginUser.getUserName(), name);
 
-        try {
         return dataSourceService.verifyDataSourceName(loginUser, name);
-        } catch (Exception e) {
-            logger.error(VERIFY_DATASOURCE_NAME_FAILURE.getMsg(), e);
-            return error(VERIFY_DATASOURCE_NAME_FAILURE.getCode(), VERIFY_DATASOURCE_NAME_FAILURE.getMsg());
     }
-    }
-
 
 
     /**
@@ -418,17 +378,13 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/unauth-datasource")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UNAUTHORIZED_DATASOURCE)
     public Result unauthDatasource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("userId") Integer userId) {
-        try {
         logger.info("unauthorized datasource, login user:{}, unauthorized userId:{}",
                 loginUser.getUserName(), userId);
         Map<String, Object> result = dataSourceService.unauthDatasource(loginUser, userId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(UNAUTHORIZED_DATASOURCE.getMsg(),e);
-            return error(UNAUTHORIZED_DATASOURCE.getCode(), UNAUTHORIZED_DATASOURCE.getMsg());
-        }
     }
 
 
@@ -445,17 +401,13 @@ public class DataSourceController extends BaseController {
     })
     @GetMapping(value = "/authed-datasource")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(AUTHORIZED_DATA_SOURCE)
     public Result authedDatasource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("userId") Integer userId) {
-        try {
         logger.info("authorized data source, login user:{}, authorized useId:{}",
                 loginUser.getUserName(), userId);
         Map<String, Object> result = dataSourceService.authedDatasource(loginUser, userId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(AUTHORIZED_DATA_SOURCE.getMsg(),e);
-            return error(AUTHORIZED_DATA_SOURCE.getCode(), AUTHORIZED_DATA_SOURCE.getMsg());
-        }
     }
 
     /**
@@ -467,14 +419,10 @@ public class DataSourceController extends BaseController {
     @ApiOperation(value = "getKerberosStartupState", notes = "GET_USER_INFO_NOTES")
     @GetMapping(value = "/kerberos-startup-state")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(KERBEROS_STARTUP_STATE)
     public Result getKerberosStartupState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user {}", loginUser.getUserName());
-        try{
         // if upload resource is HDFS and kerberos startup is true , else false
         return success(Status.SUCCESS.getMsg(), CommonUtils.getKerberosStartupState());
-        }catch (Exception e){
-            logger.error(KERBEROS_STARTUP_STATE.getMsg(),e);
-            return error(Status.KERBEROS_STARTUP_STATE.getCode(), Status.KERBEROS_STARTUP_STATE.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java

@@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 
 import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ExecutorService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -32,8 +32,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.text.ParseException;
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * execute process controller
@@ -50,6 +53,7 @@ public class ExecutorController extends BaseController {
 
     /**
      * execute process instance
+     *
      * @param loginUser               login user
      * @param projectName             project name
      * @param processDefinitionId     process definition id
@@ -87,6 +91,7 @@ public class ExecutorController extends BaseController {
     })
     @PostMapping(value = "start-process-instance")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(START_PROCESS_INSTANCE_ERROR)
     public Result startProcessInstance(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                        @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                        @RequestParam(value = "processDefinitionId") int processDefinitionId,
@@ -102,8 +107,7 @@ public class ExecutorController extends BaseController {
                                        @RequestParam(value = "runMode", required = false) RunMode runMode,
                                        @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,
                                        @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
-                                       @RequestParam(value = "timeout", required = false) Integer timeout) {
+                                       @RequestParam(value = "timeout", required = false) Integer timeout) throws ParseException {
-        try {
         logger.info("login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
                         + "failure policy: {}, node name: {}, node dep: {}, notify type: {}, "
                         + "notify group id: {},receivers:{},receiversCc:{}, run mode: {},process instance priority:{}, workerGroup: {}, timeout: {}",
@@ -119,10 +123,6 @@ public class ExecutorController extends BaseController {
                 startNodeList, taskDependType, warningType,
                 warningGroupId, receivers, receiversCc, runMode, processInstancePriority, workerGroup, timeout);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(Status.START_PROCESS_INSTANCE_ERROR.getMsg(),e);
-            return error(Status.START_PROCESS_INSTANCE_ERROR.getCode(), Status.START_PROCESS_INSTANCE_ERROR.getMsg());
-        }
     }
 
 
@@ -142,20 +142,16 @@ public class ExecutorController extends BaseController {
     })
     @PostMapping(value = "/execute")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(EXECUTE_PROCESS_INSTANCE_ERROR)
     public Result execute(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                           @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                           @RequestParam("processInstanceId") Integer processInstanceId,
                           @RequestParam("executeType") ExecuteType executeType
     ) {
-        try {
         logger.info("execute command, login user: {}, project:{}, process instance id:{}, execute type:{}",
                 loginUser.getUserName(), projectName, processInstanceId, executeType);
         Map<String, Object> result = execService.execute(loginUser, projectName, processInstanceId, executeType);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(Status.EXECUTE_PROCESS_INSTANCE_ERROR.getMsg(),e);
-            return error(Status.EXECUTE_PROCESS_INSTANCE_ERROR.getCode(), Status.EXECUTE_PROCESS_INSTANCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -171,17 +167,12 @@ public class ExecutorController extends BaseController {
     })
     @PostMapping(value = "/start-check")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(CHECK_PROCESS_DEFINITION_ERROR)
     public Result startCheckProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                               @RequestParam(value = "processDefinitionId") int processDefinitionId) {
         logger.info("login user {}, check process definition {}", loginUser.getUserName(), processDefinitionId);
-        try {
         Map<String, Object> result = execService.startCheckByProcessDefinedId(processDefinitionId);
         return returnDataList(result);
-
-        } catch (Exception e) {
-            logger.error(Status.CHECK_PROCESS_DEFINITION_ERROR.getMsg(),e);
-            return error(Status.CHECK_PROCESS_DEFINITION_ERROR.getCode(), Status.CHECK_PROCESS_DEFINITION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -201,17 +192,13 @@ public class ExecutorController extends BaseController {
     })
     @GetMapping(value = "/get-receiver-cc")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR)
     public Result getReceiverCc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "processDefinitionId", required = false) Integer processDefinitionId,
                                 @RequestParam(value = "processInstanceId", required = false) Integer processInstanceId) {
         logger.info("login user {}, get process definition receiver and cc", loginUser.getUserName());
-        try {
         Map<String, Object> result = execService.getReceiverCc(processDefinitionId, processInstanceId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg(),e);
-            return error(Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getCode(), Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg());
-        }
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.LoggerService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -25,7 +26,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.dolphinscheduler.api.enums.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +35,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * log controller
@@ -52,6 +54,7 @@ public class LoggerController extends BaseController {
 
     /**
      * query task log
+     *
      * @param loginUser      login user
      * @param taskInstanceId task instance id
      * @param skipNum        skip number
@@ -66,19 +69,14 @@ public class LoggerController extends BaseController {
     })
     @GetMapping(value = "/detail")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TASK_INSTANCE_LOG_ERROR)
     public Result queryLog(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                            @RequestParam(value = "taskInstanceId") int taskInstanceId,
                            @RequestParam(value = "skipLineNum") int skipNum,
                            @RequestParam(value = "limit") int limit) {
-        try {
-
         logger.info(
                 "login user {}, view {} task instance log ,skipLineNum {} , limit {}", loginUser.getUserName(), taskInstanceId, skipNum, limit);
         return loggerService.queryLog(taskInstanceId, skipNum, limit);
-        } catch (Exception e) {
-            logger.error(Status.QUERY_TASK_INSTANCE_LOG_ERROR.getMsg(), e);
-            return error(Status.QUERY_TASK_INSTANCE_LOG_ERROR.getCode(), Status.QUERY_TASK_INSTANCE_LOG_ERROR.getMsg());
-        }
     }
 
 
@@ -95,18 +93,14 @@ public class LoggerController extends BaseController {
     })
     @GetMapping(value = "/download-log")
     @ResponseBody
+    @ApiException(DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR)
     public ResponseEntity downloadTaskLog(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                           @RequestParam(value = "taskInstanceId") int taskInstanceId) {
-        try {
         byte[] logBytes = loggerService.getLogBytes(taskInstanceId);
         return ResponseEntity
                 .ok()
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + System.currentTimeMillis() + ".log" + "\"")
                 .body(logBytes);
-        } catch (Exception e) {
-            logger.error(Status.DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Status.DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg());
-        }
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java

@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.security.Authenticator;
 import org.apache.dolphinscheduler.api.service.SessionService;
 import org.apache.dolphinscheduler.api.utils.Result;
@@ -42,7 +43,7 @@ import static org.apache.dolphinscheduler.api.enums.Status.*;
 
 /**
  * user login controller
- *
+ * <p>
  * swagger bootstrap ui docs refer : https://doc.xiaominfo.com/guide/enh-func.html
  */
 @Api(tags = "LOGIN_TAG", position = 1)
@@ -75,12 +76,11 @@ public class LoginController extends BaseController {
             @ApiImplicitParam(name = "userPassword", value = "USER_PASSWORD", required = true, dataType = "String")
     })
     @PostMapping(value = "/login")
+    @ApiException(USER_LOGIN_FAILURE)
     public Result login(@RequestParam(value = "userName") String userName,
                         @RequestParam(value = "userPassword") String userPassword,
                         HttpServletRequest request,
                         HttpServletResponse response) {
-
-        try {
         logger.info("login user name: {} ", userName);
 
         //user name check
@@ -110,10 +110,6 @@ public class LoginController extends BaseController {
         }
 
         return result;
-        } catch (Exception e) {
-            logger.error(USER_LOGIN_FAILURE.getMsg(),e);
-            return error(USER_LOGIN_FAILURE.getCode(), USER_LOGIN_FAILURE.getMsg());
-        }
     }
 
     /**
@@ -125,19 +121,14 @@ public class LoginController extends BaseController {
      */
     @ApiOperation(value = "signOut", notes = "SIGNOUT_NOTES")
     @PostMapping(value = "/signOut")
+    @ApiException(SIGN_OUT_ERROR)
     public Result signOut(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                           HttpServletRequest request) {
-
-        try {
         logger.info("login user:{} sign out", loginUser.getUserName());
         String ip = getClientIpAddress(request);
         sessionService.signOut(ip, loginUser);
         //clear session
         request.removeAttribute(Constants.SESSION_USER);
         return success();
-        } catch (Exception e) {
-            logger.error(SIGN_OUT_ERROR.getMsg(),e);
-            return error(SIGN_OUT_ERROR.getCode(), SIGN_OUT_ERROR.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.MonitorService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -33,6 +34,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 
 import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * monitor controller
  */
@@ -48,84 +50,67 @@ public class MonitorController extends BaseController{
 
     /**
      * master list
+     *
      * @param loginUser login user
      * @return master list
      */
     @ApiOperation(value = "listMaster", notes = "MASTER_LIST_NOTES")
     @GetMapping(value = "/master/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(LIST_MASTERS_ERROR)
     public Result listMaster(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user: {}, query all master", loginUser.getUserName());
-        try{
         logger.info("list master, user:{}", loginUser.getUserName());
         Map<String, Object> result = monitorService.queryMaster(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(LIST_MASTERS_ERROR.getMsg(),e);
-            return error(LIST_MASTERS_ERROR.getCode(),
-                    LIST_MASTERS_ERROR.getMsg());
-        }
     }
 
     /**
      * worker list
+     *
      * @param loginUser login user
      * @return worker information list
      */
     @ApiOperation(value = "listWorker", notes = "WORKER_LIST_NOTES")
     @GetMapping(value = "/worker/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(LIST_WORKERS_ERROR)
     public Result listWorker(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user: {}, query all workers", loginUser.getUserName());
-        try{
         Map<String, Object> result = monitorService.queryWorker(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(LIST_WORKERS_ERROR.getMsg(),e);
-            return error(LIST_WORKERS_ERROR.getCode(),
-                    LIST_WORKERS_ERROR.getMsg());
-        }
     }
 
     /**
      * query database state
+     *
      * @param loginUser login user
      * @return data base state
      */
     @ApiOperation(value = "queryDatabaseState", notes = "QUERY_DATABASE_STATE_NOTES")
     @GetMapping(value = "/database")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATABASE_STATE_ERROR)
     public Result queryDatabaseState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user: {}, query database state", loginUser.getUserName());
-        try{
-
         Map<String, Object> result = monitorService.queryDatabaseState(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_DATABASE_STATE_ERROR.getMsg(),e);
-            return error(QUERY_DATABASE_STATE_ERROR.getCode(),
-                    QUERY_DATABASE_STATE_ERROR.getMsg());
-        }
     }
 
     /**
      * query zookeeper state
+     *
      * @param loginUser login user
      * @return zookeeper information list
      */
     @ApiOperation(value = "queryZookeeperState", notes = "QUERY_ZOOKEEPER_STATE_NOTES")
     @GetMapping(value = "/zookeeper/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_ZOOKEEPER_STATE_ERROR)
     public Result queryZookeeperState(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user: {}, query zookeeper state", loginUser.getUserName());
-        try{
         Map<String, Object> result = monitorService.queryZookeeperState(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_ZOOKEEPER_STATE_ERROR.getMsg(),e);
-            return error(QUERY_ZOOKEEPER_STATE_ERROR.getCode(),
-                    QUERY_ZOOKEEPER_STATE_ERROR.getMsg());
-        }
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java

@@ -16,7 +16,9 @@
  */
 package org.apache.dolphinscheduler.api.controller;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -37,6 +39,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * process definition controller
@@ -73,25 +77,21 @@ public class ProcessDefinitionController extends BaseController{
     })
     @PostMapping(value = "/save")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_PROCESS_DEFINITION)
     public Result createProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                           @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                           @RequestParam(value = "name", required = true) String name,
                                           @RequestParam(value = "processDefinitionJson", required = true) String json,
                                           @RequestParam(value = "locations", required = true) String locations,
                                           @RequestParam(value = "connects", required = true) String connects,
-                                          @RequestParam(value = "description", required = false) String description) {
+                                          @RequestParam(value = "description", required = false) String description) throws JsonProcessingException {
 
-        try {
         logger.info("login user {}, create  process definition, project name: {}, process definition name: {}, " +
                         "process_definition_json: {}, desc: {} locations:{}, connects:{}",
                 loginUser.getUserName(), projectName, name, json, description, locations, connects);
         Map<String, Object> result = processDefinitionService.createProcessDefinition(loginUser, projectName, name, json,
                 description, locations, connects);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(Status.CREATE_PROCESS_DEFINITION.getMsg(), e);
-            return error(Status.CREATE_PROCESS_DEFINITION.getCode(), Status.CREATE_PROCESS_DEFINITION.getMsg());
-        }
     }
 
     /**
@@ -102,24 +102,20 @@ public class ProcessDefinitionController extends BaseController{
      * @param name        name
      * @return true if process definition name not exists, otherwise false
      */
-    @ApiOperation(value = "verify-name", notes = "VERIFY_PROCCESS_DEFINITION_NAME_NOTES")
+    @ApiOperation(value = "verify-name", notes = "VERIFY_PROCESS_DEFINITION_NAME_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "PROCESS_DEFINITION_NAME", required = true, type = "String")
     })
     @GetMapping(value = "/verify-name")
     @ResponseStatus(HttpStatus.OK)
-    public Result verifyProccessDefinitionName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR)
+    public Result verifyProcessDefinitionName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                                @RequestParam(value = "name", required = true) String name) {
-        try {
         logger.info("verify process definition name unique, user:{}, project name:{}, process definition name:{}",
                 loginUser.getUserName(), projectName, name);
-            Map<String, Object> result = processDefinitionService.verifyProccessDefinitionName(loginUser, projectName, name);
+        Map<String, Object> result = processDefinitionService.verifyProcessDefinitionName(loginUser, projectName, name);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg(),e);
-            return error(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getCode(), Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -135,7 +131,8 @@ public class ProcessDefinitionController extends BaseController{
      * @param connects              connects for nodes
      * @return update result code
      */
-    @ApiOperation(value = "updateProccessDefinition", notes= "UPDATE_PROCCESS_DEFINITION_NOTES")
+
+    @ApiOperation(value = "updateProcessDefinition", notes= "UPDATE_PROCESS_DEFINITION_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "PROCESS_DEFINITION_NAME", required = true, type = "String"),
             @ApiImplicitParam(name = "id", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"),
@@ -146,7 +143,8 @@ public class ProcessDefinitionController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
-    public Result updateProccessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(UPDATE_PROCESS_DEFINITION_ERROR)
+    public Result updateProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                            @RequestParam(value = "name", required = true) String name,
                                            @RequestParam(value = "id", required = true) int id,
@@ -155,17 +153,12 @@ public class ProcessDefinitionController extends BaseController{
                                            @RequestParam(value = "connects", required = false) String connects,
                                            @RequestParam(value = "description", required = false) String description) {
 
-        try {
         logger.info("login user {}, update process define, project name: {}, process define name: {}, " +
                         "process_definition_json: {}, desc: {}, locations:{}, connects:{}",
                 loginUser.getUserName(), projectName, name, processDefinitionJson, description, locations, connects);
         Map<String, Object> result = processDefinitionService.updateProcessDefinition(loginUser, projectName, id, name,
                 processDefinitionJson, description, locations, connects);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.UPDATE_PROCESS_DEFINITION_ERROR.getMsg(),e);
-            return error(Status.UPDATE_PROCESS_DEFINITION_ERROR.getCode(), Status.UPDATE_PROCESS_DEFINITION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -177,7 +170,8 @@ public class ProcessDefinitionController extends BaseController{
      * @param releaseState release state
      * @return release result code
      */
-    @ApiOperation(value = "releaseProccessDefinition", notes= "RELEASE_PROCCESS_DEFINITION_NOTES")
+
+    @ApiOperation(value = "releaseProcessDefinition", notes= "RELEASE_PROCESS_DEFINITION_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "name", value = "PROCESS_DEFINITION_NAME", required = true, type = "String"),
             @ApiImplicitParam(name = "processId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"),
@@ -185,23 +179,18 @@ public class ProcessDefinitionController extends BaseController{
     })
     @PostMapping(value = "/release")
     @ResponseStatus(HttpStatus.OK)
-    public Result releaseProccessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(RELEASE_PROCESS_DEFINITION_ERROR)
+    public Result releaseProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                             @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                             @RequestParam(value = "processId", required = true) int processId,
                                             @RequestParam(value = "releaseState", required = true) int releaseState) {
 
-        try {
         logger.info("login user {}, release process definition, project name: {}, release state: {}",
                 loginUser.getUserName(), projectName, releaseState);
         Map<String, Object> result = processDefinitionService.releaseProcessDefinition(loginUser, projectName, processId, releaseState);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.RELEASE_PROCESS_DEFINITION_ERROR.getMsg(),e);
-            return error(Status.RELEASE_PROCESS_DEFINITION_ERROR.getCode(), Status.RELEASE_PROCESS_DEFINITION_ERROR.getMsg());
-        }
     }
 
-
     /**
      * query datail of process definition
      *
@@ -210,54 +199,46 @@ public class ProcessDefinitionController extends BaseController{
      * @param processId   process definition id
      * @return process definition detail
      */
-    @ApiOperation(value = "queryProccessDefinitionById", notes= "QUERY_PROCCESS_DEFINITION_BY_ID_NOTES")
+    @ApiOperation(value = "queryProcessDefinitionById", notes= "QUERY_PROCESS_DEFINITION_BY_ID_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "processId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
     })
     @GetMapping(value = "/select-by-id")
     @ResponseStatus(HttpStatus.OK)
-    public Result queryProccessDefinitionById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR)
+    public Result queryProcessDefinitionById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                               @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                               @RequestParam("processId") Integer processId
     ) {
-        try{
+        logger.info("query detail of process definition, login user:{}, project name:{}, process definition id:{}",
-            logger.info("query datail of process definition, login user:{}, project name:{}, process definition id:{}",
                 loginUser.getUserName(), projectName, processId);
-            Map<String, Object> result = processDefinitionService.queryProccessDefinitionById(loginUser, projectName, processId);
+        Map<String, Object> result = processDefinitionService.queryProcessDefinitionById(loginUser, projectName, processId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg(),e);
-            return error(Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getCode(), Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg());
-        }
     }
 
-
     /**
-     * query proccess definition list
+     * query Process definition list
      *
      * @param loginUser   login user
      * @param projectName project name
      * @return process definition list
      */
-    @ApiOperation(value = "queryProccessDefinitionList", notes= "QUERY_PROCCESS_DEFINITION_LIST_NOTES")
+    @ApiOperation(value = "queryProcessDefinitionList", notes = "QUERY_PROCESS_DEFINITION_LIST_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
-    public Result queryProccessDefinitionList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(QUERY_PROCESS_DEFINITION_LIST)
+    public Result queryProcessDefinitionList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                               @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName
     ) {
-        try{
+        logger.info("query process definition list, login user:{}, project name:{}",
-            logger.info("query proccess definition list, login user:{}, project name:{}",
                 loginUser.getUserName(), projectName);
-            Map<String, Object> result = processDefinitionService.queryProccessDefinitionList(loginUser, projectName);
+        Map<String, Object> result = processDefinitionService.queryProcessDefinitionList(loginUser, projectName);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e);
-            return error(Status.QUERY_PROCCESS_DEFINITION_LIST.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg());
-        }
     }
 
     /**
-     * query proccess definition list paging
+     * query process definition list paging
+     *
      * @param loginUser   login user
      * @param projectName project name
      * @param searchVal   search value
@@ -266,7 +247,7 @@ public class ProcessDefinitionController extends BaseController{
      * @param userId      user id
      * @return process definition page
      */
-    @ApiOperation(value = "queryProcessDefinitionListPaging", notes= "QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES")
+    @ApiOperation(value = "queryProcessDefinitionListPaging", notes= "QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "100"),
             @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", required = false, type = "String"),
@@ -275,14 +256,14 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCESS_DEFINITION_LIST_PAGING_ERROR)
     public Result queryProcessDefinitionListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                    @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                                    @RequestParam("pageNo") Integer pageNo,
                                                    @RequestParam(value = "searchVal", required = false) String searchVal,
                                                    @RequestParam(value = "userId", required = false, defaultValue = "0") Integer userId,
                                                    @RequestParam("pageSize") Integer pageSize) {
-        try{
+        logger.info("query process definition list paging, login user:{}, project name:{}", loginUser.getUserName(), projectName);
-            logger.info("query proccess definition list paging, login user:{}, project name:{}", loginUser.getUserName(), projectName);
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
             return returnDataListPaging(result);
@@ -290,13 +271,8 @@ public class ProcessDefinitionController extends BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = processDefinitionService.queryProcessDefinitionListPaging(loginUser, projectName, searchVal, pageNo, pageSize, userId);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
-
     /**
      * encapsulation treeview structure
      *
@@ -313,25 +289,18 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/view-tree")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR)
     public Result viewTree(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                            @RequestParam("processId") Integer id,
-                                                   @RequestParam("limit") Integer limit){
+                           @RequestParam("limit") Integer limit) throws Exception {
-        try{
         Map<String, Object> result = processDefinitionService.viewTree(id, limit);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg(),e);
-            return error(Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getCode(), Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg());
-        }
     }
 
-
     /**
-     *
      * get tasks list by process definition id
      *
-     *
      * @param loginUser           login user
      * @param projectName         project name
      * @param processDefinitionId process definition id
@@ -343,26 +312,20 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "gen-task-list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR)
     public Result getNodeListByDefinitionId(
             @ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
             @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
-            @RequestParam("processDefinitionId") Integer processDefinitionId){
+            @RequestParam("processDefinitionId") Integer processDefinitionId) throws Exception {
-        try {
         logger.info("query task node name list by definitionId, login user:{}, project name:{}, id : {}",
                 loginUser.getUserName(), projectName, processDefinitionId);
         Map<String, Object> result = processDefinitionService.getTaskNodeListByDefinitionId(processDefinitionId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e);
-            return error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg());
-        }
     }
 
     /**
-     *
      * get tasks list by process definition id
      *
-     *
      * @param loginUser               login user
      * @param projectName             project name
      * @param processDefinitionIdList process definition id list
@@ -374,20 +337,16 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "get-task-list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR)
     public Result getNodeListByDefinitionIdList(
             @ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
             @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
-            @RequestParam("processDefinitionIdList") String processDefinitionIdList){
+            @RequestParam("processDefinitionIdList") String processDefinitionIdList) throws Exception {
 
-        try {
         logger.info("query task node name list by definitionId list, login user:{}, project name:{}, id list: {}",
                 loginUser.getUserName(), projectName, processDefinitionIdList);
         Map<String, Object> result = processDefinitionService.getTaskNodeListByDefinitionIdList(processDefinitionIdList);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e);
-            return error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -404,19 +363,15 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_PROCESS_DEFINE_BY_ID_ERROR)
     public Result deleteProcessDefinitionById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                               @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                               @RequestParam("processDefinitionId") Integer processDefinitionId
     ) {
-        try{
         logger.info("delete process definition by id, login user:{}, project name:{}, process definition id:{}",
                 loginUser.getUserName(), projectName, processDefinitionId);
         Map<String, Object> result = processDefinitionService.deleteProcessDefinitionById(loginUser, projectName, processDefinitionId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e);
-            return error(Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getCode(), Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -433,11 +388,11 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/batch-delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR)
     public Result batchDeleteProcessDefinitionByIds(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                     @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                                     @RequestParam("processDefinitionIds") String processDefinitionIds
     ) {
-        try{
         logger.info("delete process definition by ids, login user:{}, project name:{}, process definition ids:{}",
                 loginUser.getUserName(), projectName, processDefinitionIds);
 
@@ -467,10 +422,6 @@ public class ProcessDefinitionController extends BaseController{
         }
 
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getMsg(),e);
-            return error(Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getCode(), Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getMsg());
-        }
     }
 
     /**
@@ -481,7 +432,8 @@ public class ProcessDefinitionController extends BaseController{
      * @param processDefinitionId process definition id
      * @param response            response
      */
-    @ApiOperation(value = "exportProcessDefinitionById", notes= "EXPORT_PROCCESS_DEFINITION_BY_ID_NOTES")
+
+    @ApiOperation(value = "exportProcessDefinitionById", notes= "EXPORT_PROCESS_DEFINITION_BY_ID_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
     })
@@ -500,29 +452,23 @@ public class ProcessDefinitionController extends BaseController{
         }
     }
 
-
-
     /**
-     * query proccess definition all by project id
+     * query process definition all by project id
      *
      * @param loginUser login user
      * @param projectId project id
      * @return process definition list
      */
-    @ApiOperation(value = "queryProccessDefinitionAllByProjectId", notes= "QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
+    @ApiOperation(value = "queryProcessDefinitionAllByProjectId", notes = "QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
-    @GetMapping(value="/queryProccessDefinitionAllByProjectId")
+    @GetMapping(value = "/queryProcessDefinitionAllByProjectId")
     @ResponseStatus(HttpStatus.OK)
-    public Result queryProccessDefinitionAllByProjectId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    @ApiException(QUERY_PROCESS_DEFINITION_LIST)
+    public Result queryProcessDefinitionAllByProjectId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                         @RequestParam("projectId") Integer projectId) {
-        try{
+        logger.info("query process definition list, login user:{}, project id:{}",
-            logger.info("query proccess definition list, login user:{}, project id:{}",
                 loginUser.getUserName(), projectId);
-            Map<String, Object> result = processDefinitionService.queryProccessDefinitionAllByProjectId(projectId);
+        Map<String, Object> result = processDefinitionService.queryProcessDefinitionAllByProjectId(projectId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e);
-            return error(Status.QUERY_PROCCESS_DEFINITION_LIST.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg());
-        }
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ProcessInstanceService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -33,6 +34,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.io.IOException;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -83,6 +86,7 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR)
     public Result queryProcessInstanceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                            @RequestParam(value = "processDefinitionId", required = false, defaultValue = "0") Integer processDefinitionId,
@@ -94,7 +98,6 @@ public class ProcessInstanceController extends BaseController{
                                            @RequestParam(value = "endDate", required = false) String endTime,
                                            @RequestParam("pageNo") Integer pageNo,
                                            @RequestParam("pageSize") Integer pageSize) {
-        try{
         logger.info("query all process instance list, login user:{},project name:{}, define id:{}," +
                         "search value:{},executor name:{},state type:{},host:{},start time:{}, end time:{},page number:{}, page size:{}",
                 loginUser.getUserName(), projectName, processDefinitionId, searchVal, executorName, stateType, host,
@@ -103,10 +106,6 @@ public class ProcessInstanceController extends BaseController{
         Map<String, Object> result = processInstanceService.queryProcessInstanceList(
                 loginUser, projectName, processDefinitionId, startTime, endTime, searchVal, executorName, stateType, host, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR.getCode(), Status.QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
     /**
@@ -123,19 +122,15 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/task-list-by-process-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR)
     public Result queryTaskListByProcessId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                            @RequestParam("processInstanceId") Integer processInstanceId
-    ) {
+    ) throws IOException {
-        try{
         logger.info("query task instance list by process instance id, login user:{}, project name:{}, process instance id:{}",
                 loginUser.getUserName(), projectName, processInstanceId);
         Map<String, Object> result = processInstanceService.queryTaskListByProcessId(loginUser, projectName, processInstanceId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR.getMsg(),e);
-            return error(QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR.getCode(), QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -164,6 +159,7 @@ public class ProcessInstanceController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_PROCESS_INSTANCE_ERROR)
     public Result updateProcessInstance(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                         @RequestParam(value = "processInstanceJson", required = false) String processInstanceJson,
@@ -173,8 +169,7 @@ public class ProcessInstanceController extends BaseController{
                                         @RequestParam(value = "locations", required = false) String locations,
                                         @RequestParam(value = "connects", required = false) String connects,
                                         @RequestParam(value = "flag", required = false) Flag flag
-    ){
+    ) throws ParseException {
-        try{
         logger.info("updateProcessInstance process instance, login user:{}, project name:{}, process instance json:{}," +
                         "process instance id:{}, schedule time:{}, sync define:{}, flag:{}, locations:{}, connects:{}",
                 loginUser.getUserName(), projectName, processInstanceJson, processInstanceId, scheduleTime,
@@ -182,10 +177,6 @@ public class ProcessInstanceController extends BaseController{
         Map<String, Object> result = processInstanceService.updateProcessInstance(loginUser, projectName,
                 processInstanceId, processInstanceJson, scheduleTime, syncDefine, flag, locations, connects);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(UPDATE_PROCESS_INSTANCE_ERROR.getMsg(),e);
-            return error(Status.UPDATE_PROCESS_INSTANCE_ERROR.getCode(), Status.UPDATE_PROCESS_INSTANCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -202,19 +193,15 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/select-by-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCESS_INSTANCE_BY_ID_ERROR)
     public Result queryProcessInstanceById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                            @RequestParam("processInstanceId") Integer processInstanceId
     ) {
-        try{
         logger.info("query process instance detail by id, login user:{},project name:{}, process instance id:{}",
                 loginUser.getUserName(), projectName, processInstanceId);
         Map<String, Object> result = processInstanceService.queryProcessInstanceById(loginUser, projectName, processInstanceId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_PROCESS_INSTANCE_BY_ID_ERROR.getMsg(),e);
-            return error(Status.QUERY_PROCESS_INSTANCE_BY_ID_ERROR.getCode(), Status.QUERY_PROCESS_INSTANCE_BY_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -232,20 +219,16 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_PROCESS_INSTANCE_BY_ID_ERROR)
     public Result deleteProcessInstanceById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                             @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                             @RequestParam("processInstanceId") Integer processInstanceId
     ) {
-        try{
         logger.info("delete process instance by id, login user:{}, project name:{}, process instance id:{}",
                 loginUser.getUserName(), projectName, processInstanceId);
         // task queue
         Map<String, Object> result = processInstanceService.deleteProcessInstanceById(loginUser, projectName, processInstanceId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(DELETE_PROCESS_INSTANCE_BY_ID_ERROR.getMsg(),e);
-            return error(Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR.getCode(), Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -262,16 +245,12 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/select-sub-process")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR)
     public Result querySubProcessInstanceByTaskId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                   @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                                   @RequestParam("taskId") Integer taskId) {
-        try{
         Map<String, Object> result = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectName, taskId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR.getMsg(),e);
-            return error(Status.QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR.getCode(), Status.QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -288,16 +267,12 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/select-parent-process")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR)
     public Result queryParentInstanceBySubId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                              @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                              @RequestParam("subId") Integer subId) {
-        try{
         Map<String, Object> result = processInstanceService.queryParentInstanceBySubId(loginUser, projectName, subId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR.getMsg(),e);
-            return error(Status.QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR.getCode(), Status.QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -313,15 +288,11 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/view-variables")
     @ResponseStatus(HttpStatus.OK)
-    public Result viewVariables(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser
+    @ApiException(QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR)
-            , @RequestParam("processInstanceId") Integer processInstanceId){
+    public Result viewVariables(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-        try{
+                                @RequestParam("processInstanceId") Integer processInstanceId) throws Exception {
         Map<String, Object> result = processInstanceService.viewVariables(processInstanceId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR.getMsg(),e);
-            return error(Status.QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR.getCode(), Status.QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR.getMsg());
-        }
     }
 
     /**
@@ -338,16 +309,12 @@ public class ProcessInstanceController extends BaseController{
     })
     @GetMapping(value = "/view-gantt")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR)
     public Result viewTree(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                            @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
-                                                   @RequestParam("processInstanceId") Integer processInstanceId){
+                           @RequestParam("processInstanceId") Integer processInstanceId) throws Exception {
-        try{
         Map<String, Object> result = processInstanceService.viewGantt(processInstanceId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR.getMsg(),e);
-            return error(Status.ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR.getCode(),ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -361,11 +328,11 @@ public class ProcessInstanceController extends BaseController{
      */
     @GetMapping(value = "/batch-delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR)
     public Result batchDeleteProcessInstanceByIds(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                   @PathVariable String projectName,
                                                   @RequestParam("processInstanceIds") String processInstanceIds
     ) {
-        try{
         logger.info("delete process instance by ids, login user:{}, project name:{}, process instance ids :{}",
                 loginUser.getUserName(), projectName, processInstanceIds);
         // task queue
@@ -394,9 +361,5 @@ public class ProcessInstanceController extends BaseController{
         }
 
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR.getMsg(),e);
-            return error(Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR.getCode(), Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java

@@ -17,7 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
-import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
 import org.apache.dolphinscheduler.api.service.ProjectService;
 import org.apache.dolphinscheduler.api.utils.Result;
@@ -71,18 +71,14 @@ public class ProjectController extends BaseController {
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_PROJECT_ERROR)
     public Result createProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam("projectName") String projectName,
                                 @RequestParam(value = "description", required = false) String description) {
 
-        try {
         logger.info("login user {}, create project name: {}, desc: {}", loginUser.getUserName(), projectName, description);
         Map<String, Object> result = projectService.createProject(loginUser, projectName, description);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(CREATE_PROJECT_ERROR.getMsg(), e);
-            return error(CREATE_PROJECT_ERROR.getCode(), CREATE_PROJECT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -102,18 +98,14 @@ public class ProjectController extends BaseController {
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_PROJECT_ERROR)
     public Result updateProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam("projectId") Integer projectId,
                                 @RequestParam("projectName") String projectName,
                                 @RequestParam(value = "description", required = false) String description) {
-        try {
         logger.info("login user {} , updateProcessInstance project name: {}, desc: {}", loginUser.getUserName(), projectName, description);
         Map<String, Object> result = projectService.update(loginUser, projectId, projectName, description);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(UPDATE_PROJECT_ERROR.getMsg(), e);
-            return error(UPDATE_PROJECT_ERROR.getCode(), UPDATE_PROJECT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -129,17 +121,13 @@ public class ProjectController extends BaseController {
     })
     @GetMapping(value = "/query-by-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROJECT_DETAILS_BY_ID_ERROR)
     public Result queryProjectById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("projectId") Integer projectId) {
         logger.info("login user {}, query project by id: {}", loginUser.getUserName(), projectId);
 
-        try {
         Map<String, Object> result = projectService.queryById(projectId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_PROJECT_DETAILS_BY_ID_ERROR.getMsg(), e);
-            return error(QUERY_PROJECT_DETAILS_BY_ID_ERROR.getCode(), QUERY_PROJECT_DETAILS_BY_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -159,21 +147,17 @@ public class ProjectController extends BaseController {
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR)
     public Result queryProjectListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                          @RequestParam(value = "searchVal", required = false) String searchVal,
                                          @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("pageNo") Integer pageNo
     ) {
 
-        try {
         logger.info("login user {}, query project list paging", loginUser.getUserName());
         searchVal = ParameterUtils.handleEscapes(searchVal);
         Map<String, Object> result = projectService.queryProjectListPaging(loginUser, pageSize, pageNo, searchVal);
         return returnDataListPaging(result);
-        } catch (Exception e) {
-            logger.error(LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg(), e);
-            return error(Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getCode(), Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
     /**
@@ -189,18 +173,14 @@ public class ProjectController extends BaseController {
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_PROJECT_ERROR)
     public Result deleteProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam("projectId") Integer projectId
     ) {
 
-        try {
         logger.info("login user {}, delete project: {}.", loginUser.getUserName(), projectId);
         Map<String, Object> result = projectService.deleteProject(loginUser, projectId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(DELETE_PROJECT_ERROR.getMsg(), e);
-            return error(DELETE_PROJECT_ERROR.getCode(), DELETE_PROJECT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -216,16 +196,12 @@ public class ProjectController extends BaseController {
     })
     @GetMapping(value = "/unauth-project")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_UNAUTHORIZED_PROJECT_ERROR)
     public Result queryUnauthorizedProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                            @RequestParam("userId") Integer userId) {
-        try {
         logger.info("login user {}, query unauthorized project by user id: {}.", loginUser.getUserName(), userId);
         Map<String, Object> result = projectService.queryUnauthorizedProject(loginUser, userId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_UNAUTHORIZED_PROJECT_ERROR.getMsg(), e);
-            return error(QUERY_UNAUTHORIZED_PROJECT_ERROR.getCode(), QUERY_UNAUTHORIZED_PROJECT_ERROR.getMsg());
-        }
     }
 
 
@@ -242,64 +218,53 @@ public class ProjectController extends BaseController {
     })
     @GetMapping(value = "/authed-project")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_AUTHORIZED_PROJECT)
     public Result queryAuthorizedProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                          @RequestParam("userId") Integer userId) {
-        try {
         logger.info("login user {}, query authorized project by user id: {}.", loginUser.getUserName(), userId);
         Map<String, Object> result = projectService.queryAuthorizedProject(loginUser, userId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_AUTHORIZED_PROJECT.getMsg(), e);
-            return error(QUERY_AUTHORIZED_PROJECT.getCode(), QUERY_AUTHORIZED_PROJECT.getMsg());
-        }
     }
 
     /**
      * import process definition
+     *
      * @param loginUser   login user
      * @param file        resource file
      * @param projectName project name
      * @return import result code
      */
-    @ApiOperation(value = "importProcessDefinition", notes= "EXPORT_PROCCESS_DEFINITION_NOTES")
+
+    @ApiOperation(value = "importProcessDefinition", notes= "EXPORT_PROCESS_DEFINITION_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required = true, dataType = "MultipartFile")
     })
     @PostMapping(value = "/import-definition")
+    @ApiException(IMPORT_PROCESS_DEFINE_ERROR)
     public Result importProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                           @RequestParam("file") MultipartFile file,
                                           @RequestParam("projectName") String projectName) {
-        try{
         logger.info("import process definition by id, login user:{}, project: {}",
                 loginUser.getUserName(), projectName);
         Map<String, Object> result = processDefinitionService.importProcessDefinition(loginUser, file, projectName);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(IMPORT_PROCESS_DEFINE_ERROR.getMsg(),e);
-            return error(IMPORT_PROCESS_DEFINE_ERROR.getCode(), IMPORT_PROCESS_DEFINE_ERROR.getMsg());
-        }
     }
 
     /**
      * query all project list
+     *
      * @param loginUser login user
      * @return all project list
      */
     @ApiOperation(value = "queryAllProjectList", notes = "QUERY_ALL_PROJECT_LIST_NOTES")
     @GetMapping(value = "/query-project-list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR)
     public Result queryAllProjectList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
-
-        try {
         logger.info("login user {}, query all project list", loginUser.getUserName());
         Map<String, Object> result = projectService.queryAllProjectList();
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg(), e);
-            return error(Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getCode(), Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
 
-
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java

@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.QueueService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -36,6 +37,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * queue controller
@@ -53,25 +56,23 @@ public class QueueController extends BaseController{
 
     /**
      * query queue list
+     *
      * @param loginUser login user
      * @return queue list
      */
     @ApiOperation(value = "queryList", notes = "QUERY_QUEUE_LIST_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_QUEUE_LIST_ERROR)
     public Result queryList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
-        try{
         logger.info("login user {}, query queue list", loginUser.getUserName());
         Map<String, Object> result = queueService.queryList(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_QUEUE_LIST_ERROR.getMsg(),e);
-            return error(Status.QUERY_QUEUE_LIST_ERROR.getCode(), Status.QUERY_QUEUE_LIST_ERROR.getMsg());
-        }
     }
 
     /**
      * query queue list paging
+     *
      * @param loginUser login user
      * @param pageNo    page number
      * @param searchVal search value
@@ -86,11 +87,11 @@ public class QueueController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_QUEUE_LIST_ERROR)
     public Result queryQueueListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                        @RequestParam("pageNo") Integer pageNo,
                                        @RequestParam(value = "searchVal", required = false) String searchVal,
                                        @RequestParam("pageSize") Integer pageSize) {
-        try{
         logger.info("login user {}, query queue list,search value:{}", loginUser.getUserName(), searchVal);
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
@@ -100,10 +101,6 @@ public class QueueController extends BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = queueService.queryList(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_QUEUE_LIST_ERROR.getMsg(),e);
-            return error(Status.QUERY_QUEUE_LIST_ERROR.getCode(), Status.QUERY_QUEUE_LIST_ERROR.getMsg());
-        }
     }
 
     /**
@@ -121,19 +118,14 @@ public class QueueController extends BaseController{
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_QUEUE_ERROR)
     public Result createQueue(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                               @RequestParam(value = "queue") String queue,
                               @RequestParam(value = "queueName") String queueName) {
         logger.info("login user {}, create queue, queue: {}, queueName: {}",
                 loginUser.getUserName(), queue, queueName);
-        try {
         Map<String, Object> result = queueService.createQueue(loginUser, queue, queueName);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.CREATE_QUEUE_ERROR.getMsg(),e);
-            return error(Status.CREATE_QUEUE_ERROR.getCode(), Status.CREATE_QUEUE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -153,20 +145,15 @@ public class QueueController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(UPDATE_QUEUE_ERROR)
     public Result updateQueue(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                               @RequestParam(value = "id") int id,
                               @RequestParam(value = "queue") String queue,
                               @RequestParam(value = "queueName") String queueName) {
         logger.info("login user {}, update queue, id: {}, queue: {}, queueName: {}",
                 loginUser.getUserName(), id, queue, queueName);
-        try {
         Map<String, Object> result = queueService.updateQueue(loginUser, id, queue, queueName);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.UPDATE_QUEUE_ERROR.getMsg(),e);
-            return error(Status.UPDATE_QUEUE_ERROR.getCode(), Status.UPDATE_QUEUE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -185,19 +172,15 @@ public class QueueController extends BaseController{
     })
     @PostMapping(value = "/verify-queue")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_QUEUE_ERROR)
     public Result verifyQueue(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                               @RequestParam(value = "queue") String queue,
                               @RequestParam(value = "queueName") String queueName
     ) {
 
-        try{
         logger.info("login user {}, verfiy queue: {} queue name: {}",
                 loginUser.getUserName(), queue, queueName);
         return queueService.verifyQueue(queue, queueName);
-        }catch (Exception e){
-            logger.error(Status.VERIFY_QUEUE_ERROR.getMsg(),e);
-            return error(Status.VERIFY_QUEUE_ERROR.getCode(), Status.VERIFY_QUEUE_ERROR.getMsg());
-        }
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.ResourcesService;
 import org.apache.dolphinscheduler.api.service.UdfFuncService;
 import org.apache.dolphinscheduler.api.utils.Result;
@@ -44,6 +45,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 
 import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * resources controller
  */
@@ -71,7 +73,6 @@ public class ResourcesController extends BaseController{
      */
 
     /**
-     *
      * @param loginUser   login user
      * @param type        type
      * @param alias       alias
@@ -88,20 +89,16 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required = true, dataType = "MultipartFile")
     })
     @PostMapping(value = "/directory/create")
+    @ApiException(CREATE_RESOURCE_ERROR)
     public Result createDirectory(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                   @RequestParam(value = "type") ResourceType type,
                                   @RequestParam(value = "name") String alias,
                                   @RequestParam(value = "description", required = false) String description,
                                   @RequestParam(value = "pid") int pid,
                                   @RequestParam(value = "currentDir") String currentDir) {
-        try {
         logger.info("login user {}, create resource, type: {}, resource alias: {}, desc: {}, file: {},{}",
                 loginUser.getUserName(), type, alias, description, pid, currentDir);
         return resourceService.createDirectory(loginUser, alias, description, type, pid, currentDir);
-        } catch (Exception e) {
-            logger.error(CREATE_RESOURCE_ERROR.getMsg(),e);
-            return error(CREATE_RESOURCE_ERROR.getCode(), CREATE_RESOURCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -122,6 +119,7 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required = true, dataType = "MultipartFile")
     })
     @PostMapping(value = "/create")
+    @ApiException(CREATE_RESOURCE_ERROR)
     public Result createResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam(value = "type") ResourceType type,
                                  @RequestParam(value = "name") String alias,
@@ -129,14 +127,9 @@ public class ResourcesController extends BaseController{
                                  @RequestParam("file") MultipartFile file,
                                  @RequestParam(value = "pid") int pid,
                                  @RequestParam(value = "currentDir") String currentDir) {
-        try {
         logger.info("login user {}, create resource, type: {}, resource alias: {}, desc: {}, file: {},{}",
                 loginUser.getUserName(), type, alias, description, file.getName(), file.getOriginalFilename());
         return resourceService.createResource(loginUser, alias, description, type, file, pid, currentDir);
-        } catch (Exception e) {
-            logger.error(CREATE_RESOURCE_ERROR.getMsg(),e);
-            return error(CREATE_RESOURCE_ERROR.getCode(), CREATE_RESOURCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -157,19 +150,15 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "description", value = "RESOURCE_DESC", dataType = "String")
     })
     @PostMapping(value = "/update")
+    @ApiException(UPDATE_RESOURCE_ERROR)
     public Result updateResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam(value = "id") int resourceId,
                                  @RequestParam(value = "type") ResourceType type,
                                  @RequestParam(value = "name") String alias,
                                  @RequestParam(value = "description", required = false) String description) {
-        try {
         logger.info("login user {}, update resource, type: {}, resource alias: {}, desc: {}",
                 loginUser.getUserName(), type, alias, description);
         return resourceService.updateResource(loginUser, resourceId, alias, description, type);
-        } catch (Exception e) {
-            logger.error(UPDATE_RESOURCE_ERROR.getMsg(),e);
-            return error(Status.UPDATE_RESOURCE_ERROR.getCode(), Status.UPDATE_RESOURCE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -185,17 +174,13 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_RESOURCES_LIST_ERROR)
     public Result queryResourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam(value = "type") ResourceType type
     ) {
-        try{
         logger.info("query resource list, login user:{}, resource type:{}", loginUser.getUserName(), type);
         Map<String, Object> result = resourceService.queryResourceList(loginUser, type);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_RESOURCES_LIST_ERROR.getMsg(),e);
-            return error(Status.QUERY_RESOURCES_LIST_ERROR.getCode(), Status.QUERY_RESOURCES_LIST_ERROR.getMsg());
-        }
     }
 
     /**
@@ -218,6 +203,7 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_RESOURCES_LIST_PAGING)
     public Result queryResourceListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                           @RequestParam(value = "type") ResourceType type,
                                           @RequestParam(value = "id") int id,
@@ -225,7 +211,6 @@ public class ResourcesController extends BaseController{
                                           @RequestParam(value = "searchVal", required = false) String searchVal,
                                           @RequestParam("pageSize") Integer pageSize
     ) {
-        try{
         logger.info("query resource list, login user:{}, resource type:{}, search value:{}",
                 loginUser.getUserName(), type, searchVal);
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
@@ -236,10 +221,6 @@ public class ResourcesController extends BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = resourceService.queryResourceListPaging(loginUser, id, type, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(QUERY_RESOURCES_LIST_PAGING.getMsg(),e);
-            return error(Status.QUERY_RESOURCES_LIST_PAGING.getCode(), Status.QUERY_RESOURCES_LIST_PAGING.getMsg());
-        }
     }
 
 
@@ -256,17 +237,13 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_RESOURCE_ERROR)
     public Result deleteResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam(value = "id") int resourceId
-    ) {
+    ) throws Exception {
-        try{
         logger.info("login user {}, delete resource id: {}",
                 loginUser.getUserName(), resourceId);
         return resourceService.delete(loginUser, resourceId);
-        }catch (Exception e){
-            logger.error(DELETE_RESOURCE_ERROR.getMsg(),e);
-            return error(Status.DELETE_RESOURCE_ERROR.getCode(), Status.DELETE_RESOURCE_ERROR.getMsg());
-        }
     }
 
 
@@ -285,19 +262,15 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/verify-name")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_RESOURCE_BY_NAME_AND_TYPE_ERROR)
     public Result verifyResourceName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                      @RequestParam(value = "fullName") String fullName,
                                      @RequestParam(value = "type") ResourceType type
     ) {
-        try {
         logger.info("login user {}, verfiy resource alias: {},resource type: {}",
                 loginUser.getUserName(), fullName, type);
 
         return resourceService.verifyResourceName(fullName, type, loginUser);
-        } catch (Exception e) {
-            logger.error(VERIFY_RESOURCE_BY_NAME_AND_TYPE_ERROR.getMsg(), e);
-            return error(Status.VERIFY_RESOURCE_BY_NAME_AND_TYPE_ERROR.getCode(), Status.VERIFY_RESOURCE_BY_NAME_AND_TYPE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -313,17 +286,13 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/list/jar")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_RESOURCES_LIST_ERROR)
     public Result queryResourceJarList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                        @RequestParam(value = "type") ResourceType type
     ) {
-        try{
         logger.info("query resource list, login user:{}, resource type:{}", loginUser.getUserName(), type.toString());
         Map<String, Object> result = resourceService.queryResourceJarList(loginUser, type);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_RESOURCES_LIST_ERROR.getMsg(),e);
-            return error(Status.QUERY_RESOURCES_LIST_ERROR.getCode(), Status.QUERY_RESOURCES_LIST_ERROR.getMsg());
-        }
     }
 
     /**
@@ -341,20 +310,16 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/queryResource")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(RESOURCE_NOT_EXIST)
     public Result queryResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "fullName", required = false) String fullName,
                                 @RequestParam(value = "id", required = false) Integer id,
                                 @RequestParam(value = "type") ResourceType type
     ) {
-        try {
         logger.info("login user {}, query resource by full name: {} or id: {},resource type: {}",
                 loginUser.getUserName(), fullName, id, type);
 
         return resourceService.queryResource(fullName, id, type);
-        } catch (Exception e) {
-            logger.error(RESOURCE_NOT_EXIST.getMsg(), e);
-            return error(Status.RESOURCE_NOT_EXIST.getCode(), Status.RESOURCE_NOT_EXIST.getMsg());
-        }
     }
 
     /**
@@ -373,20 +338,16 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "limit", value = "LIMIT", required = true, dataType = "Int", example = "100")
     })
     @GetMapping(value = "/view")
+    @ApiException(VIEW_RESOURCE_FILE_ON_LINE_ERROR)
     public Result viewResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                @RequestParam(value = "id") int resourceId,
                                @RequestParam(value = "skipLineNum") int skipLineNum,
                                @RequestParam(value = "limit") int limit
     ) {
-        try{
         logger.info("login user {}, view resource : {}, skipLineNum {} , limit {}",
                 loginUser.getUserName(), resourceId, skipLineNum, limit);
 
         return resourceService.readResource(resourceId, skipLineNum, limit);
-        }catch (Exception e){
-            logger.error(VIEW_RESOURCE_FILE_ON_LINE_ERROR.getMsg(),e);
-            return error(Status.VIEW_RESOURCE_FILE_ON_LINE_ERROR.getCode(), Status.VIEW_RESOURCE_FILE_ON_LINE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -409,6 +370,7 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "content", value = "CONTENT", required = true, dataType = "String")
     })
     @PostMapping(value = "/online-create")
+    @ApiException(CREATE_RESOURCE_FILE_ON_LINE_ERROR)
     public Result onlineCreateResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                        @RequestParam(value = "type") ResourceType type,
                                        @RequestParam(value = "fileName") String fileName,
@@ -418,7 +380,6 @@ public class ResourcesController extends BaseController{
                                        @RequestParam(value = "pid") int pid,
                                        @RequestParam(value = "currentDir") String currentDir
     ) {
-        try{
         logger.info("login user {}, online create resource! fileName : {}, type : {}, suffix : {},desc : {},content : {}",
                 loginUser.getUserName(), fileName, type, fileSuffix, description, content, pid, currentDir);
         if (StringUtils.isEmpty(content)) {
@@ -426,10 +387,6 @@ public class ResourcesController extends BaseController{
             return error(Status.RESOURCE_FILE_IS_EMPTY.getCode(), RESOURCE_FILE_IS_EMPTY.getMsg());
         }
         return resourceService.onlineCreateResource(loginUser, type, fileName, fileSuffix, description, content, pid, currentDir);
-        }catch (Exception e){
-            logger.error(CREATE_RESOURCE_FILE_ON_LINE_ERROR.getMsg(),e);
-            return error(Status.CREATE_RESOURCE_FILE_ON_LINE_ERROR.getCode(), Status.CREATE_RESOURCE_FILE_ON_LINE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -446,11 +403,11 @@ public class ResourcesController extends BaseController{
             @ApiImplicitParam(name = "content", value = "CONTENT", required = true, dataType = "String")
     })
     @PostMapping(value = "/update-content")
+    @ApiException(EDIT_RESOURCE_FILE_ON_LINE_ERROR)
     public Result updateResourceContent(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @RequestParam(value = "id") int resourceId,
                                         @RequestParam(value = "content") String content
     ) {
-        try{
         logger.info("login user {}, updateProcessInstance resource : {}",
                 loginUser.getUserName(), resourceId);
         if (StringUtils.isEmpty(content)) {
@@ -458,10 +415,6 @@ public class ResourcesController extends BaseController{
             return error(Status.RESOURCE_FILE_IS_EMPTY.getCode(), RESOURCE_FILE_IS_EMPTY.getMsg());
         }
         return resourceService.updateResourceContent(resourceId, content);
-        }catch (Exception e){
-            logger.error(EDIT_RESOURCE_FILE_ON_LINE_ERROR.getMsg(),e);
-            return error(Status.EDIT_RESOURCE_FILE_ON_LINE_ERROR.getCode(), Status.EDIT_RESOURCE_FILE_ON_LINE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -477,9 +430,9 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/download")
     @ResponseBody
+    @ApiException(DOWNLOAD_RESOURCE_FILE_ERROR)
     public ResponseEntity downloadResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                           @RequestParam(value = "id") int resourceId) {
+                                           @RequestParam(value = "id") int resourceId) throws Exception {
-        try{
         logger.info("login user {}, download resource : {}",
                 loginUser.getUserName(), resourceId);
         Resource file = resourceService.downloadResource(resourceId);
@@ -490,18 +443,12 @@ public class ResourcesController extends BaseController{
                 .ok()
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getFilename() + "\"")
                 .body(file);
-        }catch (RuntimeException e){
-            logger.error(e.getMessage(),e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
-        }catch (Exception e){
-            logger.error(DOWNLOAD_RESOURCE_FILE_ERROR.getMsg(),e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Status.DOWNLOAD_RESOURCE_FILE_ERROR.getMsg());
-        }
     }
 
 
     /**
      * create udf function
+     *
      * @param loginUser   login user
      * @param type        udf type
      * @param funcName    function name
@@ -525,6 +472,7 @@ public class ResourcesController extends BaseController{
     })
     @PostMapping(value = "/udf-func/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_UDF_FUNCTION_ERROR)
     public Result createUdfFunc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "type") UdfType type,
                                 @RequestParam(value = "funcName") String funcName,
@@ -535,12 +483,7 @@ public class ResourcesController extends BaseController{
                                 @RequestParam(value = "resourceId") int resourceId) {
         logger.info("login user {}, create udf function, type: {},  funcName: {},argTypes: {} ,database: {},desc: {},resourceId: {}",
                 loginUser.getUserName(), type, funcName, argTypes, database, description, resourceId);
-        try {
         return udfFuncService.createUdfFunction(loginUser, funcName, className, argTypes, database, description, type, resourceId);
-        } catch (Exception e) {
-            logger.error(CREATE_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.CREATE_UDF_FUNCTION_ERROR.getCode(), Status.CREATE_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -557,17 +500,13 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/udf-func/update-ui")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VIEW_UDF_FUNCTION_ERROR)
     public Result viewUIUdfFunction(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam("id") int id) {
         logger.info("login user {}, query udf{}",
                 loginUser.getUserName(), id);
-        try {
         Map<String, Object> map = udfFuncService.queryUdfFuncDetail(id);
         return returnDataList(map);
-        } catch (Exception e) {
-            logger.error(VIEW_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.VIEW_UDF_FUNCTION_ERROR.getCode(), Status.VIEW_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -596,6 +535,7 @@ public class ResourcesController extends BaseController{
 
     })
     @PostMapping(value = "/udf-func/update")
+    @ApiException(UPDATE_UDF_FUNCTION_ERROR)
     public Result updateUdfFunc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "id") int udfFuncId,
                                 @RequestParam(value = "type") UdfType type,
@@ -605,15 +545,10 @@ public class ResourcesController extends BaseController{
                                 @RequestParam(value = "database", required = false) String database,
                                 @RequestParam(value = "description", required = false) String description,
                                 @RequestParam(value = "resourceId") int resourceId) {
-        try {
         logger.info("login user {}, updateProcessInstance udf function id: {},type: {},  funcName: {},argTypes: {} ,database: {},desc: {},resourceId: {}",
                 loginUser.getUserName(), udfFuncId, type, funcName, argTypes, database, description, resourceId);
         Map<String, Object> result = udfFuncService.updateUdfFunc(udfFuncId, funcName, className, argTypes, database, description, type, resourceId);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(UPDATE_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.UPDATE_UDF_FUNCTION_ERROR.getCode(), Status.UPDATE_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -633,12 +568,12 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/udf-func/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_UDF_FUNCTION_LIST_PAGING_ERROR)
     public Result queryUdfFuncList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("pageNo") Integer pageNo,
                                    @RequestParam(value = "searchVal", required = false) String searchVal,
                                    @RequestParam("pageSize") Integer pageSize
     ) {
-        try{
         logger.info("query udf functions list, login user:{},search value:{}",
                 loginUser.getUserName(), searchVal);
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
@@ -648,10 +583,6 @@ public class ResourcesController extends BaseController{
 
         result = udfFuncService.queryUdfFuncListPaging(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(QUERY_UDF_FUNCTION_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_UDF_FUNCTION_LIST_PAGING_ERROR.getCode(), Status.QUERY_UDF_FUNCTION_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
     /**
@@ -667,16 +598,12 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/udf-func/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATASOURCE_BY_TYPE_ERROR)
     public Result queryResourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam("type") UdfType type) {
-        try{
         logger.info("query datasource list, user:{}, type:{}", loginUser.getUserName(), type);
         Map<String, Object> result = udfFuncService.queryResourceList(loginUser, type.ordinal());
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(QUERY_DATASOURCE_BY_TYPE_ERROR.getMsg(),e);
-            return error(Status.QUERY_DATASOURCE_BY_TYPE_ERROR.getCode(),QUERY_DATASOURCE_BY_TYPE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -693,19 +620,14 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/udf-func/verify-name")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_UDF_FUNCTION_NAME_ERROR)
     public Result verifyUdfFuncName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam(value = "name") String name
     ) {
         logger.info("login user {}, verfiy udf function name: {}",
                 loginUser.getUserName(), name);
 
-        try{
-
         return udfFuncService.verifyUdfFuncByName(name);
-        }catch (Exception e){
-            logger.error(VERIFY_UDF_FUNCTION_NAME_ERROR.getMsg(),e);
-            return error(Status.VERIFY_UDF_FUNCTION_NAME_ERROR.getCode(), Status.VERIFY_UDF_FUNCTION_NAME_ERROR.getMsg());
-        }
     }
 
     /**
@@ -721,17 +643,12 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/udf-func/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_UDF_FUNCTION_ERROR)
     public Result deleteUdfFunc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "id") int udfFuncId
     ) {
-        try{
-
         logger.info("login user {}, delete udf function id: {}", loginUser.getUserName(), udfFuncId);
         return udfFuncService.delete(udfFuncId);
-        }catch (Exception e){
-            logger.error(DELETE_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.DELETE_UDF_FUNCTION_ERROR.getCode(), Status.DELETE_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 
     /**
@@ -747,16 +664,12 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/authed-file")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(AUTHORIZED_FILE_RESOURCE_ERROR)
     public Result authorizedFile(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam("userId") Integer userId) {
-        try{
         logger.info("authorized file resource, user: {}, user id:{}", loginUser.getUserName(), userId);
         Map<String, Object> result = resourceService.authorizedFile(loginUser, userId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(AUTHORIZED_FILE_RESOURCE_ERROR.getMsg(),e);
-            return error(Status.AUTHORIZED_FILE_RESOURCE_ERROR.getCode(), Status.AUTHORIZED_FILE_RESOURCE_ERROR.getMsg());
-        }
     }
 
 
@@ -773,16 +686,12 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/authorize-resource-tree")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(AUTHORIZE_RESOURCE_TREE)
     public Result authorizeResourceTree(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @RequestParam("userId") Integer userId) {
-        try{
         logger.info("all resource file, user:{}, user id:{}", loginUser.getUserName(), userId);
         Map<String, Object> result = resourceService.authorizeResourceTree(loginUser, userId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(AUTHORIZE_RESOURCE_TREE.getMsg(),e);
-            return error(Status.AUTHORIZE_RESOURCE_TREE.getCode(), Status.AUTHORIZE_RESOURCE_TREE.getMsg());
-        }
     }
 
 
@@ -799,17 +708,13 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/unauth-udf-func")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(UNAUTHORIZED_UDF_FUNCTION_ERROR)
     public Result unauthUDFFunc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam("userId") Integer userId) {
-        try{
         logger.info("unauthorized udf function, login user:{}, unauthorized user id:{}", loginUser.getUserName(), userId);
 
         Map<String, Object> result = resourceService.unauthorizedUDFFunction(loginUser, userId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(UNAUTHORIZED_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.UNAUTHORIZED_UDF_FUNCTION_ERROR.getCode(), Status.UNAUTHORIZED_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 
 
@@ -826,15 +731,11 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value = "/authed-udf-func")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(AUTHORIZED_UDF_FUNCTION_ERROR)
     public Result authorizedUDFFunction(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @RequestParam("userId") Integer userId) {
-        try{
         logger.info("auth udf function, login user:{}, auth user id:{}", loginUser.getUserName(), userId);
         Map<String, Object> result = resourceService.authorizedUDFFunction(loginUser, userId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(AUTHORIZED_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.AUTHORIZED_UDF_FUNCTION_ERROR.getCode(), Status.AUTHORIZED_UDF_FUNCTION_ERROR.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java

@@ -17,7 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
-import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.SchedulerService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.enums.FailureStrategy;
@@ -34,6 +34,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.io.IOException;
 import java.util.Map;
 
 import static org.apache.dolphinscheduler.api.enums.Status.*;
@@ -87,6 +88,7 @@ public class SchedulerController extends BaseController {
     })
     @PostMapping("/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_SCHEDULE_ERROR)
     public Result createSchedule(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                                  @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                  @RequestParam(value = "processDefinitionId") Integer processDefinitionId,
@@ -97,20 +99,15 @@ public class SchedulerController extends BaseController {
                                  @RequestParam(value = "receivers", required = false) String receivers,
                                  @RequestParam(value = "receiversCc", required = false) String receiversCc,
                                  @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
-                                 @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority) {
+                                 @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority) throws IOException {
         logger.info("login user {}, project name: {}, process name: {}, create schedule: {}, warning type: {}, warning group id: {}," +
                         "failure policy: {},receivers : {},receiversCc : {},processInstancePriority : {}, workGroupId:{}",
                 loginUser.getUserName(), projectName, processDefinitionId, schedule, warningType, warningGroupId,
                 failureStrategy, receivers, receiversCc, processInstancePriority, workerGroup);
-        try {
         Map<String, Object> result = schedulerService.insertSchedule(loginUser, projectName, processDefinitionId, schedule,
                 warningType, warningGroupId, failureStrategy, receivers, receiversCc, processInstancePriority, workerGroup);
 
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(CREATE_SCHEDULE_ERROR.getMsg(), e);
-            return error(CREATE_SCHEDULE_ERROR.getCode(), CREATE_SCHEDULE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -142,6 +139,7 @@ public class SchedulerController extends BaseController {
             @ApiImplicitParam(name = "processInstancePriority", value = "PROCESS_INSTANCE_PRIORITY", type = "Priority"),
     })
     @PostMapping("/update")
+    @ApiException(UPDATE_SCHEDULE_ERROR)
     public Result updateSchedule(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                                  @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                  @RequestParam(value = "id") Integer id,
@@ -152,21 +150,15 @@ public class SchedulerController extends BaseController {
                                  @RequestParam(value = "receivers", required = false) String receivers,
                                  @RequestParam(value = "receiversCc", required = false) String receiversCc,
                                  @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
-                                 @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority) {
+                                 @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority) throws IOException {
         logger.info("login user {}, project name: {},id: {}, updateProcessInstance schedule: {}, notify type: {}, notify mails: {}, " +
                         "failure policy: {},receivers : {},receiversCc : {},processInstancePriority : {},workerGroupId:{}",
                 loginUser.getUserName(), projectName, id, schedule, warningType, warningGroupId, failureStrategy,
                 receivers, receiversCc, processInstancePriority, workerGroup);
 
-        try {
         Map<String, Object> result = schedulerService.updateSchedule(loginUser, projectName, id, schedule,
                 warningType, warningGroupId, failureStrategy, receivers, receiversCc, null, processInstancePriority, workerGroup);
         return returnDataList(result);
-
-        } catch (Exception e) {
-            logger.error(UPDATE_SCHEDULE_ERROR.getMsg(), e);
-            return error(Status.UPDATE_SCHEDULE_ERROR.getCode(), Status.UPDATE_SCHEDULE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -182,19 +174,14 @@ public class SchedulerController extends BaseController {
             @ApiImplicitParam(name = "id", value = "SCHEDULE_ID", required = true, dataType = "Int", example = "100")
     })
     @PostMapping("/online")
+    @ApiException(PUBLISH_SCHEDULE_ONLINE_ERROR)
     public Result online(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                          @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable("projectName") String projectName,
                          @RequestParam("id") Integer id) {
         logger.info("login user {}, schedule setScheduleState, project name: {}, id: {}",
                 loginUser.getUserName(), projectName, id);
-        try {
         Map<String, Object> result = schedulerService.setScheduleState(loginUser, projectName, id, ReleaseState.ONLINE);
         return returnDataList(result);
-
-        } catch (Exception e) {
-            logger.error(PUBLISH_SCHEDULE_ONLINE_ERROR.getMsg(), e);
-            return error(Status.PUBLISH_SCHEDULE_ONLINE_ERROR.getCode(), Status.PUBLISH_SCHEDULE_ONLINE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -210,20 +197,15 @@ public class SchedulerController extends BaseController {
             @ApiImplicitParam(name = "id", value = "SCHEDULE_ID", required = true, dataType = "Int", example = "100")
     })
     @PostMapping("/offline")
+    @ApiException(OFFLINE_SCHEDULE_ERROR)
     public Result offline(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                           @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable("projectName") String projectName,
                           @RequestParam("id") Integer id) {
         logger.info("login user {}, schedule offline, project name: {}, process definition id: {}",
                 loginUser.getUserName(), projectName, id);
 
-        try {
         Map<String, Object> result = schedulerService.setScheduleState(loginUser, projectName, id, ReleaseState.OFFLINE);
         return returnDataList(result);
-
-        } catch (Exception e) {
-            logger.error(OFFLINE_SCHEDULE_ERROR.getMsg(), e);
-            return error(Status.OFFLINE_SCHEDULE_ERROR.getCode(), Status.OFFLINE_SCHEDULE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -246,6 +228,7 @@ public class SchedulerController extends BaseController {
 
     })
     @GetMapping("/list-paging")
+    @ApiException(QUERY_SCHEDULE_LIST_PAGING_ERROR)
     public Result queryScheduleListPaging(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                                           @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                           @RequestParam Integer processDefinitionId,
@@ -254,15 +237,9 @@ public class SchedulerController extends BaseController {
                                           @RequestParam("pageSize") Integer pageSize) {
         logger.info("login user {}, query schedule, project name: {}, process definition id: {}",
                 loginUser.getUserName(), projectName, processDefinitionId);
-      try {
         searchVal = ParameterUtils.handleEscapes(searchVal);
         Map<String, Object> result = schedulerService.querySchedule(loginUser, projectName, processDefinitionId, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-       }catch (Exception e){
-          logger.error(QUERY_SCHEDULE_LIST_PAGING_ERROR.getMsg(),e);
-          return error(Status.QUERY_SCHEDULE_LIST_PAGING_ERROR.getCode(), Status.QUERY_SCHEDULE_LIST_PAGING_ERROR.getMsg());
-      }
-
     }
 
     /**
@@ -279,20 +256,17 @@ public class SchedulerController extends BaseController {
     })
     @GetMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_SCHEDULE_CRON_BY_ID_ERROR)
     public Result deleteScheduleById(@RequestAttribute(value = SESSION_USER) User loginUser,
                                      @PathVariable String projectName,
                                      @RequestParam("scheduleId") Integer scheduleId
     ) {
-        try{
         logger.info("delete schedule by id, login user:{}, project name:{}, schedule id:{}",
                 loginUser.getUserName(), projectName, scheduleId);
         Map<String, Object> result = schedulerService.deleteScheduleById(loginUser, projectName, scheduleId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(DELETE_SCHEDULE_CRON_BY_ID_ERROR.getMsg(),e);
-            return error(Status.DELETE_SCHEDULE_CRON_BY_ID_ERROR.getCode(), Status.DELETE_SCHEDULE_CRON_BY_ID_ERROR.getMsg());
-        }
     }
+
     /**
      * query schedule list
      *
@@ -302,17 +276,13 @@ public class SchedulerController extends BaseController {
      */
     @ApiOperation(value = "queryScheduleList", notes = "QUERY_SCHEDULE_LIST_NOTES")
     @PostMapping("/list")
+    @ApiException(QUERY_SCHEDULE_LIST_ERROR)
     public Result queryScheduleList(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                                     @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName) {
-        try {
         logger.info("login user {}, query schedule list, project name: {}",
                 loginUser.getUserName(), projectName);
         Map<String, Object> result = schedulerService.queryScheduleList(loginUser, projectName);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(QUERY_SCHEDULE_LIST_ERROR.getMsg(), e);
-            return error(Status.QUERY_SCHEDULE_LIST_ERROR.getCode(), Status.QUERY_SCHEDULE_LIST_ERROR.getMsg());
-        }
     }
 
     /**
@@ -329,18 +299,14 @@ public class SchedulerController extends BaseController {
     })
     @PostMapping("/preview")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(PREVIEW_SCHEDULE_ERROR)
     public Result previewSchedule(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser,
                                   @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                   @RequestParam(value = "schedule") String schedule
     ) {
         logger.info("login user {}, project name: {}, preview schedule: {}",
                 loginUser.getUserName(), projectName, schedule);
-        try {
         Map<String, Object> result = schedulerService.previewSchedule(loginUser, projectName, schedule);
         return returnDataList(result);
-        } catch (Exception e) {
-            logger.error(PREVIEW_SCHEDULE_ERROR.getMsg(), e);
-            return error(PREVIEW_SCHEDULE_ERROR.getCode(), PREVIEW_SCHEDULE_ERROR.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.TaskInstanceService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -24,7 +25,6 @@ import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.utils.ParameterUtils;
 import org.apache.dolphinscheduler.dao.entity.User;
 import io.swagger.annotations.*;
-import org.apache.dolphinscheduler.api.enums.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +34,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_TASK_LIST_PAGING_ERROR;
+
 /**
  * task instance controller
  */
@@ -79,6 +81,7 @@ public class TaskInstanceController extends BaseController{
     })
     @GetMapping("/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TASK_LIST_PAGING_ERROR)
     public Result queryTaskListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                       @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                       @RequestParam(value = "processInstanceId", required = false, defaultValue = "0") Integer processInstanceId,
@@ -92,18 +95,12 @@ public class TaskInstanceController extends BaseController{
                                       @RequestParam("pageNo") Integer pageNo,
                                       @RequestParam("pageSize") Integer pageSize) {
 
-        try{
         logger.info("query task instance list, project name:{},process instance:{}, search value:{},task name:{}, executor name: {},state type:{}, host:{}, start:{}, end:{}",
                 projectName, processInstanceId, searchVal, taskName, executorName, stateType, host, startTime, endTime);
         searchVal = ParameterUtils.handleEscapes(searchVal);
         Map<String, Object> result = taskInstanceService.queryTaskListPaging(
                 loginUser, projectName, processInstanceId, taskName, executorName, startTime, endTime, searchVal, stateType, host, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_TASK_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_TASK_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_LIST_PAGING_ERROR.getMsg());
-        }
-
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskRecordController.java

@@ -17,11 +17,11 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.TaskRecordService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.api.enums.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +31,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * data quality controller
  */
@@ -63,6 +65,7 @@ public class TaskRecordController extends BaseController{
      */
     @GetMapping("/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TASK_RECORD_LIST_PAGING_ERROR)
     public Result queryTaskRecordListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                             @RequestParam(value = "taskName", required = false) String taskName,
                                             @RequestParam(value = "state", required = false) String state,
@@ -75,16 +78,10 @@ public class TaskRecordController extends BaseController{
                                             @RequestParam("pageSize") Integer pageSize
     ) {
 
-   try{
         logger.info("query task record list, task name:{}, state :{}, taskDate: {}, start:{}, end:{}",
                 taskName, state, taskDate, startTime, endTime);
         Map<String, Object> result = taskRecordService.queryTaskRecordListPaging(false, taskName, startTime, taskDate, sourceTable, destTable, endTime, state, pageNo, pageSize);
         return returnDataListPaging(result);
-    }catch (Exception e){
-        logger.error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e);
-        return error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg());
-    }
-
     }
 
     /**
@@ -104,6 +101,7 @@ public class TaskRecordController extends BaseController{
      */
     @GetMapping("/history-list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TASK_RECORD_LIST_PAGING_ERROR)
     public Result queryHistoryTaskRecordListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                    @RequestParam(value = "taskName", required = false) String taskName,
                                                    @RequestParam(value = "state", required = false) String state,
@@ -116,16 +114,10 @@ public class TaskRecordController extends BaseController{
                                                    @RequestParam("pageSize") Integer pageSize
     ) {
 
-        try{
         logger.info("query hisotry task record list, task name:{}, state :{}, taskDate: {}, start:{}, end:{}",
                 taskName, state, taskDate, startTime, endTime);
         Map<String, Object> result = taskRecordService.queryTaskRecordListPaging(true, taskName, startTime, taskDate, sourceTable, destTable, endTime, state, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg());
-        }
-
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java

@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.TenantService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -36,6 +37,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * tenant controller
@@ -71,21 +74,16 @@ public class TenantController extends BaseController{
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_TENANT_ERROR)
     public Result createTenant(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                @RequestParam(value = "tenantCode") String tenantCode,
                                @RequestParam(value = "tenantName") String tenantName,
                                @RequestParam(value = "queueId") int queueId,
-                                                       @RequestParam(value = "description",required = false) String description) {
+                               @RequestParam(value = "description", required = false) String description) throws Exception {
         logger.info("login user {}, create tenant, tenantCode: {}, tenantName: {}, queueId: {}, desc: {}",
                 loginUser.getUserName(), tenantCode, tenantName, queueId, description);
-        try {
         Map<String, Object> result = tenantService.createTenant(loginUser, tenantCode, tenantName, queueId, description);
         return returnDataList(result);
-
-        }catch (Exception e){
-            logger.error(Status.CREATE_TENANT_ERROR.getMsg(),e);
-            return error(Status.CREATE_TENANT_ERROR.getCode(), Status.CREATE_TENANT_ERROR.getMsg());
-        }
     }
 
 
@@ -106,13 +104,13 @@ public class TenantController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TENANT_LIST_PAGING_ERROR)
     public Result queryTenantlistPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                         @RequestParam("pageNo") Integer pageNo,
                                         @RequestParam(value = "searchVal", required = false) String searchVal,
                                         @RequestParam("pageSize") Integer pageSize) {
         logger.info("login user {}, list paging, pageNo: {}, searchVal: {}, pageSize: {}",
                 loginUser.getUserName(), pageNo, searchVal, pageSize);
-        try{
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
             return returnDataListPaging(result);
@@ -120,10 +118,6 @@ public class TenantController extends BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = tenantService.queryTenantList(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_TENANT_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_TENANT_LIST_PAGING_ERROR.getCode(), Status.QUERY_TENANT_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
 
@@ -136,19 +130,14 @@ public class TenantController extends BaseController{
     @ApiOperation(value = "queryTenantlist", notes = "QUERY_TENANT_LIST_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_TENANT_LIST_ERROR)
     public Result queryTenantlist(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user {}, query tenant list", loginUser.getUserName());
-        try{
         Map<String, Object> result = tenantService.queryTenantList(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_TENANT_LIST_ERROR.getMsg(),e);
-            return error(Status.QUERY_TENANT_LIST_ERROR.getCode(), Status.QUERY_TENANT_LIST_ERROR.getMsg());
-        }
     }
 
 
-
     /**
      * udpate tenant
      *
@@ -171,21 +160,17 @@ public class TenantController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_TENANT_ERROR)
     public Result updateTenant(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                @RequestParam(value = "id") int id,
                                @RequestParam(value = "tenantCode") String tenantCode,
                                @RequestParam(value = "tenantName") String tenantName,
                                @RequestParam(value = "queueId") int queueId,
-                                                       @RequestParam(value = "description",required = false) String description) {
+                               @RequestParam(value = "description", required = false) String description) throws Exception {
         logger.info("login user {}, updateProcessInstance tenant, tenantCode: {}, tenantName: {}, queueId: {}, description: {}",
                 loginUser.getUserName(), tenantCode, tenantName, queueId, description);
-        try {
         Map<String, Object> result = tenantService.updateTenant(loginUser, id, tenantCode, tenantName, queueId, description);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.UPDATE_TENANT_ERROR.getMsg(),e);
-            return error(Status.UPDATE_TENANT_ERROR.getCode(), Status.UPDATE_TENANT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -202,16 +187,12 @@ public class TenantController extends BaseController{
     })
     @PostMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_TENANT_BY_ID_ERROR)
     public Result deleteTenantById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                   @RequestParam(value = "id") int id) {
+                                   @RequestParam(value = "id") int id) throws Exception {
         logger.info("login user {}, delete tenant, tenantId: {},", loginUser.getUserName(), id);
-        try {
         Map<String, Object> result = tenantService.deleteTenantById(loginUser, id);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.DELETE_TENANT_BY_ID_ERROR.getMsg(),e);
-            return error(Status.DELETE_TENANT_BY_ID_ERROR.getCode(), Status.DELETE_TENANT_BY_ID_ERROR.getMsg());
-        }
     }
 
 
@@ -228,18 +209,13 @@ public class TenantController extends BaseController{
     })
     @GetMapping(value = "/verify-tenant-code")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_TENANT_CODE_ERROR)
     public Result verifyTenantCode(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam(value = "tenantCode") String tenantCode
     ) {
-
-        try{
         logger.info("login user {}, verfiy tenant code: {}",
                 loginUser.getUserName(), tenantCode);
         return tenantService.verifyTenantCode(tenantCode);
-        }catch (Exception e){
-            logger.error(Status.VERIFY_TENANT_CODE_ERROR.getMsg(),e);
-            return error(Status.VERIFY_TENANT_CODE_ERROR.getCode(), Status.VERIFY_TENANT_CODE_ERROR.getMsg());
-        }
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.UsersService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -36,6 +37,8 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 
 /**
  * user controller
@@ -73,23 +76,19 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/create")
     @ResponseStatus(HttpStatus.CREATED)
+    @ApiException(CREATE_USER_ERROR)
     public Result createUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                              @RequestParam(value = "userName") String userName,
                              @RequestParam(value = "userPassword") String userPassword,
                              @RequestParam(value = "tenantId") int tenantId,
                              @RequestParam(value = "queue", required = false, defaultValue = "") String queue,
                              @RequestParam(value = "email") String email,
-                                                     @RequestParam(value = "phone", required = false) String phone) {
+                             @RequestParam(value = "phone", required = false) String phone) throws Exception {
         logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
                 loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue);
 
-        try {
         Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword, email, tenantId, phone, queue);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.CREATE_USER_ERROR.getMsg(),e);
-            return error(Status.CREATE_USER_ERROR.getCode(), Status.CREATE_USER_ERROR.getMsg());
-        }
     }
 
     /**
@@ -109,13 +108,13 @@ public class UsersController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_USER_LIST_PAGING_ERROR)
     public Result queryUserList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam("pageNo") Integer pageNo,
                                 @RequestParam(value = "searchVal", required = false) String searchVal,
                                 @RequestParam("pageSize") Integer pageSize) {
         logger.info("login user {}, list user paging, pageNo: {}, searchVal: {}, pageSize: {}",
                 loginUser.getUserName(), pageNo, searchVal, pageSize);
-        try{
         Map<String, Object> result = checkPageParams(pageNo, pageSize);
         if (result.get(Constants.STATUS) != Status.SUCCESS) {
             return returnDataListPaging(result);
@@ -123,10 +122,6 @@ public class UsersController extends BaseController{
         searchVal = ParameterUtils.handleEscapes(searchVal);
         result = usersService.queryUserList(loginUser, searchVal, pageNo, pageSize);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_USER_LIST_PAGING_ERROR.getMsg(),e);
-            return error(Status.QUERY_USER_LIST_PAGING_ERROR.getCode(), Status.QUERY_USER_LIST_PAGING_ERROR.getMsg());
-        }
     }
 
 
@@ -155,6 +150,7 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_USER_ERROR)
     public Result updateUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                              @RequestParam(value = "id") int id,
                              @RequestParam(value = "userName") String userName,
@@ -162,20 +158,16 @@ public class UsersController extends BaseController{
                              @RequestParam(value = "queue", required = false, defaultValue = "") String queue,
                              @RequestParam(value = "email") String email,
                              @RequestParam(value = "tenantId") int tenantId,
-                                                     @RequestParam(value = "phone", required = false) String phone) {
+                             @RequestParam(value = "phone", required = false) String phone) throws Exception {
         logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
                 loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone, queue);
-        try {
         Map<String, Object> result = usersService.updateUser(id, userName, userPassword, email, tenantId, phone, queue);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.UPDATE_USER_ERROR.getMsg(),e);
-            return error(Status.UPDATE_USER_ERROR.getCode(), Status.UPDATE_USER_ERROR.getMsg());
-        }
     }
 
     /**
      * delete user by id
+     *
      * @param loginUser login user
      * @param id        user id
      * @return delete result code
@@ -186,16 +178,12 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/delete")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_USER_BY_ID_ERROR)
     public Result delUserById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                                      @RequestParam(value = "id") int  id) {
+                              @RequestParam(value = "id") int id) throws Exception {
         logger.info("login user {}, delete user, userId: {},", loginUser.getUserName(), id);
-        try {
         Map<String, Object> result = usersService.deleteUserById(loginUser, id);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.DELETE_USER_BY_ID_ERROR.getMsg(),e);
-            return error(Status.DELETE_USER_BY_ID_ERROR.getCode(), Status.DELETE_USER_BY_ID_ERROR.getMsg());
-        }
     }
 
     /**
@@ -213,17 +201,13 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/grant-project")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GRANT_PROJECT_ERROR)
     public Result grantProject(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                @RequestParam(value = "userId") int userId,
                                @RequestParam(value = "projectIds") String projectIds) {
         logger.info("login user {}, grant project, userId: {},projectIds : {}", loginUser.getUserName(), userId, projectIds);
-        try {
         Map<String, Object> result = usersService.grantProject(loginUser, userId, projectIds);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GRANT_PROJECT_ERROR.getMsg(),e);
-            return error(Status.GRANT_PROJECT_ERROR.getCode(), Status.GRANT_PROJECT_ERROR.getMsg());
-        }
     }
 
     /**
@@ -241,17 +225,13 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/grant-file")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GRANT_RESOURCE_ERROR)
     public Result grantResource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                 @RequestParam(value = "userId") int userId,
                                 @RequestParam(value = "resourceIds") String resourceIds) {
         logger.info("login user {}, grant project, userId: {},resourceIds : {}", loginUser.getUserName(), userId, resourceIds);
-        try {
         Map<String, Object> result = usersService.grantResources(loginUser, userId, resourceIds);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GRANT_RESOURCE_ERROR.getMsg(),e);
-            return error(Status.GRANT_RESOURCE_ERROR.getCode(), Status.GRANT_RESOURCE_ERROR.getMsg());
-        }
     }
 
 
@@ -270,19 +250,14 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/grant-udf-func")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GRANT_UDF_FUNCTION_ERROR)
     public Result grantUDFFunc(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                @RequestParam(value = "userId") int userId,
                                @RequestParam(value = "udfIds") String udfIds) {
         logger.info("login user {}, grant project, userId: {},resourceIds : {}", loginUser.getUserName(), userId, udfIds);
-        try {
         Map<String, Object> result = usersService.grantUDFFunction(loginUser, userId, udfIds);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GRANT_UDF_FUNCTION_ERROR.getMsg(),e);
-            return error(Status.GRANT_UDF_FUNCTION_ERROR.getCode(), Status.GRANT_UDF_FUNCTION_ERROR.getMsg());
     }
-    }
-
 
 
     /**
@@ -300,17 +275,13 @@ public class UsersController extends BaseController{
     })
     @PostMapping(value = "/grant-datasource")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GRANT_DATASOURCE_ERROR)
     public Result grantDataSource(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                   @RequestParam(value = "userId") int userId,
                                   @RequestParam(value = "datasourceIds") String datasourceIds) {
         logger.info("login user {}, grant project, userId: {},projectIds : {}", loginUser.getUserName(), userId, datasourceIds);
-        try {
         Map<String, Object> result = usersService.grantDataSource(loginUser, userId, datasourceIds);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GRANT_DATASOURCE_ERROR.getMsg(),e);
-            return error(Status.GRANT_DATASOURCE_ERROR.getCode(), Status.GRANT_DATASOURCE_ERROR.getMsg());
-        }
     }
 
 
@@ -323,15 +294,11 @@ public class UsersController extends BaseController{
     @ApiOperation(value = "getUserInfo", notes = "GET_USER_INFO_NOTES")
     @GetMapping(value = "/get-user-info")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(GET_USER_INFO_ERROR)
     public Result getUserInfo(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user {},get user info", loginUser.getUserName());
-        try{
         Map<String, Object> result = usersService.getUserInfo(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.GET_USER_INFO_ERROR.getMsg(),e);
-            return error(Status.GET_USER_INFO_ERROR.getCode(), Status.GET_USER_INFO_ERROR.getMsg());
-        }
     }
 
     /**
@@ -343,15 +310,11 @@ public class UsersController extends BaseController{
     @ApiOperation(value = "listUser", notes = "LIST_USER_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(USER_LIST_ERROR)
     public Result listUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user {}, user list", loginUser.getUserName());
-        try{
         Map<String, Object> result = usersService.queryAllGeneralUsers(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.USER_LIST_ERROR.getMsg(),e);
-            return error(Status.USER_LIST_ERROR.getCode(), Status.USER_LIST_ERROR.getMsg());
-        }
     }
 
 
@@ -363,15 +326,11 @@ public class UsersController extends BaseController{
      */
     @GetMapping(value = "/list-all")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(USER_LIST_ERROR)
     public Result listAll(@RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login user {}, user list", loginUser.getUserName());
-        try{
         Map<String, Object> result = usersService.queryUserList(loginUser);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.USER_LIST_ERROR.getMsg(),e);
-            return error(Status.USER_LIST_ERROR.getCode(), Status.USER_LIST_ERROR.getMsg());
-        }
     }
 
 
@@ -388,18 +347,13 @@ public class UsersController extends BaseController{
     })
     @GetMapping(value = "/verify-user-name")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_USERNAME_ERROR)
     public Result verifyUserName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam(value = "userName") String userName
     ) {
-        try{
-
         logger.info("login user {}, verfiy user name: {}",
                 loginUser.getUserName(), userName);
         return usersService.verifyUserName(userName);
-        }catch (Exception e){
-            logger.error(Status.VERIFY_USERNAME_ERROR.getMsg(),e);
-            return error(Status.VERIFY_USERNAME_ERROR.getCode(), Status.VERIFY_USERNAME_ERROR.getMsg());
-        }
     }
 
 
@@ -416,17 +370,13 @@ public class UsersController extends BaseController{
     })
     @GetMapping(value = "/unauth-user")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UNAUTHORIZED_USER_ERROR)
     public Result unauthorizedUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                    @RequestParam("alertgroupId") Integer alertgroupId) {
-        try{
         logger.info("unauthorized user, login user:{}, alert group id:{}",
                 loginUser.getUserName(), alertgroupId);
         Map<String, Object> result = usersService.unauthorizedUser(loginUser, alertgroupId);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.UNAUTHORIZED_USER_ERROR.getMsg(),e);
-            return error(Status.UNAUTHORIZED_USER_ERROR.getCode(), Status.UNAUTHORIZED_USER_ERROR.getMsg());
-        }
     }
 
 
@@ -443,6 +393,7 @@ public class UsersController extends BaseController{
     })
     @GetMapping(value = "/authed-user")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(AUTHORIZED_USER_ERROR)
     public Result authorizedUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                  @RequestParam("alertgroupId") Integer alertgroupId) {
         try {

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java

@@ -17,7 +17,7 @@
 package org.apache.dolphinscheduler.api.controller;
 
 
-import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.exceptions.ApiException;
 import org.apache.dolphinscheduler.api.service.WorkerGroupService;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
@@ -27,7 +27,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +34,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.List;
 import java.util.Map;
 
+import static org.apache.dolphinscheduler.api.enums.Status.*;
+
 /**
  * worker group controller
  */
@@ -69,6 +69,7 @@ public class WorkerGroupController extends BaseController{
     })
     @PostMapping(value = "/save")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(SAVE_ERROR)
     public Result saveWorkerGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                   @RequestParam(value = "id", required = false, defaultValue = "0") int id,
                                   @RequestParam(value = "name") String name,
@@ -77,13 +78,8 @@ public class WorkerGroupController extends BaseController{
         logger.info("save worker group: login user {}, id:{}, name: {}, ipList: {} ",
                 loginUser.getUserName(), id, name, ipList);
 
-        try {
         Map<String, Object> result = workerGroupService.saveWorkerGroup(loginUser, id, name, ipList);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.SAVE_ERROR.getMsg(),e);
-            return error(Status.SAVE_ERROR.getCode(), Status.SAVE_ERROR.getMsg());
-        }
     }
 
     /**
@@ -103,6 +99,7 @@ public class WorkerGroupController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_WORKER_GROUP_FAIL)
     public Result queryAllWorkerGroupsPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                              @RequestParam("pageNo") Integer pageNo,
                                              @RequestParam(value = "searchVal", required = false) String searchVal,
@@ -111,14 +108,9 @@ public class WorkerGroupController extends BaseController{
         logger.info("query all worker group paging: login user {}, pageNo:{}, pageSize:{}, searchVal:{}",
                 loginUser.getUserName(), pageNo, pageSize, searchVal);
 
-        try {
         searchVal = ParameterUtils.handleEscapes(searchVal);
         Map<String, Object> result = workerGroupService.queryAllGroupPaging(loginUser, pageNo, pageSize, searchVal);
         return returnDataListPaging(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_WORKER_GROUP_FAIL.getMsg(),e);
-            return error(Status.QUERY_WORKER_GROUP_FAIL.getCode(), Status.QUERY_WORKER_GROUP_FAIL.getMsg());
-        }
     }
 
     /**
@@ -130,23 +122,19 @@ public class WorkerGroupController extends BaseController{
     @ApiOperation(value = "queryAllWorkerGroups", notes = "QUERY_WORKER_GROUP_LIST_NOTES")
     @GetMapping(value = "/all-groups")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_WORKER_GROUP_FAIL)
     public Result queryAllWorkerGroups(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser
     ) {
         logger.info("query all worker group: login user {}",
                 loginUser.getUserName());
 
-        try {
-
         Map<String, Object> result = workerGroupService.queryAllGroup();
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_WORKER_GROUP_FAIL.getMsg(),e);
-            return error(Status.QUERY_WORKER_GROUP_FAIL.getCode(), Status.QUERY_WORKER_GROUP_FAIL.getMsg());
-        }
     }
 
     /**
      * delete worker group by id
+     *
      * @param loginUser login user
      * @param id        group id
      * @return delete result code
@@ -158,18 +146,14 @@ public class WorkerGroupController extends BaseController{
     })
     @GetMapping(value = "/delete-by-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(DELETE_WORKER_GROUP_FAIL)
     public Result deleteById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                              @RequestParam("id") Integer id
     ) {
         logger.info("delete worker group: login user {}, id:{} ",
                 loginUser.getUserName(), id);
 
-        try {
         Map<String, Object> result = workerGroupService.deleteWorkerGroupById(id);
         return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.DELETE_WORKER_GROUP_FAIL.getMsg(),e);
-            return error(Status.DELETE_WORKER_GROUP_FAIL.getCode(), Status.DELETE_WORKER_GROUP_FAIL.getMsg());
-        }
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

@@ -136,7 +136,7 @@ public enum Status {
     UPDATE_PROCESS_DEFINITION_ERROR(10107,"update process definition error", "更新工作流定义错误"),
     RELEASE_PROCESS_DEFINITION_ERROR(10108,"release process definition error", "上线工作流错误"),
     QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR(10109,"query datail of process definition error", "查询工作流详细信息错误"),
-    QUERY_PROCCESS_DEFINITION_LIST(10110,"query proccess definition list", "查询工作流列表错误"),
+    QUERY_PROCESS_DEFINITION_LIST(10110,"query process definition list", "查询工作流列表错误"),
     ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR(10111,"encapsulation treeview structure error", "查询工作流树形图数据错误"),
     GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR(10112,"get tasks list by process definition id error", "查询工作流定义节点信息错误"),
     QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR(10113,"query process instance list paging error", "分页查询工作流实例列表错误"),
@@ -148,7 +148,7 @@ public enum Status {
     QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR(10119,"query parent process instance detail info by sub process instance id error", "查询子流程该工作流实例错误"),
     QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR(10120,"query process instance all variables error", "查询工作流自定义变量信息错误"),
     ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR(10121,"encapsulation process instance gantt structure error", "查询工作流实例甘特图数据错误"),
-    QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR(10122,"query proccess definition list paging error", "分页查询工作流定义列表错误"),
+    QUERY_PROCESS_DEFINITION_LIST_PAGING_ERROR(10122,"query process definition list paging error", "分页查询工作流定义列表错误"),
     SIGN_OUT_ERROR(10123,"sign out error", "退出错误"),
     TENANT_CODE_HAS_ALREADY_EXISTS(10124,"tenant code has already exists", "租户编码已存在"),
     IP_IS_EMPTY(10125,"ip is empty", "IP地址不能为空"),

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java

@@ -36,12 +36,13 @@ public class ApiExceptionHandler {
 
     @ExceptionHandler(Exception.class)
     public Result exceptionHandler(Exception e, HandlerMethod hm) {
-        logger.error(e.getMessage(), e);
         ApiException ce = hm.getMethodAnnotation(ApiException.class);
         if (ce == null) {
+            logger.error(e.getMessage(), e);
             return Result.errorWithArgs(Status.INTERNAL_SERVER_ERROR_ARGS, e.getMessage());
         }
         Status st = ce.value();
+        logger.error(st.getMsg(), e);
         return Result.error(st);
     }
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java

@@ -106,12 +106,10 @@ public class DataAnalysisService extends BaseService{
         List<ExecuteStatusCount> taskInstanceStateCounts =
                 taskInstanceMapper.countTaskInstanceStateByUser(start, end, projectIds);
 
-        if (taskInstanceStateCounts != null && !taskInstanceStateCounts.isEmpty()) {
+        if (taskInstanceStateCounts != null) {
             TaskCountDto taskCountResult = new TaskCountDto(taskInstanceStateCounts);
             result.put(Constants.DATA_LIST, taskCountResult);
             putMsg(result, Status.SUCCESS);
-        } else {
-            putMsg(result, Status.TASK_INSTANCE_STATE_COUNT_ERROR);
         }
         return result;
     }
@@ -153,12 +151,10 @@ public class DataAnalysisService extends BaseService{
                 processInstanceMapper.countInstanceStateByUser(start, end,
                         projectIdArray);
 
-        if (processInstanceStateCounts != null && !processInstanceStateCounts.isEmpty()) {
+        if (processInstanceStateCounts != null) {
             TaskCountDto taskCountResult = new TaskCountDto(processInstanceStateCounts);
             result.put(Constants.DATA_LIST, taskCountResult);
             putMsg(result, Status.SUCCESS);
-        } else {
-            putMsg(result, Status.COUNT_PROCESS_INSTANCE_STATE_ERROR);
         }
         return result;
     }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java

@@ -225,20 +225,14 @@ public class ExecutorService extends BaseService{
                 if (processInstance.getState() == ExecutionStatus.READY_STOP) {
                     putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), processInstance.getState());
                 } else {
-                    processInstance.setCommandType(CommandType.STOP);
+                    result = updateProcessInstancePrepare(processInstance, CommandType.STOP, ExecutionStatus.READY_STOP);
-                    processInstance.addHistoryCmd(CommandType.STOP);
-                    processService.updateProcessInstance(processInstance);
-                    result = updateProcessInstanceState(processInstanceId, ExecutionStatus.READY_STOP);
                 }
                 break;
             case PAUSE:
                 if (processInstance.getState() == ExecutionStatus.READY_PAUSE) {
                     putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), processInstance.getState());
                 } else {
-                    processInstance.setCommandType(CommandType.PAUSE);
+                    result = updateProcessInstancePrepare(processInstance, CommandType.PAUSE, ExecutionStatus.READY_PAUSE);
-                    processInstance.addHistoryCmd(CommandType.PAUSE);
-                    processService.updateProcessInstance(processInstance);
-                    result = updateProcessInstanceState(processInstanceId, ExecutionStatus.READY_PAUSE);
                 }
                 break;
             default:
@@ -308,22 +302,27 @@ public class ExecutorService extends BaseService{
     }
 
     /**
-     * update process instance state
+     *  prepare to update process instance command type and status
      *
-     * @param processInstanceId process instance id
+     * @param processInstance process instance
+     * @param commandType command type
      * @param executionStatus execute status
      * @return update result
      */
-    private Map<String, Object> updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) {
+    private Map<String, Object> updateProcessInstancePrepare(ProcessInstance processInstance, CommandType commandType, ExecutionStatus executionStatus) {
         Map<String, Object> result = new HashMap<>(5);
 
-        int update = processService.updateProcessInstanceState(processInstanceId, executionStatus);
+        processInstance.setCommandType(commandType);
+        processInstance.addHistoryCmd(commandType);
+        processInstance.setState(executionStatus);
+        int update = processService.updateProcessInstance(processInstance);
+
+        // determine whether the process is normal
         if (update > 0) {
             putMsg(result, Status.SUCCESS);
         } else {
             putMsg(result, Status.EXECUTE_PROCESS_INSTANCE_ERROR);
         }
-
         return result;
     }
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

@@ -173,9 +173,11 @@ public class ProcessDefinitionService extends BaseDAGService {
         for(TaskNode taskNode : tasks){
             String taskParameter = taskNode.getParams();
             AbstractParameters params = TaskParametersUtils.getParameters(taskNode.getType(),taskParameter);
+            if (CollectionUtils.isNotEmpty(params.getResourceFilesList())) {
                 Set<Integer> tempSet = params.getResourceFilesList().stream().map(t->t.getId()).collect(Collectors.toSet());
                 resourceIds.addAll(tempSet);
             }
+        }
 
         StringBuilder sb = new StringBuilder();
         for(int i : resourceIds) {
@@ -189,13 +191,13 @@ public class ProcessDefinitionService extends BaseDAGService {
 
 
     /**
-     * query proccess definition list
+     * query process definition list
      *
      * @param loginUser login user
      * @param projectName project name
      * @return definition list
      */
-    public Map<String, Object> queryProccessDefinitionList(User loginUser, String projectName) {
+    public Map<String, Object> queryProcessDefinitionList(User loginUser, String projectName) {
 
         HashMap<String, Object> result = new HashMap<>(5);
         Project project = projectMapper.queryByName(projectName);
@@ -215,7 +217,7 @@ public class ProcessDefinitionService extends BaseDAGService {
 
 
     /**
-     * query proccess definition list paging
+     * query process definition list paging
      *
      * @param loginUser login user
      * @param projectName project name
@@ -257,7 +259,7 @@ public class ProcessDefinitionService extends BaseDAGService {
      * @param processId process definition id
      * @return process definition detail
      */
-    public Map<String, Object> queryProccessDefinitionById(User loginUser, String projectName, Integer processId) {
+    public Map<String, Object> queryProcessDefinitionById(User loginUser, String projectName, Integer processId) {
 
 
         Map<String, Object> result = new HashMap<>(5);
@@ -363,7 +365,7 @@ public class ProcessDefinitionService extends BaseDAGService {
      * @param name name
      * @return true if process definition name not exists, otherwise false
      */
-    public Map<String, Object> verifyProccessDefinitionName(User loginUser, String projectName, String name) {
+    public Map<String, Object> verifyProcessDefinitionName(User loginUser, String projectName, String name) {
 
         Map<String, Object> result = new HashMap<>();
             Project project = projectMapper.queryByName(projectName);
@@ -1036,12 +1038,12 @@ public class ProcessDefinitionService extends BaseDAGService {
 
 
     /**
-     * query proccess definition all by project id
+     * query process definition all by project id
      *
      * @param projectId project id
      * @return process definitions in the project
      */
-    public Map<String, Object> queryProccessDefinitionAllByProjectId(Integer projectId) {
+    public Map<String, Object> queryProcessDefinitionAllByProjectId(Integer projectId) {
 
         HashMap<String, Object> result = new HashMap<>(5);
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java

@@ -423,6 +423,7 @@ public class UsersService extends BaseService {
      * @param projectIds project id array
      * @return grant result code
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> grantProject(User loginUser, int userId, String projectIds) {
         Map<String, Object> result = new HashMap<>(5);
         result.put(Constants.STATUS, false);
@@ -472,6 +473,7 @@ public class UsersService extends BaseService {
      * @param resourceIds resource id array
      * @return grant result code
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> grantResources(User loginUser, int userId, String resourceIds) {
         Map<String, Object> result = new HashMap<>(5);
         //only admin can operate
@@ -484,9 +486,10 @@ public class UsersService extends BaseService {
             return result;
         }
 
+        Set<Integer> needAuthorizeResIds = new HashSet();
+        if (StringUtils.isNotBlank(resourceIds)) {
             String[] resourceFullIdArr = resourceIds.split(",");
             // need authorize resource id set
-        Set<Integer> needAuthorizeResIds = new HashSet();
             for (String resourceFullId : resourceFullIdArr) {
                 String[] resourceIdArr = resourceFullId.split("-");
                 for (int i=0;i<=resourceIdArr.length-1;i++) {
@@ -494,6 +497,8 @@ public class UsersService extends BaseService {
                     needAuthorizeResIds.add(resourceIdValue);
                 }
             }
+        }
+
 
         //get the authorized resource id list by user id
         List<Resource> oldAuthorizedRes = resourceMapper.queryAuthorizedResourceList(userId);
@@ -565,6 +570,7 @@ public class UsersService extends BaseService {
      * @param udfIds udf id array
      * @return grant result code
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> grantUDFFunction(User loginUser, int userId, String udfIds) {
         Map<String, Object> result = new HashMap<>(5);
 
@@ -611,6 +617,7 @@ public class UsersService extends BaseService {
      * @param datasourceIds  data source id array
      * @return grant result code
      */
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> grantDataSource(User loginUser, int userId, String datasourceIds) {
         Map<String, Object> result = new HashMap<>(5);
         result.put(Constants.STATUS, false);

dolphinscheduler-api/src/main/resources/i18n/messages.properties

@@ -166,15 +166,15 @@ SIGNOUT_NOTES=logout
 USER_PASSWORD=user password
 UPDATE_PROCESS_INSTANCE_NOTES=update process instance
 QUERY_PROCESS_INSTANCE_LIST_NOTES=query process instance list
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=verify process definition name
 LOGIN_NOTES=user login
-UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
+UPDATE_PROCESS_DEFINITION_NOTES=update process definition
 PROCESS_DEFINITION_ID=process definition id
 PROCESS_DEFINITION_IDS=process definition ids
-RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
+RELEASE_PROCESS_DEFINITION_NOTES=release process definition
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
+QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list paging
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
 QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list
 PAGE_NO=page no
 PROCESS_INSTANCE_ID=process instance id
@@ -190,7 +190,7 @@ LIMIT=limit
 VIEW_TREE_NOTES=view tree
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition id
 PROCESS_DEFINITION_ID_LIST=process definition id list
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition all by project id
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query process definition all by project id
 DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process definition id
 BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition by process definition ids
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance id

dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties

@@ -166,15 +166,15 @@ SIGNOUT_NOTES=logout
 USER_PASSWORD=user password
 UPDATE_PROCESS_INSTANCE_NOTES=update process instance
 QUERY_PROCESS_INSTANCE_LIST_NOTES=query process instance list
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=verify process definition name
 LOGIN_NOTES=user login
-UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
+UPDATE_PROCESS_DEFINITION_NOTES=update process definition
 PROCESS_DEFINITION_ID=process definition id
 PROCESS_DEFINITION_IDS=process definition ids
-RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
+RELEASE_PROCESS_DEFINITION_NOTES=release process definition
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
+QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list paging
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
 QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list
 PAGE_NO=page no
 PROCESS_INSTANCE_ID=process instance id
@@ -190,7 +190,7 @@ LIMIT=limit
 VIEW_TREE_NOTES=view tree
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition id
 PROCESS_DEFINITION_ID_LIST=process definition id list
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition all by project id
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query process definition all by project id
 DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process definition id
 BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition by process definition ids
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance id

dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -165,14 +165,14 @@ SIGNOUT_NOTES=退出登录
 USER_PASSWORD=用户密码
 UPDATE_PROCESS_INSTANCE_NOTES=更新流程实例
 QUERY_PROCESS_INSTANCE_LIST_NOTES=查询流程实例列表
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=验证流程定义名字
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=验证流程定义名字
 LOGIN_NOTES=用户登录
-UPDATE_PROCCESS_DEFINITION_NOTES=更新流程定义
+UPDATE_PROCESS_DEFINITION_NOTES=更新流程定义
 PROCESS_DEFINITION_ID=流程定义ID
-RELEASE_PROCCESS_DEFINITION_NOTES=发布流程定义
+RELEASE_PROCESS_DEFINITION_NOTES=发布流程定义
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=查询流程定义通过流程定义ID
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=查询流程定义通过流程定义ID
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=查询流程定义列表
+QUERY_PROCESS_DEFINITION_LIST_NOTES=查询流程定义列表
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表
 QUERY_ALL_DEFINITION_LIST_NOTES=查询所有流程定义
 PAGE_NO=页码号
 PROCESS_INSTANCE_ID=流程实例ID
@@ -188,7 +188,7 @@ LIMIT=显示多少条
 VIEW_TREE_NOTES=树状图
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=获得任务节点列表通过流程定义ID
 PROCESS_DEFINITION_ID_LIST=流程定义id列表
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目ID
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目ID
 BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=批量删除流程定义通过流程定义ID集合
 DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=查询流程实例通过流程实例ID

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java

@@ -17,314 +17,259 @@
 package org.apache.dolphinscheduler.api.controller;
 
 import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
 import org.apache.dolphinscheduler.api.utils.Result;
+import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;
-import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.common.enums.UserType;
-import org.junit.Assert;
+import org.apache.dolphinscheduler.common.model.TaskNode;
-import org.junit.Ignore;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.junit.Test;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
+import java.text.MessageFormat;
-import org.springframework.test.web.servlet.MvcResult;
+import java.util.ArrayList;
-import org.springframework.util.LinkedMultiValueMap;
+import java.util.HashMap;
-import org.springframework.util.MultiValueMap;
+import java.util.List;
-
+import java.util.Map;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * process definition controller test
  */
-public class ProcessDefinitionControllerTest extends AbstractControllerTest{
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class ProcessDefinitionControllerTest{
 
     private static Logger logger = LoggerFactory.getLogger(ProcessDefinitionControllerTest.class);
 
+    @InjectMocks
+    private ProcessDefinitionController processDefinitionController;
+
+    @Mock
+    private ProcessDefinitionService processDefinitionService;
+
+    protected User user;
+
+    @Before
+    public void before(){
+        User loginUser = new User();
+        loginUser.setId(1);
+        loginUser.setUserType(UserType.GENERAL_USER);
+        loginUser.setUserName("admin");
+
+        user = loginUser;
+    }
+
     @Test
     public void testCreateProcessDefinition() throws Exception {
         String json = "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho ${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
         String locations = "{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
 
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String projectName = "test";
-        paramsMap.add("name","dag_test");
+        String name = "dag_test";
-        paramsMap.add("processDefinitionJson",json);
+        String description = "desc test";
-        paramsMap.add("locations", locations);
+        String connects = "[]";
-        paramsMap.add("connects", "[]");
+        Map<String, Object> result = new HashMap<>(5);
-        paramsMap.add("description", "desc test");
+        putMsg(result, Status.SUCCESS);
-
+        result.put("processDefinitionId",1);
-        MvcResult mvcResult = mockMvc.perform(post("/projects/{projectName}/process/save","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isCreated())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
 
+        Mockito.when(processDefinitionService.createProcessDefinition(user, projectName, name, json,
+                description, locations, connects)).thenReturn(result);
 
-    @Test
+        Result response = processDefinitionController.createProcessDefinition(user, projectName, name, json,
-    public void testVerifyProccessDefinitionName() throws Exception {
+                locations, connects, description);
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-        paramsMap.add("name","dag_test");
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/verify-name","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-    @Test
+    private void putMsg(Map<String, Object> result, Status status, Object... statusParams) {
-    public void testVerifyProccessDefinitionNameNotExit() throws Exception {
+        result.put(Constants.STATUS, status);
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        if (statusParams != null && statusParams.length > 0) {
-        paramsMap.add("name","dag_test_1");
+            result.put(Constants.MSG, MessageFormat.format(status.getMsg(), statusParams));
-
+        } else {
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/verify-name","cxc_1113")
+            result.put(Constants.MSG, status.getMsg());
-                .header(SESSION_ID, sessionId)
+        }
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
+    @Test
+    public void testVerifyProcessDefinitionName() throws Exception {
+
+        Map<String, Object> result = new HashMap<>(5);
+        putMsg(result, Status.PROCESS_INSTANCE_EXIST);
+        String projectName = "test";
+        String name = "dag_test";
+
+        Mockito.when(processDefinitionService.verifyProcessDefinitionName(user,projectName,name)).thenReturn(result);
+
+        Result response = processDefinitionController.verifyProcessDefinitionName(user,projectName,name);
+        Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST.getCode(),response.getCode().intValue());
 
+    }
 
     @Test
-    public void UpdateProccessDefinition() throws Exception {
+    public void UpdateProcessDefinition() throws Exception {
+
         String json = "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho ${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
         String locations = "{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
-
+        String projectName = "test";
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String name = "dag_test";
-        paramsMap.add("name","dag_test_update");
+        String description = "desc test";
-        paramsMap.add("id","91");
+        String connects = "[]";
-        paramsMap.add("processDefinitionJson",json);
+        int id = 1;
-        paramsMap.add("locations", locations);
+        Map<String, Object> result = new HashMap<>(5);
-        paramsMap.add("connects", "[]");
+        putMsg(result, Status.SUCCESS);
-        paramsMap.add("description", "desc test update");
+        result.put("processDefinitionId",1);
-
+
-        MvcResult mvcResult = mockMvc.perform(post("/projects/{projectName}/process/update","cxc_1113")
+        Mockito.when(processDefinitionService.updateProcessDefinition(user, projectName, id,name, json,
-                .header(SESSION_ID, sessionId)
+                description, locations, connects)).thenReturn(result);
-                .params(paramsMap))
+
-                .andExpect(status().isOk())
+        Result response = processDefinitionController.updateProcessDefinition(user, projectName, name,id, json,
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+                locations, connects, description);
-                .andReturn();
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-
     @Test
-    public void testReleaseProccessDefinition() throws Exception {
+    public void testReleaseProcessDefinition() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String projectName = "test";
-        paramsMap.add("processId","91");
+        int id = 1;
-        paramsMap.add("releaseState",String.valueOf(ReleaseState.OFFLINE));
+        Map<String, Object> result = new HashMap<>(5);
-
+        putMsg(result, Status.SUCCESS);
-        MvcResult mvcResult = mockMvc.perform(post("/projects/{projectName}/process/release","cxc_1113")
+
-                .header(SESSION_ID, sessionId)
+        Mockito.when(processDefinitionService.releaseProcessDefinition(user, projectName,id,ReleaseState.OFFLINE.ordinal())).thenReturn(result);
-                .params(paramsMap))
+        Result response = processDefinitionController.releaseProcessDefinition(user, projectName,id,ReleaseState.OFFLINE.ordinal());
-                .andExpect(status().isOk())
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-
     @Test
-    public void testQueryProccessDefinitionById() throws Exception {
+    public void testQueryProcessDefinitionById() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+
-        paramsMap.add("processId","91");
+        String json = "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho ${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
-
+        String locations = "{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/select-by-id","cxc_1113")
+        String projectName = "test";
-                .header(SESSION_ID, sessionId)
+        String name = "dag_test";
-                .params(paramsMap))
+        String description = "desc test";
-                .andExpect(status().isOk())
+        String connects = "[]";
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+        int id = 1;
-                .andReturn();
+
-
+        ProcessDefinition processDefinition = new ProcessDefinition();
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
+        processDefinition.setProjectName(projectName);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
+        processDefinition.setConnects(connects);
-        logger.info(mvcResult.getResponse().getContentAsString());
+        processDefinition.setDescription(description);
+        processDefinition.setId(id);
+        processDefinition.setLocations(locations);
+        processDefinition.setName(name);
+        processDefinition.setProcessDefinitionJson(json);
+
+        Map<String, Object> result = new HashMap<>(5);
+        putMsg(result, Status.SUCCESS);
+        result.put(Constants.DATA_LIST, processDefinition);
+
+        Mockito.when(processDefinitionService.queryProcessDefinitionById(user, projectName,id)).thenReturn(result);
+        Result response = processDefinitionController.queryProcessDefinitionById(user, projectName,id);
+
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
     }
 
+
     @Test
-    public void testQueryProccessDefinitionList() throws Exception {
+    public void testQueryProcessDefinitionList() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/list","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
 
+        String projectName = "test";
+        List<ProcessDefinition> resourceList =  getDefinitionList();
 
+        Map<String, Object> result = new HashMap<>(5);
+        putMsg(result, Status.SUCCESS);
+        result.put(Constants.DATA_LIST, resourceList);
 
-    @Test
-    public void testQueryProcessDefinitionListPaging() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        paramsMap.add("pageNo","1");
-        paramsMap.add("searchVal","test");
-        paramsMap.add("userId","");
-        paramsMap.add("pageSize", "1");
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/list-paging","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
 
-    @Test
+        Mockito.when(processDefinitionService.queryProcessDefinitionList(user, projectName)).thenReturn(result);
-    public void testViewTree() throws Exception {
+        Result response = processDefinitionController.queryProcessDefinitionList(user, projectName);
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+
-        paramsMap.add("processId","91");
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-        paramsMap.add("limit","30");
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/view-tree","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-    @Test
+    public List<ProcessDefinition> getDefinitionList(){
-    public void testGetNodeListByDefinitionId() throws Exception {
+
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        List<ProcessDefinition> resourceList = new ArrayList<>();
-        paramsMap.add("processDefinitionId","40");
+
-
+        String json = "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho ${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/gen-task-list","cxc_1113")
+        String locations = "{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
-                .header(SESSION_ID, sessionId)
+        String projectName = "test";
-                .params(paramsMap))
+        String name = "dag_test";
-                .andExpect(status().isOk())
+        String description = "desc test";
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+        String connects = "[]";
-                .andReturn();
+        int id = 1;
-
+
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
+        ProcessDefinition processDefinition = new ProcessDefinition();
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
+        processDefinition.setProjectName(projectName);
-        logger.info(mvcResult.getResponse().getContentAsString());
+        processDefinition.setConnects(connects);
+        processDefinition.setDescription(description);
+        processDefinition.setId(id);
+        processDefinition.setLocations(locations);
+        processDefinition.setName(name);
+        processDefinition.setProcessDefinitionJson(json);
+
+        String name2 = "dag_test";
+        int id2 = 2;
+
+        ProcessDefinition processDefinition2 = new ProcessDefinition();
+        processDefinition2.setProjectName(projectName);
+        processDefinition2.setConnects(connects);
+        processDefinition2.setDescription(description);
+        processDefinition2.setId(id2);
+        processDefinition2.setLocations(locations);
+        processDefinition2.setName(name2);
+        processDefinition2.setProcessDefinitionJson(json);
+
+        resourceList.add(processDefinition);
+        resourceList.add(processDefinition2);
+
+        return  resourceList;
     }
 
     @Test
-    public void testGetNodeListByDefinitionIdList() throws Exception {
+    public void testDeleteProcessDefinitionById() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String projectName = "test";
-        paramsMap.add("processDefinitionIdList","40,90,91");
+        int id = 1;
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/get-task-list","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
 
+        Map<String, Object> result = new HashMap<>(5);
+        putMsg(result, Status.SUCCESS);
 
+        Mockito.when(processDefinitionService.deleteProcessDefinitionById(user, projectName,id)).thenReturn(result);
+        Result response = processDefinitionController.deleteProcessDefinitionById(user, projectName,id);
 
-    @Ignore
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-    @Test
-    public void testExportProcessDefinitionById() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        paramsMap.add("processDefinitionId","91");
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/export","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-//                .andExpect(status().isOk())
-//                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
-
         @Test
-    public void testQueryProccessDefinitionAllByProjectId() throws Exception {
+    public void testGetNodeListByDefinitionId() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String projectName = "test";
-        paramsMap.add("projectId","9");
+        int id = 1;
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/queryProccessDefinitionAllByProjectId","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
-    }
 
+        Map<String, Object> result = new HashMap<>(5);
+        putMsg(result, Status.SUCCESS);
 
+        Mockito.when(processDefinitionService.getTaskNodeListByDefinitionId(id)).thenReturn(result);
+        Result response = processDefinitionController.getNodeListByDefinitionId(user,projectName,id);
 
-    @Test
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-    public void testDeleteProcessDefinitionById() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-        paramsMap.add("processDefinitionId","73");
-
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/delete","cxc_1113")
-                .header(SESSION_ID, sessionId)
-                .params(paramsMap))
-                .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
-                .andReturn();
-
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 
     @Test
-    public void testBatchDeleteProcessDefinitionByIds() throws Exception {
+    public void testGetNodeListByDefinitionIdList() throws Exception {
-        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        String projectName = "test";
-        paramsMap.add("processDefinitionIds","54,62");
+        String idList = "1,2,3";
-
+
-        MvcResult mvcResult = mockMvc.perform(get("/projects/{projectName}/process/batch-delete","cxc_1113")
+        Map<String, Object> result = new HashMap<>(5);
-                .header(SESSION_ID, sessionId)
+        putMsg(result, Status.SUCCESS);
-                .params(paramsMap))
+
-                .andExpect(status().isOk())
+        Mockito.when(processDefinitionService.getTaskNodeListByDefinitionIdList(idList)).thenReturn(result);
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
+        Result response = processDefinitionController.getNodeListByDefinitionIdList(user,projectName,idList);
-                .andReturn();
+
-
+        Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
-        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
-        logger.info(mvcResult.getResponse().getContentAsString());
     }
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandlerTest.java

@@ -17,6 +17,7 @@
 package org.apache.dolphinscheduler.api.exceptions;
 
 import org.apache.dolphinscheduler.api.controller.AccessTokenController;
+import org.apache.dolphinscheduler.api.controller.ProcessDefinitionController;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.dao.entity.User;
@@ -24,6 +25,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.web.method.HandlerMethod;
 
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 
 import static org.junit.Assert.*;
@@ -39,4 +41,14 @@ public class ApiExceptionHandlerTest {
         Result result = handler.exceptionHandler(new RuntimeException("test exception"), hm);
         Assert.assertEquals(Status.CREATE_ACCESS_TOKEN_ERROR.getCode(),result.getCode().intValue());
     }
+
+    @Test
+    public void exceptionHandlerRuntime() throws NoSuchMethodException {
+        ApiExceptionHandler handler = new ApiExceptionHandler();
+        ProcessDefinitionController controller = new ProcessDefinitionController();
+        Method method = controller.getClass().getMethod("exportProcessDefinitionById", User.class, String.class, Integer.class, HttpServletResponse.class);
+        HandlerMethod hm = new HandlerMethod(controller, method);
+        Result result = handler.exceptionHandler(new RuntimeException("test exception"), hm);
+        Assert.assertEquals(Status.INTERNAL_SERVER_ERROR_ARGS.getCode(),result.getCode().intValue());
+    }
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java

@@ -114,9 +114,6 @@ public class DataAnalysisServiceTest {
         Map<String, Object> result = dataAnalysisService.countTaskStateByProject(user, 2, startDate, endDate);
         Assert.assertTrue(result.isEmpty());
 
-        // task instance state count error
-        result = dataAnalysisService.countTaskStateByProject(user, 1, startDate, endDate);
-        Assert.assertEquals(Status.TASK_INSTANCE_STATE_COUNT_ERROR,result.get(Constants.STATUS));
 
         //SUCCESS
         Mockito.when(taskInstanceMapper.countTaskInstanceStateByUser(DateUtils.getScheduleDate(startDate),
@@ -137,10 +134,6 @@ public class DataAnalysisServiceTest {
         Map<String, Object> result = dataAnalysisService.countProcessInstanceStateByProject(user,2,startDate,endDate);
         Assert.assertTrue(result.isEmpty());
 
-        //COUNT_PROCESS_INSTANCE_STATE_ERROR
-        result = dataAnalysisService.countProcessInstanceStateByProject(user,1,startDate,endDate);
-        Assert.assertEquals(Status.COUNT_PROCESS_INSTANCE_STATE_ERROR,result.get(Constants.STATUS));
-
         //SUCCESS
         Mockito.when(processInstanceMapper.countInstanceStateByUser(DateUtils.getScheduleDate(startDate),
                 DateUtils.getScheduleDate(endDate), new Integer[]{1})).thenReturn(getTaskInstanceStateCounts());

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java

@@ -115,7 +115,7 @@ public class ProcessDefinitionServiceTest {
             "\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}";
 
     @Test
-    public void testQueryProccessDefinitionList() {
+    public void testQueryProcessDefinitionList() {
         String projectName = "project_test1";
         Mockito.when(projectMapper.queryByName(projectName)).thenReturn(getProject(projectName));
 
@@ -129,7 +129,7 @@ public class ProcessDefinitionServiceTest {
 
         //project not found
         Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
-        Map<String, Object> map = processDefinitionService.queryProccessDefinitionList(loginUser,"project_test1");
+        Map<String, Object> map = processDefinitionService.queryProcessDefinitionList(loginUser,"project_test1");
         Assert.assertEquals(Status.PROJECT_NOT_FOUNT, map.get(Constants.STATUS));
 
         //project check auth success
@@ -138,7 +138,7 @@ public class ProcessDefinitionServiceTest {
         List<ProcessDefinition> resourceList = new ArrayList<>();
         resourceList.add(getProcessDefinition());
         Mockito.when(processDefineMapper.queryAllDefinitionList(project.getId())).thenReturn(resourceList);
-        Map<String, Object> checkSuccessRes = processDefinitionService.queryProccessDefinitionList(loginUser,"project_test1");
+        Map<String, Object> checkSuccessRes = processDefinitionService.queryProcessDefinitionList(loginUser,"project_test1");
         Assert.assertEquals(Status.SUCCESS, checkSuccessRes.get(Constants.STATUS));
     }
 
@@ -179,7 +179,7 @@ public class ProcessDefinitionServiceTest {
 
         //project check auth fail
         Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
-        Map<String, Object> map = processDefinitionService.queryProccessDefinitionById(loginUser,
+        Map<String, Object> map = processDefinitionService.queryProcessDefinitionById(loginUser,
                 "project_test1", 1);
         Assert.assertEquals(Status.PROJECT_NOT_FOUNT, map.get(Constants.STATUS));
 
@@ -187,13 +187,13 @@ public class ProcessDefinitionServiceTest {
         putMsg(result, Status.SUCCESS, projectName);
         Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
         Mockito.when(processDefineMapper.selectById(1)).thenReturn(null);
-        Map<String, Object> instanceNotexitRes = processDefinitionService.queryProccessDefinitionById(loginUser,
+        Map<String, Object> instanceNotexitRes = processDefinitionService.queryProcessDefinitionById(loginUser,
                 "project_test1", 1);
         Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST, instanceNotexitRes.get(Constants.STATUS));
 
         //instance exit
         Mockito.when(processDefineMapper.selectById(46)).thenReturn(getProcessDefinition());
-        Map<String, Object> successRes = processDefinitionService.queryProccessDefinitionById(loginUser,
+        Map<String, Object> successRes = processDefinitionService.queryProcessDefinitionById(loginUser,
                 "project_test1", 46);
         Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
     }
@@ -335,20 +335,20 @@ public class ProcessDefinitionServiceTest {
         Map<String, Object> result = new HashMap<>(5);
         putMsg(result, Status.PROJECT_NOT_FOUNT, projectName);
         Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
-        Map<String, Object> map = processDefinitionService.verifyProccessDefinitionName(loginUser,
+        Map<String, Object> map = processDefinitionService.verifyProcessDefinitionName(loginUser,
                 "project_test1", "test_pdf");
         Assert.assertEquals(Status.PROJECT_NOT_FOUNT, map.get(Constants.STATUS));
 
         //project check auth success, process not exist
         putMsg(result, Status.SUCCESS, projectName);
         Mockito.when(processDefineMapper.queryByDefineName(project.getId(),"test_pdf")).thenReturn(null);
-        Map<String, Object> processNotExistRes = processDefinitionService.verifyProccessDefinitionName(loginUser,
+        Map<String, Object> processNotExistRes = processDefinitionService.verifyProcessDefinitionName(loginUser,
                 "project_test1", "test_pdf");
         Assert.assertEquals(Status.SUCCESS, processNotExistRes.get(Constants.STATUS));
 
         //process exist
         Mockito.when(processDefineMapper.queryByDefineName(project.getId(),"test_pdf")).thenReturn(getProcessDefinition());
-        Map<String, Object> processExistRes = processDefinitionService.verifyProccessDefinitionName(loginUser,
+        Map<String, Object> processExistRes = processDefinitionService.verifyProcessDefinitionName(loginUser,
                 "project_test1", "test_pdf");
         Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST, processExistRes.get(Constants.STATUS));
     }
@@ -418,14 +418,14 @@ public class ProcessDefinitionServiceTest {
     }
 
     @Test
-    public void testQueryProccessDefinitionAllByProjectId() {
+    public void testQueryProcessDefinitionAllByProjectId() {
         int projectId = 1;
         ProcessDefinition processDefinition = getProcessDefinition();
         processDefinition.setProcessDefinitionJson(shellJson);
         List<ProcessDefinition> processDefinitionList = new ArrayList<>();
         processDefinitionList.add(processDefinition);
         Mockito.when(processDefineMapper.queryAllDefinitionList(projectId)).thenReturn(processDefinitionList);
-        Map<String, Object> successRes = processDefinitionService.queryProccessDefinitionAllByProjectId(projectId);
+        Map<String, Object> successRes = processDefinitionService.queryProcessDefinitionAllByProjectId(projectId);
         Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
     }
 

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java

@@ -39,7 +39,7 @@ public enum TaskType {
      */
     SHELL(0, "shell"),
     SQL(1, "sql"),
-    SUB_PROCESS(2, "sub process"),
+    SUB_PROCESS(2, "sub_process"),
     PROCEDURE(3, "procedure"),
     MR(4, "mr"),
     SPARK(5, "spark"),

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java

@@ -223,4 +223,14 @@ public class ThreadUtils {
         }
         return id + " (" + name + ")";
     }
+
+    /**
+     * sleep
+     * @param millis millis
+     */
+    public static void sleep(final long millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (final InterruptedException ignore) {}
+    }
 }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

@@ -57,7 +57,8 @@ public class HadoopUtils implements Closeable {
 
     private static String hdfsUser = PropertyUtils.getString(Constants.HDFS_ROOT_USER);
     public static final String resourceUploadPath = PropertyUtils.getString(RESOURCE_UPLOAD_PATH, "/dolphinscheduler");
-
+    public static final String rmHaIds = PropertyUtils.getString(Constants.YARN_RESOURCEMANAGER_HA_RM_IDS);
+    public static final String appAddress = PropertyUtils.getString(Constants.YARN_APPLICATION_STATUS_ADDRESS);
 
     private static final String HADOOP_UTILS_KEY = "HADOOP_UTILS_KEY";
 
@@ -110,14 +111,15 @@ public class HadoopUtils implements Closeable {
         try {
             configuration = new Configuration();
 
-            String resUploadStartupType = PropertyUtils.getString(Constants.RESOURCE_STORAGE_TYPE);
+            String resourceStorageType = PropertyUtils.getString(Constants.RESOURCE_STORAGE_TYPE);
-            ResUploadType resUploadType = ResUploadType.valueOf(resUploadStartupType);
+            ResUploadType resUploadType = ResUploadType.valueOf(resourceStorageType);
 
             if (resUploadType == ResUploadType.HDFS){
                 if (PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE,false)){
                     System.setProperty(Constants.JAVA_SECURITY_KRB5_CONF,
                             PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH));
                     configuration.set(Constants.HADOOP_SECURITY_AUTHENTICATION,"kerberos");
+                    hdfsUser = "";
                     UserGroupInformation.setConfiguration(configuration);
                     UserGroupInformation.loginUserFromKeytab(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME),
                             PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH));
@@ -166,21 +168,6 @@ public class HadoopUtils implements Closeable {
             }
 
 
-            String rmHaIds = PropertyUtils.getString(Constants.YARN_RESOURCEMANAGER_HA_RM_IDS);
-            String appAddress = PropertyUtils.getString(Constants.YARN_APPLICATION_STATUS_ADDRESS);
-            //not use resourcemanager
-            if (rmHaIds.contains(Constants.YARN_RESOURCEMANAGER_HA_XX)){
-                yarnEnabled = false;
-            } else if (!StringUtils.isEmpty(rmHaIds)) {
-                //resourcemanager HA enabled
-                appAddress = getAppAddress(appAddress, rmHaIds);
-                yarnEnabled = true;
-                logger.info("appAddress : {}", appAddress);
-            } else {
-                //single resourcemanager enabled
-                yarnEnabled = true;
-            }
-            configuration.set(Constants.YARN_APPLICATION_STATUS_ADDRESS, appAddress);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
@@ -200,7 +187,29 @@ public class HadoopUtils implements Closeable {
      * @return url of application
      */
     public String getApplicationUrl(String applicationId) {
-        return String.format(configuration.get(Constants.YARN_APPLICATION_STATUS_ADDRESS), applicationId);
+        /**
+         * if rmHaIds contains xx, it signs not use resourcemanager
+         * otherwise:
+         *  if rmHaIds is empty, single resourcemanager enabled
+         *  if rmHaIds not empty: resourcemanager HA enabled
+         */
+        String appUrl = "";
+        //not use resourcemanager
+        if (rmHaIds.contains(Constants.YARN_RESOURCEMANAGER_HA_XX)){
+
+            yarnEnabled = false;
+            logger.warn("should not step here");
+        } else if (!StringUtils.isEmpty(rmHaIds)) {
+            //resourcemanager HA enabled
+            appUrl = getAppAddress(appAddress, rmHaIds);
+            yarnEnabled = true;
+            logger.info("application url : {}", appUrl);
+        } else {
+            //single resourcemanager enabled
+            yarnEnabled = true;
+        }
+
+        return String.format(appUrl, applicationId);
     }
 
     /**
@@ -484,13 +493,6 @@ public class HadoopUtils implements Closeable {
         return String.format("%s/udfs", getHdfsTenantDir(tenantCode));
     }
 
-    /**
-     * get absolute path and name for file on hdfs
-     *
-     * @param tenantCode tenant code
-     * @param fileName   file name
-     * @return get absolute path and name for file on hdfs
-     */
 
     /**
      * get hdfs file name

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HttpUtils.java

@@ -40,7 +40,7 @@ public class HttpUtils {
 	/**
 	 * get http request content
 	 * @param url url
-	 * @return http response
+	 * @return http get request response content
 	 */
 	public static String get(String url){
 		CloseableHttpClient httpclient = HttpClients.createDefault();

dolphinscheduler-common/src/main/resources/common.properties

@@ -19,22 +19,22 @@
 resource.storage.type=NONE
 
 # resource store on HDFS/S3 path, resource file will store to this hadoop hdfs path, self configuration, please make sure the directory exists on hdfs and have read write permissions。"/dolphinscheduler" is recommended
-#resource.upload.path=/dolphinscheduler
+resource.upload.path=/dolphinscheduler
 
 # user data local directory path, please make sure the directory exists and have read write permissions
 #data.basedir.path=/tmp/dolphinscheduler
 
 # whether kerberos starts
-#hadoop.security.authentication.startup.state=false
+hadoop.security.authentication.startup.state=false
 
 # java.security.krb5.conf path
-#java.security.krb5.conf.path=/opt/krb5.conf
+java.security.krb5.conf.path=/opt/krb5.conf
 
-# loginUserFromKeytab user
+# login user from keytab username
-#login.user.keytab.username=hdfs-mycluster@ESZ.COM
+login.user.keytab.username=hdfs-mycluster@ESZ.COM
 
 # loginUserFromKeytab path
-#login.user.keytab.path=/opt/hdfs.headless.keytab
+login.user.keytab.path=/opt/hdfs.headless.keytab
 
 #resource.view.suffixs
 #resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
@@ -46,21 +46,21 @@ hdfs.root.user=hdfs
 fs.defaultFS=hdfs://mycluster:8020
 
 # if resource.storage.type=S3，s3 endpoint
-#fs.s3a.endpoint=http://192.168.199.91:9010
+fs.s3a.endpoint=http://192.168.199.91:9010
 
 # if resource.storage.type=S3，s3 access key
-#fs.s3a.access.key=A3DXS30FO22544RE
+fs.s3a.access.key=A3DXS30FO22544RE
 
 # if resource.storage.type=S3，s3 secret key
-#fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
+fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
 
-# if not use hadoop resourcemanager, please keep default value; if resourcemanager HA enable, please type the HA ips ; if resourcemanager is single, make this value empty  TODO
+# if not use hadoop resourcemanager, please keep default value; if resourcemanager HA enable, please type the HA ips ; if resourcemanager is single, make this value empty
 yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
 
-# If resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ark1 to actual resourcemanager hostname.
+# if resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ark1 to actual resourcemanager hostname.
 yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
 
-# system env path. self configuration, please make sure the directory and file exists and have read write execute permissions, TODO
+# system env path
 #dolphinscheduler.env.path=env/dolphinscheduler_env.sh
 
 kerberos.expire.time=7

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DependentUtilsTest.java

@@ -32,6 +32,7 @@ import java.util.List;
 
 public class DependentUtilsTest {
     private static final Logger logger = LoggerFactory.getLogger(ShellExecutorTest.class);
+
     @Test
     public void getDependResultForRelation() {
         //failed

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HadoopUtilsTest.java

@@ -17,88 +17,186 @@
 package org.apache.dolphinscheduler.common.utils;
 
 import org.apache.dolphinscheduler.common.enums.ResourceType;
-import org.junit.Ignore;
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-@Ignore
+@RunWith(MockitoJUnitRunner.class)
+//todo there is no hadoop environment
 public class HadoopUtilsTest {
 
     private static final Logger logger = LoggerFactory.getLogger(HadoopUtilsTest.class);
+    private HadoopUtils hadoopUtils = HadoopUtils.getInstance();
 
     @Test
     public void getActiveRMTest() {
-        logger.info(HadoopUtils.getAppAddress("http://ark1:8088/ws/v1/cluster/apps/%s","192.168.xx.xx,192.168.xx.xx"));
+        try{
+            hadoopUtils.getAppAddress("http://ark1:8088/ws/v1/cluster/apps/%s","192.168.xx.xx,192.168.xx.xx");
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
     }
 
     @Test
-    public void getApplicationStatusAddressTest(){
+    public void rename()  {
-        logger.info(HadoopUtils.getInstance().getApplicationUrl("application_1548381297012_0030"));
+
+        boolean result = false;
+        try {
+            result = hadoopUtils.rename("/dolphinscheduler/hdfs1","/dolphinscheduler/hdfs2");
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
         }
+        Assert.assertEquals(false, result);
+    }
+
 
     @Test
-    public void test() throws IOException {
+    public void getConfiguration(){
-        HadoopUtils.getInstance().copyLocalToHdfs("/root/teamviewer_13.1.8286.x86_64.rpm", "/journey", true, true);
+        Configuration conf = hadoopUtils.getConfiguration();
+
     }
 
     @Test
-    public void readFileTest(){
+    public void mkdir()  {
+        boolean result = false;
         try {
-            byte[] bytes = HadoopUtils.getInstance().catFile("/dolphinscheduler/hdfs/resources/35435.sh");
+            result = hadoopUtils.mkdir("/dolphinscheduler/hdfs");
-            logger.info(new String(bytes));
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        Assert.assertEquals(false, result);
+    }
+
+    @Test
+    public void delete() {
+        boolean result = false;
+        try {
+            result = hadoopUtils.delete("/dolphinscheduler/hdfs",true);
         } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        Assert.assertEquals(false, result);
+    }
 
+    @Test
+    public void exists() {
+        boolean result = false;
+        try {
+            result = hadoopUtils.exists("/dolphinscheduler/hdfs");
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
         }
+        Assert.assertEquals(false, result);
     }
+
     @Test
-    public void testCapacity(){
+    public void getHdfsDataBasePath() {
+        String result = hadoopUtils.getHdfsDataBasePath();
+        Assert.assertEquals("/dolphinscheduler", result);
+    }
 
+    @Test
+    public void getHdfsResDir() {
+        String result = hadoopUtils.getHdfsResDir("11000");
+        Assert.assertEquals("/dolphinscheduler/11000/resources", result);
     }
+
     @Test
-    public void testMove(){
+    public void getHdfsUserDir() {
-        HadoopUtils instance = HadoopUtils.getInstance();
+        String result = hadoopUtils.getHdfsUserDir("11000",1000);
+        Assert.assertEquals("/dolphinscheduler/11000/home/1000", result);
+    }
+
+    @Test
+    public void getHdfsUdfDir()  {
+        String result = hadoopUtils.getHdfsUdfDir("11000");
+        Assert.assertEquals("/dolphinscheduler/11000/udfs", result);
+    }
+
+    @Test
+    public void getHdfsFileName() {
+        String result = hadoopUtils.getHdfsFileName(ResourceType.FILE,"11000","aa.txt");
+        Assert.assertEquals("/dolphinscheduler/11000/resources/aa.txt", result);
+    }
+
+    @Test
+    public void isYarnEnabled() {
+        boolean result = hadoopUtils.isYarnEnabled();
+        Assert.assertEquals(false, result);
+    }
+
+    @Test
+    public void test() {
         try {
-            instance.copy("/opt/apptest/test.dat","/opt/apptest/test.dat.back",true,true);
+            hadoopUtils.copyLocalToHdfs("/root/teamviewer_13.1.8286.x86_64.rpm", "/journey", true, true);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
+    }
 
+    @Test
+    public void readFileTest(){
+        try {
+            byte[] bytes = hadoopUtils.catFile("/dolphinscheduler/hdfs/resources/35435.sh");
+            logger.info(new String(bytes));
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+        }
+    }
+
+
+    @Test
+    public void testMove(){
+        try {
+            hadoopUtils.copy("/opt/apptest/test.dat","/opt/apptest/test.dat.back",true,true);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
 
     }
 
     @Test
     public void getApplicationStatus() {
-         logger.info(HadoopUtils.getInstance().getApplicationStatus("application_1542010131334_0029").toString());
+        try {
+            logger.info(hadoopUtils.getApplicationStatus("application_1542010131334_0029").toString());
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
     }
 
     @Test
     public void getApplicationUrl(){
-        String application_1516778421218_0042 = HadoopUtils.getInstance().getApplicationUrl("application_1529051418016_0167");
+        String application_1516778421218_0042 = hadoopUtils.getApplicationUrl("application_1529051418016_0167");
         logger.info(application_1516778421218_0042);
     }
 
     @Test
-    public void catFileTest()throws Exception{
+    public void catFileWithLimitTest() {
-        List<String> stringList = HadoopUtils.getInstance().catFile("/dolphinscheduler/hdfs/resources/WCSparkPython.py", 0, 1000);
+        List<String> stringList = new ArrayList<>();
+        try {
+            stringList = hadoopUtils.catFile("/dolphinscheduler/hdfs/resources/WCSparkPython.py", 0, 1000);
             logger.info(String.join(",",stringList));
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
         }
-
-    @Test
-    public void getHdfsFileNameTest(){
-        logger.info(HadoopUtils.getHdfsFileName(ResourceType.FILE,"test","/test"));
     }
 
     @Test
-    public void getHdfsResourceFileNameTest(){
+    public void catFileTest() {
-        logger.info(HadoopUtils.getHdfsResourceFileName("test","/test"));
+        byte[] content = new byte[0];
+        try {
+            content = hadoopUtils.catFile("/dolphinscheduler/hdfs/resources/WCSparkPython.py");
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
         }
-
+        logger.info(Arrays.toString(content));
-    @Test
-    public void getHdfsUdfFileNameTest(){
-        logger.info(HadoopUtils.getHdfsUdfFileName("test","/test.jar"));
     }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java

@@ -64,7 +64,7 @@ public class SpringConnectionFactory {
      * @return druid dataSource
      */
     @Bean(destroyMethod="")
-    public static DruidDataSource dataSource() {
+    public DruidDataSource dataSource() {
 
         DruidDataSource druidDataSource = new DruidDataSource();
 

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java

@@ -111,7 +111,7 @@ public class Command {
     /**
      * worker group
      */
-    @TableField(exist = false)
+    @TableField("worker_group")
     private String workerGroup;
 
     public Command() {

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java

@@ -101,9 +101,9 @@ public class ErrorCommand {
     private String message;
 
     /**
-     * worker group id
+     * worker group
      */
-    private int workerGroupId;
+    private String workerGroup;
 
     public ErrorCommand(){}
 
@@ -257,17 +257,25 @@ public class ErrorCommand {
         this.updateTime = updateTime;
     }
 
-    public int getWorkerGroupId() {
+    public String getWorkerGroup() {
-        return workerGroupId;
+        return workerGroup;
     }
 
-    public void setWorkerGroupId(int workerGroupId) {
+    public void setWorkerGroup(String workerGroup) {
-        this.workerGroupId = workerGroupId;
+        this.workerGroup = workerGroup;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
     }
 
     @Override
     public String toString() {
-        return "Command{" +
+        return "ErrorCommand{" +
                 "id=" + id +
                 ", commandType=" + commandType +
                 ", processDefinitionId=" + processDefinitionId +
@@ -281,17 +289,8 @@ public class ErrorCommand {
                 ", startTime=" + startTime +
                 ", processInstancePriority=" + processInstancePriority +
                 ", updateTime=" + updateTime +
-                ", message=" + message +
+                ", message='" + message + '\'' +
+                ", workerGroup='" + workerGroup + '\'' +
                 '}';
     }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java

@@ -377,9 +377,6 @@ public class TaskInstance implements Serializable {
     }
 
 
-    public boolean isSubProcess(){
-        return TaskType.SUB_PROCESS.equals(TaskType.valueOf(this.taskType));
-    }
 
     public String getDependency(){
 
@@ -458,6 +455,18 @@ public class TaskInstance implements Serializable {
         return resources;
     }
 
+    public boolean isSubProcess(){
+        return TaskType.SUB_PROCESS.equals(TaskType.valueOf(this.taskType));
+    }
+
+    public boolean isDependTask(){
+        return TaskType.DEPENDENT.equals(TaskType.valueOf(this.taskType));
+    }
+
+    public boolean isConditionsTask(){
+        return TaskType.CONDITIONS.equals(TaskType.valueOf(this.taskType));
+    }
+
     public void setResources(List<String> resources) {
         this.resources = resources;
     }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java

@@ -361,4 +361,48 @@ public class DagHelper {
         processDag.setNodes(taskNodeList);
         return processDag;
     }
+
+    /**
+     * is there have conditions after the parent node
+     * @param parentNodeName
+     * @return
+     */
+    public static boolean haveConditionsAfterNode(String parentNodeName,
+                                                  DAG<String, TaskNode, TaskNodeRelation> dag
+                                            ){
+        boolean result = false;
+        Set<String> subsequentNodes = dag.getSubsequentNodes(parentNodeName);
+        if(CollectionUtils.isEmpty(subsequentNodes)){
+            return result;
+        }
+        for(String nodeName : subsequentNodes){
+            TaskNode taskNode = dag.getNode(nodeName);
+            List<String> preTasksList = JSONUtils.toList(taskNode.getPreTasks(), String.class);
+            if(preTasksList.contains(parentNodeName) && taskNode.isConditionsTask()){
+                return true;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * is there have conditions after the parent node
+     * @param parentNodeName
+     * @return
+     */
+    public static boolean haveConditionsAfterNode(String parentNodeName,
+                                                  List<TaskNode> taskNodes
+    ){
+        boolean result = false;
+        if(CollectionUtils.isEmpty(taskNodes)){
+            return result;
+        }
+        for(TaskNode taskNode : taskNodes){
+            List<String> preTasksList = JSONUtils.toList(taskNode.getPreTasks(), String.class);
+            if(preTasksList.contains(parentNodeName) && taskNode.isConditionsTask()){
+                return true;
+            }
+        }
+        return result;
+    }
 }

dolphinscheduler-dao/src/main/resources/datasource.properties

@@ -25,9 +25,6 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
 spring.datasource.username=test
 spring.datasource.password=test
 
-## base spring data source configuration todo need to remove
-#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-
 # connection configuration
 #spring.datasource.initialSize=5
 # min connection number

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/entity/TaskInstanceTest.java

@@ -29,11 +29,21 @@ public class TaskInstanceTest {
         TaskInstance taskInstance = new TaskInstance();
 
         //sub process
-        taskInstance.setTaskType("sub process");
+        taskInstance.setTaskType("SUB_PROCESS");
         Assert.assertTrue(taskInstance.isSubProcess());
 
         //not sub process
-        taskInstance.setTaskType("http");
+        taskInstance.setTaskType("HTTP");
         Assert.assertFalse(taskInstance.isSubProcess());
+
+        //sub process
+        taskInstance.setTaskType("CONDITIONS");
+        Assert.assertTrue(taskInstance.isConditionsTask());
+
+        //sub process
+        taskInstance.setTaskType("DEPENDENT");
+        Assert.assertTrue(taskInstance.isDependTask());
+
+
     }
 }

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java

@@ -76,7 +76,8 @@ public class CommandMapperTest {
         //query
         Command actualCommand = commandMapper.selectById(expectedCommand.getId());
 
-        assertEquals(expectedCommand, actualCommand);
+        assertNotNull(actualCommand);
+        assertEquals(expectedCommand.getProcessDefinitionId(), actualCommand.getProcessDefinitionId());
     }
 
     /**
@@ -94,7 +95,8 @@ public class CommandMapperTest {
 
         Command actualCommand = commandMapper.selectById(expectedCommand.getId());
 
-        assertEquals(expectedCommand,actualCommand);
+        assertNotNull(actualCommand);
+        assertEquals(expectedCommand.getUpdateTime(),actualCommand.getUpdateTime());
 
     }
 
@@ -127,13 +129,6 @@ public class CommandMapperTest {
         List<Command> actualCommands = commandMapper.selectList(null);
 
         assertThat(actualCommands.size(), greaterThanOrEqualTo(count));
-
-        for (Command actualCommand : actualCommands){
-            Command expectedCommand = commandMap.get(actualCommand.getId());
-            if (expectedCommand != null){
-                assertEquals(expectedCommand,actualCommand);
-            }
-        }
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java

@@ -16,11 +16,11 @@
  */
 package org.apache.dolphinscheduler.dao.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.dolphinscheduler.common.enums.AlertType;
 import org.apache.dolphinscheduler.common.enums.UserType;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.dolphinscheduler.dao.entity.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -179,6 +179,23 @@ public class UserMapperTest {
         return tenant;
     }
 
+    /**
+     * insert one Tenant
+     * @return Tenant
+     */
+    private Tenant insertOneTenant(Queue queue){
+        Tenant tenant = new Tenant();
+        tenant.setTenantCode("dolphin");
+        tenant.setTenantName("dolphin test");
+        tenant.setDescription("dolphin user use");
+        tenant.setQueueId(queue.getId());
+        tenant.setQueue(queue.getQueue());
+        tenant.setCreateTime(new Date());
+        tenant.setUpdateTime(new Date());
+        tenantMapper.insert(tenant);
+        return tenant;
+    }
+
     /**
      * insert one Queue
      * @return Queue
@@ -291,11 +308,13 @@ public class UserMapperTest {
      */
     @Test
     public void testQueryDetailsById() {
-        //insertOne
+        //insertOneQueue and insertOneTenant
-        User user = insertOne();
+        Queue queue = insertOneQueue();
+        Tenant tenant = insertOneTenant(queue);
+        User user = insertOne(queue,tenant);
         //queryDetailsById
         User queryUser = userMapper.queryDetailsById(user.getId());
-        Assert.assertEquals(queryUser.getUserName(), queryUser.getUserName());
+        Assert.assertEquals(user.getUserName(), queryUser.getUserName());
     }
 
     /**

dolphinscheduler-dist/pom.xml

@@ -257,6 +257,7 @@
                                             </location>
                                             <includes>
                                                 <include>config/*.*</include>
+                                                <include>**/*.xml</include>
                                             </includes>
                                         </source>
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java

@@ -31,6 +31,7 @@ import org.apache.dolphinscheduler.common.task.sqoop.SqoopParameters;
 import org.apache.dolphinscheduler.common.task.sqoop.sources.SourceMysqlParameter;
 import org.apache.dolphinscheduler.common.task.sqoop.targets.TargetMysqlParameter;
 import org.apache.dolphinscheduler.common.thread.Stopper;
+import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.*;
 import org.apache.dolphinscheduler.dao.entity.*;
 import org.apache.dolphinscheduler.server.builder.TaskExecutionContextBuilder;
@@ -53,6 +54,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.apache.dolphinscheduler.common.Constants.*;
+
 /**
  * TaskUpdateQueue consumer
  */
@@ -68,7 +71,7 @@ public class TaskPriorityQueueConsumer extends Thread{
      * taskUpdateQueue
      */
     @Autowired
-    private TaskPriorityQueue taskUpdateQueue;
+    private TaskPriorityQueue taskPriorityQueue;
 
     /**
      * processService
@@ -93,7 +96,7 @@ public class TaskPriorityQueueConsumer extends Thread{
         while (Stopper.isRunning()){
             try {
                 // if not task , blocking here
-                String taskPriorityInfo = taskUpdateQueue.take();
+                String taskPriorityInfo = taskPriorityQueue.take();
 
                 TaskPriority taskPriority = TaskPriority.of(taskPriorityInfo);
 
@@ -114,13 +117,20 @@ public class TaskPriorityQueueConsumer extends Thread{
     private Boolean dispatch(int taskInstanceId){
         TaskExecutionContext context = getTaskExecutionContext(taskInstanceId);
         ExecutionContext executionContext = new ExecutionContext(context.toCommand(), ExecutorType.WORKER, context.getWorkerGroup());
+        Boolean result = false;
+        while (Stopper.isRunning()){
             try {
-            return dispatcher.dispatch(executionContext);
+                result =  dispatcher.dispatch(executionContext);
             } catch (ExecuteException e) {
-            logger.error("execute exception", e);
+                logger.error("dispatch error",e);
-            return false;
+                ThreadUtils.sleep(SLEEP_TIME_MILLIS);
             }
 
+            if (result){
+                break;
+            }
+        }
+        return result;
     }
 
     /**

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java

@@ -19,7 +19,10 @@ package org.apache.dolphinscheduler.server.master.processor;
 
 import io.netty.channel.Channel;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
+import org.apache.dolphinscheduler.common.thread.Stopper;
+import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.Preconditions;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.remote.command.Command;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand;
@@ -31,9 +34,12 @@ import org.apache.dolphinscheduler.server.master.cache.impl.TaskInstanceCacheMan
 import org.apache.dolphinscheduler.server.master.processor.queue.TaskResponseEvent;
 import org.apache.dolphinscheduler.server.master.processor.queue.TaskResponseService;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import org.apache.dolphinscheduler.service.process.ProcessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.dolphinscheduler.common.Constants.*;
+
 /**
  *  task ack processor
  */
@@ -51,9 +57,16 @@ public class TaskAckProcessor implements NettyRequestProcessor {
      */
     private final TaskInstanceCacheManager taskInstanceCacheManager;
 
+
+    /**
+     * processService
+     */
+    private ProcessService processService;
+
     public TaskAckProcessor(){
         this.taskResponseService = SpringApplicationContext.getBean(TaskResponseService.class);
         this.taskInstanceCacheManager = SpringApplicationContext.getBean(TaskInstanceCacheManagerImpl.class);
+        this.processService = SpringApplicationContext.getBean(ProcessService.class);
     }
 
     /**
@@ -71,8 +84,10 @@ public class TaskAckProcessor implements NettyRequestProcessor {
 
         String workerAddress = ChannelUtils.toAddress(channel).getAddress();
 
+        ExecutionStatus ackStatus = ExecutionStatus.of(taskAckCommand.getStatus());
+
         // TaskResponseEvent
-        TaskResponseEvent taskResponseEvent = TaskResponseEvent.newAck(ExecutionStatus.of(taskAckCommand.getStatus()),
+        TaskResponseEvent taskResponseEvent = TaskResponseEvent.newAck(ackStatus,
                 taskAckCommand.getStartTime(),
                 workerAddress,
                 taskAckCommand.getExecutePath(),
@@ -81,6 +96,15 @@ public class TaskAckProcessor implements NettyRequestProcessor {
 
         taskResponseService.addResponse(taskResponseEvent);
 
+        while (Stopper.isRunning()){
+            TaskInstance taskInstance = processService.findTaskInstanceById(taskAckCommand.getTaskInstanceId());
+
+            if (taskInstance != null && ackStatus.typeIsRunning()){
+                break;
+            }
+            ThreadUtils.sleep(SLEEP_TIME_MILLIS);
+        }
+
     }
 
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskResponseProcessor.java

@@ -19,7 +19,10 @@ package org.apache.dolphinscheduler.server.master.processor;
 
 import io.netty.channel.Channel;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
+import org.apache.dolphinscheduler.common.thread.Stopper;
+import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.Preconditions;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.remote.command.Command;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.command.TaskExecuteResponseCommand;
@@ -30,9 +33,12 @@ import org.apache.dolphinscheduler.server.master.cache.impl.TaskInstanceCacheMan
 import org.apache.dolphinscheduler.server.master.processor.queue.TaskResponseEvent;
 import org.apache.dolphinscheduler.server.master.processor.queue.TaskResponseService;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import org.apache.dolphinscheduler.service.process.ProcessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.dolphinscheduler.common.Constants.*;
+
 /**
  *  task response processor
  */
@@ -50,9 +56,15 @@ public class TaskResponseProcessor implements NettyRequestProcessor {
      */
     private final TaskInstanceCacheManager taskInstanceCacheManager;
 
+    /**
+     * processService
+     */
+    private ProcessService processService;
+
     public TaskResponseProcessor(){
         this.taskResponseService = SpringApplicationContext.getBean(TaskResponseService.class);
         this.taskInstanceCacheManager = SpringApplicationContext.getBean(TaskInstanceCacheManagerImpl.class);
+        this.processService = SpringApplicationContext.getBean(ProcessService.class);
     }
 
     /**
@@ -71,6 +83,8 @@ public class TaskResponseProcessor implements NettyRequestProcessor {
 
         taskInstanceCacheManager.cacheTaskInstance(responseCommand);
 
+        ExecutionStatus responseStatus = ExecutionStatus.of(responseCommand.getStatus());
+
         // TaskResponseEvent
         TaskResponseEvent taskResponseEvent = TaskResponseEvent.newResult(ExecutionStatus.of(responseCommand.getStatus()),
                 responseCommand.getEndTime(),
@@ -79,6 +93,15 @@ public class TaskResponseProcessor implements NettyRequestProcessor {
                 responseCommand.getTaskInstanceId());
 
         taskResponseService.addResponse(taskResponseEvent);
+
+        while (Stopper.isRunning()){
+            TaskInstance taskInstance = processService.findTaskInstanceById(taskResponseEvent.getTaskInstanceId());
+
+            if (taskInstance != null && responseStatus.typeIsFinished()){
+                break;
+            }
+            ThreadUtils.sleep(SLEEP_TIME_MILLIS);
+        }
     }
 
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java

@@ -14,32 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.task.conditions;
+package org.apache.dolphinscheduler.server.master.runner;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.DependResult;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.model.DependentItem;
 import org.apache.dolphinscheduler.common.model.DependentTaskModel;
-import org.apache.dolphinscheduler.common.task.AbstractParameters;
 import org.apache.dolphinscheduler.common.task.dependent.DependentParameters;
 import org.apache.dolphinscheduler.common.utils.DependentUtils;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.OSUtils;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.entity.TaskExecutionContext;
+import org.slf4j.LoggerFactory;
-import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
-import org.apache.dolphinscheduler.server.worker.task.TaskProps;
-import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
-import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.slf4j.Logger;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class ConditionsTask extends AbstractTask {
+public class ConditionsTaskExecThread extends MasterBaseTaskExecThread {
 
 
     /**
@@ -48,66 +44,51 @@ public class ConditionsTask extends AbstractTask {
     private DependentParameters dependentParameters;
 
     /**
-     * process dao
+     * complete task map
-     */
-    private ProcessService processService;
-
-    /**
-     * taskInstance
-     */
-    private TaskInstance taskInstance;
-
-    /**
-     *
      */
     private Map<String, ExecutionStatus> completeTaskList = new ConcurrentHashMap<>();
 
-
     /**
-     * taskExecutionContext
+     * condition result
      */
-    private TaskExecutionContext taskExecutionContext;
+    private DependResult conditionResult;
 
     /**
-     * constructor
+     * constructor of MasterBaseTaskExecThread
-     * @param taskExecutionContext taskExecutionContext
      *
-     * @param logger logger
+     * @param taskInstance    task instance
      */
-    public ConditionsTask(TaskExecutionContext taskExecutionContext, Logger logger) {
+    public ConditionsTaskExecThread(TaskInstance taskInstance) {
-        super(taskExecutionContext, logger);
+        super(taskInstance);
-        this.taskExecutionContext = taskExecutionContext;
     }
 
     @Override
-    public void init() throws Exception {
+    public Boolean submitWaitComplete() {
-        logger.info("conditions task initialize");
+        try{
-
+            this.taskInstance = submit();
-        this.processService = SpringApplicationContext.getBean(ProcessService.class);
+            logger = LoggerFactory.getLogger(LoggerUtils.buildTaskId(LoggerUtils.TASK_LOGGER_INFO_PREFIX,
-
+                    taskInstance.getProcessDefinitionId(),
-        this.dependentParameters = JSONUtils.parseObject(taskExecutionContext.
+                    taskInstance.getProcessInstanceId(),
-                getDependenceTaskExecutionContext()
+                    taskInstance.getId()));
-                .getDependence(),
+            String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT, processService.formatTaskAppId(this.taskInstance));
-                DependentParameters.class);
+            Thread.currentThread().setName(threadLoggerInfoName);
-
+            initTaskParameters();
-        this.taskInstance = processService.findTaskInstanceById(taskExecutionContext.getTaskInstanceId());
+            logger.info("dependent task start");
-
+            waitTaskQuit();
-        if(taskInstance == null){
+            updateTaskState();
-            throw new Exception("cannot find the task instance!");
+        }catch (Exception e){
-        }
+            logger.error("conditions task run exception" , e);
-
-        List<TaskInstance> taskInstanceList = processService.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());
-        for(TaskInstance task : taskInstanceList){
-            this.completeTaskList.putIfAbsent(task.getName(), task.getState());
         }
+        return true;
     }
 
-    @Override
+    private void waitTaskQuit() {
-    public void handle() throws Exception {
+        List<TaskInstance> taskInstances = processService.findValidTaskListByProcessId(
-
+                taskInstance.getProcessInstanceId()
-        String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT,
+        );
-                taskExecutionContext.getTaskAppId());
+        for(TaskInstance task : taskInstances){
-        Thread.currentThread().setName(threadLoggerInfoName);
+            completeTaskList.putIfAbsent(task.getName(), task.getState());
+        }
 
         List<DependResult> modelResultList = new ArrayList<>();
         for(DependentTaskModel dependentTaskModel : dependentParameters.getDependTaskList()){
@@ -119,14 +100,43 @@ public class ConditionsTask extends AbstractTask {
             DependResult modelResult = DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(), itemDependResult);
             modelResultList.add(modelResult);
         }
-        DependResult result = DependentUtils.getDependResultForRelation(
+        conditionResult = DependentUtils.getDependResultForRelation(
                 dependentParameters.getRelation(), modelResultList
         );
-        logger.info("the conditions task depend result : {}", result);
+        logger.info("the conditions task depend result : {}", conditionResult);
-        exitStatusCode = (result == DependResult.SUCCESS) ?
-                Constants.EXIT_CODE_SUCCESS : Constants.EXIT_CODE_FAILURE;
     }
 
+    /**
+     *
+     */
+    private void updateTaskState() {
+        ExecutionStatus status;
+        if(this.cancel){
+            status = ExecutionStatus.KILL;
+        }else{
+            status = (conditionResult == DependResult.SUCCESS) ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE;
+        }
+        taskInstance.setState(status);
+        taskInstance.setEndTime(new Date());
+        processService.updateTaskInstance(taskInstance);
+    }
+
+    private void initTaskParameters() {
+        this.taskInstance.setLogPath(getTaskLogPath(taskInstance));
+        this.taskInstance.setHost(OSUtils.getHost() + Constants.COLON + masterConfig.getListenPort());
+        taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+        taskInstance.setStartTime(new Date());
+        this.processService.saveTaskInstance(taskInstance);
+
+        this.dependentParameters = JSONUtils.parseObject(this.taskInstance.getDependency(), DependentParameters.class);
+    }
+
+
+    /**
+     * depend result for depend item
+     * @param item
+     * @return
+     */
     private DependResult getDependResultForItem(DependentItem item){
 
         DependResult dependResult = DependResult.SUCCESS;
@@ -137,16 +147,13 @@ public class ConditionsTask extends AbstractTask {
         }
         ExecutionStatus executionStatus = completeTaskList.get(item.getDepTasks());
         if(executionStatus != item.getStatus()){
-            logger.info("depend item : {} expect status: {}, actual status: {}" ,item.getDepTasks(), item.getStatus().toString(), executionStatus.toString());
+            logger.info("depend item : {} expect status: {}, actual status: {}" ,item.getDepTasks(), item.getStatus(), executionStatus);
             dependResult = DependResult.FAILED;
         }
-        logger.info("depend item: {}, depend result: {}",
+        logger.info("dependent item complete {} {},{}",
-                item.getDepTasks(), dependResult);
+                Constants.DEPENDENT_SPLIT, item.getDepTasks(), dependResult);
         return dependResult;
     }
 
-    @Override
+
-    public AbstractParameters getParameters() {
-        return null;
-    }
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java

@@ -0,0 +1,217 @@
+/*
+ * 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.master.runner;
+
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.DependResult;
+import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
+import org.apache.dolphinscheduler.common.model.DependentTaskModel;
+import org.apache.dolphinscheduler.common.task.dependent.DependentParameters;
+import org.apache.dolphinscheduler.common.thread.Stopper;
+import org.apache.dolphinscheduler.common.utils.DependentUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.common.utils.LoggerUtils;
+import org.apache.dolphinscheduler.common.utils.OSUtils;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.server.utils.DependentExecute;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
+
+public class DependentTaskExecThread extends MasterBaseTaskExecThread {
+
+    private DependentParameters dependentParameters;
+
+    /**
+     * dependent task list
+     */
+    private List<DependentExecute> dependentTaskList = new ArrayList<>();
+
+    /**
+     * depend item result map
+     * save the result to log file
+     */
+    private Map<String, DependResult> dependResultMap = new HashMap<>();
+
+
+    /**
+     * dependent date
+     */
+    private Date dependentDate;
+
+    /**
+     * constructor of MasterBaseTaskExecThread
+     *
+     * @param taskInstance    task instance
+     */
+    public DependentTaskExecThread(TaskInstance taskInstance) {
+        super(taskInstance);
+    }
+
+
+    @Override
+    public Boolean submitWaitComplete() {
+        try{
+            logger.info("dependent task start");
+            this.taskInstance = submit();
+            logger = LoggerFactory.getLogger(LoggerUtils.buildTaskId(LoggerUtils.TASK_LOGGER_INFO_PREFIX,
+                    taskInstance.getProcessDefinitionId(),
+                    taskInstance.getProcessInstanceId(),
+                    taskInstance.getId()));
+            String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT, processService.formatTaskAppId(this.taskInstance));
+            Thread.currentThread().setName(threadLoggerInfoName);
+            initTaskParameters();
+            initDependParameters();
+            waitTaskQuit();
+            updateTaskState();
+        }catch (Exception e){
+            logger.error("dependent task run exception" , e);
+        }
+        return true;
+    }
+
+    /**
+     * init dependent parameters
+     */
+    private void initDependParameters() {
+
+        this.dependentParameters = JSONUtils.parseObject(this.taskInstance.getDependency(),
+                DependentParameters.class);
+
+        for(DependentTaskModel taskModel : dependentParameters.getDependTaskList()){
+            this.dependentTaskList.add(new DependentExecute(
+                    taskModel.getDependItemList(), taskModel.getRelation()));
+        }
+        if(this.processInstance.getScheduleTime() != null){
+            this.dependentDate = this.processInstance.getScheduleTime();
+        }else{
+            this.dependentDate = new Date();
+        }
+    }
+
+    /**
+     *
+     */
+    private void updateTaskState() {
+        ExecutionStatus status;
+        if(this.cancel){
+            status = ExecutionStatus.KILL;
+        }else{
+            DependResult result = getTaskDependResult();
+            status = (result == DependResult.SUCCESS) ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE;
+        }
+        taskInstance.setState(status);
+        taskInstance.setEndTime(new Date());
+        processService.saveTaskInstance(taskInstance);
+    }
+
+    /**
+     * wait dependent tasks quit
+     */
+    private Boolean waitTaskQuit() {
+        logger.info("wait depend task : {} complete", this.taskInstance.getName());
+        if (taskInstance.getState().typeIsFinished()) {
+            logger.info("task {} already complete. task state:{}",
+                    this.taskInstance.getName(),
+                    this.taskInstance.getState());
+            return true;
+        }
+        while (Stopper.isRunning()) {
+            try{
+                if(this.processInstance == null){
+                    logger.error("process instance not exists , master task exec thread exit");
+                    return true;
+                }
+                if(this.cancel || this.processInstance.getState() == ExecutionStatus.READY_STOP){
+                    cancelTaskInstance();
+                    break;
+                }
+
+                if ( allDependentTaskFinish() || taskInstance.getState().typeIsFinished()){
+                    break;
+                }
+                // updateProcessInstance task instance
+                taskInstance = processService.findTaskInstanceById(taskInstance.getId());
+                processInstance = processService.findProcessInstanceById(processInstance.getId());
+                Thread.sleep(Constants.SLEEP_TIME_MILLIS);
+            } catch (Exception e) {
+                logger.error("exception",e);
+                if (processInstance != null) {
+                    logger.error("wait task quit failed, instance id:{}, task id:{}",
+                            processInstance.getId(), taskInstance.getId());
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * cancel dependent task
+     */
+    private void cancelTaskInstance() {
+        this.cancel = true;
+    }
+
+    private void initTaskParameters() {
+        taskInstance.setLogPath(getTaskLogPath(taskInstance));
+        taskInstance.setHost(OSUtils.getHost() + Constants.COLON + masterConfig.getListenPort());
+        taskInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+        taskInstance.setStartTime(new Date());
+        processService.updateTaskInstance(taskInstance);
+    }
+
+    /**
+     * judge all dependent tasks finish
+     * @return whether all dependent tasks finish
+     */
+    private boolean allDependentTaskFinish(){
+        boolean finish = true;
+        for(DependentExecute dependentExecute : dependentTaskList){
+            for(Map.Entry<String, DependResult> entry: dependentExecute.getDependResultMap().entrySet()) {
+                if(!dependResultMap.containsKey(entry.getKey())){
+                    dependResultMap.put(entry.getKey(), entry.getValue());
+                    //save depend result to log
+                    logger.info("dependent item complete {} {},{}",
+                            DEPENDENT_SPLIT, entry.getKey(), entry.getValue());
+                }
+            }
+            if(!dependentExecute.finish(dependentDate)){
+                finish = false;
+            }
+        }
+        return finish;
+    }
+
+    /**
+     * get dependent result
+     * @return DependResult
+     */
+    private DependResult getTaskDependResult(){
+        List<DependResult> dependResultList = new ArrayList<>();
+        for(DependentExecute dependentExecute : dependentTaskList){
+            DependResult dependResult = dependentExecute.getModelDependResult(dependentDate);
+            dependResultList.add(dependResult);
+        }
+        DependResult result = DependentUtils.getDependResultForRelation(
+                this.dependentParameters.getRelation(), dependResultList
+        );
+        logger.info("dependent task completed, dependent result:{}", result);
+        return result;
+    }
+}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java

@@ -16,11 +16,15 @@
  */
 package org.apache.dolphinscheduler.server.master.runner;
 
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.sift.SiftingAppender;
+import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.dao.AlertDao;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.server.log.TaskLogDiscriminator;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 import org.apache.dolphinscheduler.service.process.ProcessService;
@@ -41,7 +45,8 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
     /**
      * logger of MasterBaseTaskExecThread
      */
-    private static final Logger logger = LoggerFactory.getLogger(MasterBaseTaskExecThread.class);
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
 
     /**
      * process service
@@ -71,7 +76,7 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
     /**
      * master config
      */
-    private MasterConfig masterConfig;
+    protected MasterConfig masterConfig;
 
     /**
      * taskUpdateQueue
@@ -80,12 +85,10 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
     /**
      * constructor of MasterBaseTaskExecThread
      * @param taskInstance      task instance
-     * @param processInstance   process instance
      */
-    public MasterBaseTaskExecThread(TaskInstance taskInstance, ProcessInstance processInstance){
+    public MasterBaseTaskExecThread(TaskInstance taskInstance){
         this.processService = SpringApplicationContext.getBean(ProcessService.class);
         this.alertDao = SpringApplicationContext.getBean(AlertDao.class);
-        this.processInstance = processInstance;
         this.cancel = false;
         this.taskInstance = taskInstance;
         this.masterConfig = SpringApplicationContext.getBean(MasterConfig.class);
@@ -123,7 +126,7 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
             try {
                 if(!submitDB){
                     // submit task to db
-                    task = processService.submitTask(taskInstance, processInstance);
+                    task = processService.submitTask(taskInstance);
                     if(task != null && task.getId() != 0){
                         submitDB = true;
                     }
@@ -159,7 +162,9 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
     public Boolean dispatchTask(TaskInstance taskInstance) {
 
         try{
-            if(taskInstance.isSubProcess()){
+            if(taskInstance.isConditionsTask()
+                    || taskInstance.isDependTask()
+                    || taskInstance.isSubProcess()){
                 return true;
             }
             if(taskInstance.getState().typeIsFinished()){
@@ -233,7 +238,39 @@ public class MasterBaseTaskExecThread implements Callable<Boolean> {
      */
     @Override
     public Boolean call() throws Exception {
+        this.processInstance = processService.findProcessInstanceById(taskInstance.getProcessInstanceId());
         return submitWaitComplete();
     }
 
+    /**
+     * get task log path
+     * @return log path
+     */
+    public String getTaskLogPath(TaskInstance task) {
+        String logPath;
+        try{
+            String baseLog = ((TaskLogDiscriminator) ((SiftingAppender) ((LoggerContext) LoggerFactory.getILoggerFactory())
+                    .getLogger("ROOT")
+                    .getAppender("TASKLOGFILE"))
+                    .getDiscriminator()).getLogBase();
+            if (baseLog.startsWith(Constants.SINGLE_SLASH)){
+                logPath =  baseLog + Constants.SINGLE_SLASH +
+                        task.getProcessDefinitionId() + Constants.SINGLE_SLASH  +
+                        task.getProcessInstanceId() + Constants.SINGLE_SLASH  +
+                        task.getId() + ".log";
+            }else{
+                logPath = System.getProperty("user.dir") + Constants.SINGLE_SLASH +
+                        baseLog +  Constants.SINGLE_SLASH +
+                        task.getProcessDefinitionId() + Constants.SINGLE_SLASH  +
+                        task.getProcessInstanceId() + Constants.SINGLE_SLASH  +
+                        task.getId() + ".log";
+            }
+        }catch (Exception e){
+            logger.error("logger", e);
+            logPath = "";
+        }
+        return logPath;
+    }
+
+
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

@@ -365,7 +365,6 @@ public class MasterExecThread implements Runnable {
         }
         // generate process dag
         dag = DagHelper.buildDagGraph(processDag);
-
     }
 
     /**
@@ -418,9 +417,13 @@ public class MasterExecThread implements Runnable {
     private TaskInstance submitTaskExec(TaskInstance taskInstance) {
         MasterBaseTaskExecThread abstractExecThread = null;
         if(taskInstance.isSubProcess()){
-            abstractExecThread = new SubProcessTaskExecThread(taskInstance, processInstance);
+            abstractExecThread = new SubProcessTaskExecThread(taskInstance);
+        }else if(taskInstance.isDependTask()){
+            abstractExecThread = new DependentTaskExecThread(taskInstance);
+        }else if(taskInstance.isConditionsTask()){
+            abstractExecThread = new ConditionsTaskExecThread(taskInstance);
         }else {
-            abstractExecThread = new MasterTaskExecThread(taskInstance, processInstance);
+            abstractExecThread = new MasterTaskExecThread(taskInstance);
         }
         Future<Boolean> future = taskExecService.submit(abstractExecThread);
         activeTaskNode.putIfAbsent(abstractExecThread, future);
@@ -504,27 +507,7 @@ public class MasterExecThread implements Runnable {
         return taskInstance;
     }
 
-    /**
-     * is there have conditions after the parent node
-     * @param parentNodeName
-     * @return
-     */
-    private boolean haveConditionsAfterNode(String parentNodeName){
 
-        boolean result = false;
-        Collection<String> startVertex = DagHelper.getStartVertex(parentNodeName, dag, completeTaskList);
-        if(startVertex == null){
-            return result;
-        }
-        for(String nodeName : startVertex){
-            TaskNode taskNode = dag.getNode(nodeName);
-            if(taskNode.getType().equals(TaskType.CONDITIONS.toString())){
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
 
     /**
      * if all of the task dependence are skip, skip it too.
@@ -701,7 +684,7 @@ public class MasterExecThread implements Runnable {
             ExecutionStatus depTaskState = completeTaskList.get(depsNode).getState();
             // conditions task would not return failed.
             if(depTaskState.typeIsFailure()
-                    && !haveConditionsAfterNode(depsNode)
+                    && !DagHelper.haveConditionsAfterNode(depsNode, dag )
                     && !dag.getNode(depsNode).isConditionsTask()){
                 return DependResult.FAILED;
             }
@@ -914,7 +897,7 @@ public class MasterExecThread implements Runnable {
                     processInstance.getId(), processInstance.getName(),
                     processInstance.getState(), state,
                     processInstance.getCommandType());
-            processInstance.setState(state);
+
             ProcessInstance instance = processService.findProcessInstanceById(processInstance.getId());
             instance.setState(state);
             instance.setProcessDefinition(processInstance.getProcessDefinition());
@@ -1017,8 +1000,8 @@ public class MasterExecThread implements Runnable {
                         addTaskToStandByList(task);
                     }else{
                         completeTaskList.put(task.getName(), task);
-                        if( task.getTaskType().equals(TaskType.CONDITIONS.toString()) ||
+                        if( task.isConditionsTask()
-                                haveConditionsAfterNode(task.getName())) {
+                            || DagHelper.haveConditionsAfterNode(task.getName(), dag)) {
                             submitPostNode(task.getName());
                         }else{
                             errorTaskList.put(task.getName(), task);

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java

@@ -16,7 +16,6 @@
  */
 package org.apache.dolphinscheduler.server.master.runner;
 
-import org.slf4j.Logger;
 
 
 import com.alibaba.fastjson.JSON;
@@ -28,7 +27,6 @@ import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter;
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
 import org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand;
 import org.apache.dolphinscheduler.remote.utils.Host;
@@ -38,7 +36,6 @@ import org.apache.dolphinscheduler.server.master.dispatch.context.ExecutionConte
 import org.apache.dolphinscheduler.server.master.dispatch.enums.ExecutorType;
 import org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
@@ -48,12 +45,6 @@ import java.util.Date;
  */
 public class MasterTaskExecThread extends MasterBaseTaskExecThread {
 
-    /**
-     * logger of MasterTaskExecThread
-     */
-    private static final Logger logger = LoggerFactory.getLogger(MasterTaskExecThread.class);
-
-
     /**
      * taskInstance state manager
      */
@@ -65,10 +56,9 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
     /**
      * constructor of MasterTaskExecThread
      * @param taskInstance      task instance
-     * @param processInstance   process instance
      */
-    public MasterTaskExecThread(TaskInstance taskInstance, ProcessInstance processInstance){
+    public MasterTaskExecThread(TaskInstance taskInstance){
-        super(taskInstance, processInstance);
+        super(taskInstance);
         this.taskInstanceCacheManager = SpringApplicationContext.getBean(TaskInstanceCacheManagerImpl.class);
         this.nettyExecutorManager = SpringApplicationContext.getBean(NettyExecutorManager.class);
     }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java

@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
@@ -31,11 +29,6 @@ import java.util.Date;
  */
 public class SubProcessTaskExecThread extends MasterBaseTaskExecThread {
 
-    /**
-     * logger of SubProcessTaskExecThread
-     */
-    private static final Logger logger = LoggerFactory.getLogger(SubProcessTaskExecThread.class);
-
     /**
      * sub process instance
      */
@@ -44,10 +37,9 @@ public class SubProcessTaskExecThread extends MasterBaseTaskExecThread {
     /**
      * sub process task exec thread
      * @param taskInstance      task instance
-     * @param processInstance   process instance
      */
-    public SubProcessTaskExecThread(TaskInstance taskInstance, ProcessInstance processInstance){
+    public SubProcessTaskExecThread(TaskInstance taskInstance){
-        super(taskInstance, processInstance);
+        super(taskInstance);
     }
 
     @Override

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.task.dependent;
+package org.apache.dolphinscheduler.server.utils;
 
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.DependResult;
@@ -23,9 +23,11 @@ import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.model.DateInterval;
 import org.apache.dolphinscheduler.common.model.DependentItem;
 import org.apache.dolphinscheduler.common.model.TaskNode;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.DependentUtils;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.dao.utils.DagHelper;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 import org.apache.dolphinscheduler.service.process.ProcessService;
 import org.slf4j.Logger;
@@ -108,31 +110,7 @@ public class DependentExecute {
             }
             // need to check workflow for updates, so get all task and check the task state
             if(dependentItem.getDepTasks().equals(Constants.DEPENDENT_ALL)){
-                List<TaskNode> taskNodes =
+                result = dependResultByProcessInstance(processInstance);
-                        processService.getTaskNodeListByDefinitionId(dependentItem.getDefinitionId());
-
-                if(taskNodes != null && taskNodes.size() > 0){
-                    List<DependResult> results = new ArrayList<>();
-                    DependResult tmpResult =  DependResult.FAILED;
-                    for(TaskNode taskNode:taskNodes){
-                        tmpResult = getDependTaskResult(taskNode.getName(),processInstance);
-                        if(DependResult.FAILED == tmpResult){
-                            break;
-                        }else{
-                            results.add(getDependTaskResult(taskNode.getName(),processInstance));
-                        }
-                    }
-
-                    if(DependResult.FAILED == tmpResult){
-                        result = DependResult.FAILED;
-                    }else if(results.contains(DependResult.WAITING)){
-                        result = DependResult.WAITING;
-                    }else{
-                        result =  DependResult.SUCCESS;
-                    }
-                }else{
-                    result = DependResult.FAILED;
-                }
             }else{
                 result = getDependTaskResult(dependentItem.getDepTasks(),processInstance);
             }
@@ -143,6 +121,32 @@ public class DependentExecute {
         return result;
     }
 
+    /**
+     * depend type = depend_all
+     * skip the condition tasks.
+     * judge all the task
+     * @return
+     */
+    private DependResult dependResultByProcessInstance(ProcessInstance processInstance){
+        DependResult result = DependResult.FAILED;
+        List<TaskNode> taskNodes =
+                processService.getTaskNodeListByDefinitionId(processInstance.getProcessDefinitionId());
+        if(CollectionUtils.isEmpty(taskNodes)) {
+            return result;
+        }
+        for(TaskNode taskNode:taskNodes){
+            if(taskNode.isConditionsTask()
+                    || DagHelper.haveConditionsAfterNode(taskNode.getName(), taskNodes)){
+                continue;
+            }
+            DependResult tmpResult = getDependTaskResult(taskNode.getName(),processInstance);
+            if(DependResult.SUCCESS != tmpResult){
+                return tmpResult;
+            }
+        }
+        return DependResult.SUCCESS;
+    }
+
     /**
      * get depend task result
      * @param taskName
@@ -150,7 +154,7 @@ public class DependentExecute {
      * @return
      */
     private DependResult getDependTaskResult(String taskName, ProcessInstance processInstance) {
-        DependResult result = DependResult.FAILED;
+        DependResult result;
         TaskInstance taskInstance = null;
         List<TaskInstance> taskInstanceList = processService.findValidTaskListByProcessId(processInstance.getId());
 
@@ -182,7 +186,7 @@ public class DependentExecute {
      */
     private ProcessInstance findLastProcessInterval(int definitionId, DateInterval dateInterval) {
 
-        ProcessInstance runningProcess = processService.findLastRunningProcess(definitionId, dateInterval);
+        ProcessInstance runningProcess = processService.findLastRunningProcess(definitionId, dateInterval.getStartTime(), dateInterval.getEndTime());
         if(runningProcess != null){
             return runningProcess;
         }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java

@@ -21,6 +21,8 @@ package org.apache.dolphinscheduler.server.worker.processor;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
+import org.apache.dolphinscheduler.common.thread.Stopper;
+import org.apache.dolphinscheduler.common.thread.ThreadUtils;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.remote.NettyRemotingClient;
 import org.apache.dolphinscheduler.remote.command.Command;
@@ -35,6 +37,8 @@ import org.springframework.stereotype.Service;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static org.apache.dolphinscheduler.common.Constants.SLEEP_TIME_MILLIS;
+
 /**
  *  taks callback service
  */
@@ -92,9 +96,15 @@ public class TaskCallbackService {
             return getRemoteChannel(newChannel, nettyRemoteChannel.getOpaque(), taskInstanceId);
         }
         logger.warn("original master : {} is not reachable, random select master", nettyRemoteChannel.getHost());
-        Set<String> masterNodes = zookeeperRegistryCenter.getMasterNodesDirectly();
+        Set<String> masterNodes = null;
+        while (Stopper.isRunning()) {
+            masterNodes = zookeeperRegistryCenter.getMasterNodesDirectly();
             if (CollectionUtils.isEmpty(masterNodes)) {
-            throw new IllegalStateException("no available master node exception");
+                logger.error("no available master node");
+                ThreadUtils.sleep(SLEEP_TIME_MILLIS);
+            }else {
+                break;
+            }
         }
         for(String masterNode : masterNodes){
             newChannel = nettyRemotingClient.getChannel(Host.of(masterNode));

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java

@@ -20,7 +20,6 @@ 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.entity.TaskExecutionContext;
-import org.apache.dolphinscheduler.server.worker.task.conditions.ConditionsTask;
 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;
@@ -69,8 +68,6 @@ public class TaskManager {
         return new DataxTask(taskExecutionContext, logger);
       case SQOOP:
         return new SqoopTask(taskExecutionContext, logger);
-      case CONDITIONS:
-        return new ConditionsTask(taskExecutionContext, logger);
       default:
         logger.error("unsupport task type: {}", taskExecutionContext.getTaskType());
         throw new IllegalArgumentException("not support task type");

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java

@@ -1,198 +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.task.dependent;
-
-import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.enums.DependResult;
-import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
-import org.apache.dolphinscheduler.common.model.DependentTaskModel;
-import org.apache.dolphinscheduler.common.task.AbstractParameters;
-import org.apache.dolphinscheduler.common.task.dependent.DependentParameters;
-import org.apache.dolphinscheduler.common.thread.Stopper;
-import org.apache.dolphinscheduler.common.utils.DependentUtils;
-import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.entity.TaskExecutionContext;
-import org.apache.dolphinscheduler.server.worker.task.AbstractTask;
-import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
-import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.slf4j.Logger;
-
-import java.util.*;
-
-import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
-
-/**
- * Dependent Task
- */
-public class DependentTask extends AbstractTask {
-
-    /**
-     * dependent task list
-     */
-    private List<DependentExecute> dependentTaskList = new ArrayList<>();
-
-    /**
-     * depend item result map
-     * save the result to log file
-     */
-    private Map<String, DependResult> dependResultMap = new HashMap<>();
-
-    /**
-     * dependent parameters
-     */
-    private DependentParameters dependentParameters;
-
-    /**
-     * dependent date
-     */
-    private Date dependentDate;
-
-    /**
-     * process service
-     */
-    private ProcessService processService;
-
-    /**
-     * taskExecutionContext
-     */
-    private TaskExecutionContext taskExecutionContext;
-
-    /**
-     * constructor
-     * @param taskExecutionContext     taskExecutionContext
-     * @param logger    logger
-     */
-    public DependentTask(TaskExecutionContext taskExecutionContext, Logger logger) {
-        super(taskExecutionContext, logger);
-        this.taskExecutionContext = taskExecutionContext;
-    }
-
-    @Override
-    public void init(){
-        logger.info("dependent task initialize");
-
-        this.dependentParameters = JSONUtils.parseObject(null,
-                DependentParameters.class);
-        if(dependentParameters != null){
-            for(DependentTaskModel taskModel : dependentParameters.getDependTaskList()){
-                this.dependentTaskList.add(new DependentExecute(
-                        taskModel.getDependItemList(), taskModel.getRelation()));
-            }
-        }
-
-        this.processService = SpringApplicationContext.getBean(ProcessService.class);
-
-        if(taskExecutionContext.getScheduleTime() != null){
-            this.dependentDate = taskExecutionContext.getScheduleTime();
-        }else{
-            this.dependentDate = taskExecutionContext.getStartTime();
-        }
-
-    }
-
-    @Override
-    public void handle() throws Exception {
-        // set the name of the current thread
-        String threadLoggerInfoName = String.format(Constants.TASK_LOG_INFO_FORMAT, taskExecutionContext.getTaskAppId());
-        Thread.currentThread().setName(threadLoggerInfoName);
-
-        try{
-            TaskInstance taskInstance = null;
-            while(Stopper.isRunning()){
-                taskInstance = processService.findTaskInstanceById(this.taskExecutionContext.getTaskInstanceId());
-
-                if(taskInstance == null){
-                    exitStatusCode = -1;
-                    break;
-                }
-
-                if(taskInstance.getState() == ExecutionStatus.KILL){
-                    this.cancel = true;
-                }
-
-                if(this.cancel || allDependentTaskFinish()){
-                    break;
-                }
-
-                Thread.sleep(Constants.SLEEP_TIME_MILLIS);
-            }
-
-            if(cancel){
-                exitStatusCode = Constants.EXIT_CODE_KILL;
-            }else{
-                DependResult result = getTaskDependResult();
-                exitStatusCode = (result == DependResult.SUCCESS) ?
-                        Constants.EXIT_CODE_SUCCESS : Constants.EXIT_CODE_FAILURE;
-            }
-        }catch (Exception e){
-            logger.error(e.getMessage(),e);
-            exitStatusCode = -1;
-            throw e;
-        }
-    }
-
-    /**
-     * get dependent result
-     * @return DependResult
-     */
-    private DependResult getTaskDependResult(){
-        List<DependResult> dependResultList = new ArrayList<>();
-        for(DependentExecute dependentExecute : dependentTaskList){
-            DependResult dependResult = dependentExecute.getModelDependResult(dependentDate);
-            dependResultList.add(dependResult);
-        }
-        DependResult result = DependentUtils.getDependResultForRelation(
-                this.dependentParameters.getRelation(), dependResultList
-        );
-        return result;
-    }
-
-    /**
-     * judge all dependent tasks finish
-     * @return whether all dependent tasks finish
-     */
-    private boolean allDependentTaskFinish(){
-        boolean finish = true;
-        for(DependentExecute dependentExecute : dependentTaskList){
-            for(Map.Entry<String, DependResult> entry: dependentExecute.getDependResultMap().entrySet()) {
-                if(!dependResultMap.containsKey(entry.getKey())){
-                    dependResultMap.put(entry.getKey(), entry.getValue());
-                    //save depend result to log
-                    logger.info("dependent item complete {} {},{}",
-                            DEPENDENT_SPLIT, entry.getKey(), entry.getValue().toString());
-                }
-            }
-            if(!dependentExecute.finish(dependentDate)){
-                finish = false;
-            }
-        }
-        return finish;
-    }
-
-
-    @Override
-    public void cancelApplication(boolean cancelApplication) throws Exception {
-        // cancel process
-        this.cancel = true;
-    }
-
-    @Override
-    public AbstractParameters getParameters() {
-        return null;
-    }
-}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

@@ -214,11 +214,8 @@ public class SqlTask extends AbstractTask {
         try {
             // if upload resource is HDFS and kerberos startup
             CommonUtils.loadKerberosConf();
-
-
             // create connection
             connection = createConnection();
-
             // create temp function
             if (CollectionUtils.isNotEmpty(createFuncs)) {
                 createTempFunction(connection,createFuncs);
@@ -226,13 +223,12 @@ public class SqlTask extends AbstractTask {
 
             // pre sql
             preSql(connection,preStatementsBinds);
-
-
             stmt = prepareStatementAndBind(connection, mainSqlBinds);
-            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
+                resultSet = stmt.executeQuery();
                 resultProcess(resultSet);
 
             } else if (sqlParameters.getSqlType() == SqlType.NON_QUERY.ordinal()) {

dolphinscheduler-server/src/main/resources/config/install_config.conf

@@ -15,11 +15,126 @@
 # limitations under the License.
 #
 
-installPath=/data1_1T/dolphinscheduler
+
-deployUser=dolphinscheduler
+# NOTICE :  If the following config has special characters in the variable `.*[]^${}\+?|()@#&`, Please escape, for example, `[` escape to `\[`
-ips=ark0,ark1,ark2,ark3,ark4
+# postgresql or mysql
-sshPort=22
+dbtype="mysql"
-masters=ark0,ark1
+
-workers=ark2,ark3,ark4
+# db config
-alertServer=ark3
+# db address and port
-apiServers=ark1
+dbhost="192.168.xx.xx:3306"
+
+# db username
+username="xx"
+
+# db passwprd
+# NOTICE: if there are special characters, please use the \ to escape, for example, `[` escape to `\[`
+password="xx"
+
+# zk cluster
+zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
+
+# Note: the target installation path for dolphinscheduler, please not config as the same as the current path (pwd)
+installPath="/data1_1T/dolphinscheduler"
+
+# deployment user
+# Note: the deployment user needs to have sudo privileges and permissions to operate hdfs. If hdfs is enabled, the root directory needs to be created by itself
+deployUser="dolphinscheduler"
+
+
+# alert config
+# mail server host
+mailServerHost="smtp.exmail.qq.com"
+
+# mail server port
+# note: Different protocols and encryption methods correspond to different ports, when SSL/TLS is enabled, make sure the port is correct.
+mailServerPort="25"
+
+# sender
+mailSender="xxxxxxxxxx"
+
+# user
+mailUser="xxxxxxxxxx"
+
+# sender password
+# note: The mail.passwd is email service authorization code, not the email login password.
+mailPassword="xxxxxxxxxx"
+
+# TLS mail protocol support
+starttlsEnable="false"
+
+sslTrust="xxxxxxxxxx"
+
+# SSL mail protocol support
+# note: The SSL protocol is enabled by default.
+# only one of TLS and SSL can be in the true state.
+sslEnable="true"
+
+
+# resource storage type：HDFS,S3,NONE
+resourceStorageType="NONE"
+
+# if resourceStorageType is HDFS，defaultFS write namenode address，HA you need to put core-site.xml and hdfs-site.xml in the conf directory.
+# if S3，write S3 address，HA，for example ：s3a://dolphinscheduler，
+# Note，s3 be sure to create the root directory /dolphinscheduler
+defaultFS="hdfs://mycluster:8020"
+
+# if resourceStorageType is S3, the following three configuration is required, otherwise please ignore
+s3Endpoint="http://192.168.xx.xx:9010"
+s3AccessKey="xxxxxxxxxx"
+s3SecretKey="xxxxxxxxxx"
+
+# if not use hadoop resourcemanager, please keep default value; if resourcemanager HA enable, please type the HA ips ; if resourcemanager is single, make this value empty
+yarnHaIps="192.168.xx.xx,192.168.xx.xx"
+
+# if resourcemanager HA enable or not use resourcemanager, please keep the default value; If resourcemanager is single, you only need to replace ark1 to actual resourcemanager hostname.
+singleYarnIp="ark1"
+
+# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs path, self configuration, please make sure the directory exists on hdfs and have read write permissions。/dolphinscheduler is recommended
+resourceUploadPath="/dolphinscheduler"
+
+# who have permissions to create directory under HDFS/S3 root path
+# Note: if kerberos is enabled, please config hdfsRootUser=
+hdfsRootUser="hdfs"
+
+# kerberos config
+# whether kerberos starts, if kerberos starts, following four items need to config, otherwise please ignore
+kerberosStartUp="false"
+# kdc krb5 config file path
+krb5ConfPath="$installPath/conf/krb5.conf"
+# keytab username
+keytabUserName="hdfs-mycluster@ESZ.COM"
+# username keytab path
+keytabPath="$installPath/conf/hdfs.headless.keytab"
+
+
+# api server port
+apiServerPort="12345"
+
+
+# install hosts
+# Note: install the scheduled hostname list. If it is pseudo-distributed, just write a pseudo-distributed hostname
+ips="ark0,ark1,ark2,ark3,ark4"
+
+# ssh port, default 22
+# Note: if ssh port is not default, modify here
+sshPort="22"
+
+# run master machine
+# Note: list of hosts hostname for deploying master
+masters="ark0,ark1"
+
+# run worker machine
+# note: list of machine hostnames for deploying workers
+workers="ark2,ark3,ark4"
+
+# run alert machine
+# note: list of machine hostnames for deploying alert server
+alertServer="ark3"
+
+# run api machine
+# note: list of machine hostnames for deploying api server
+apiServers="ark1"
+
+# whether to start monitoring self-starting scripts
+monitorServerState="false"

dolphinscheduler-server/src/main/resources/logback-master.xml

@@ -29,7 +29,30 @@
         </encoder>
     </appender>
 
-
+    <conversionRule conversionWord="messsage"
+                    converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
+    <appender name="TASKLOGFILE" class="ch.qos.logback.classic.sift.SiftingAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
+        <Discriminator class="org.apache.dolphinscheduler.server.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>
     <!-- master server logback config start -->
     <appender name="MASTERLOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-master.log</file>
@@ -52,6 +75,7 @@
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="TASKLOGFILE"/>
         <appender-ref ref="MASTERLOGFILE"/>
     </root>
 

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java

@@ -0,0 +1,132 @@
+/*
+ * 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.master;
+
+
+import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.server.master.config.MasterConfig;
+import org.apache.dolphinscheduler.server.master.runner.ConditionsTaskExecThread;
+import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import org.apache.dolphinscheduler.service.process.ProcessService;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class ConditionsTaskTest {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(DependentTaskTest.class);
+
+    private ProcessService processService;
+    private ApplicationContext applicationContext;
+
+
+    private MasterConfig config;
+
+    @Before
+    public void before() {
+        config = new MasterConfig();
+        config.setMasterTaskCommitRetryTimes(3);
+        config.setMasterTaskCommitInterval(1000);
+        processService = Mockito.mock(ProcessService.class);
+        applicationContext = Mockito.mock(ApplicationContext.class);
+        SpringApplicationContext springApplicationContext = new SpringApplicationContext();
+        springApplicationContext.setApplicationContext(applicationContext);
+        Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService);
+        Mockito.when(applicationContext.getBean(MasterConfig.class)).thenReturn(config);
+
+        Mockito.when(processService
+                .findTaskInstanceById(252612))
+                .thenReturn(getTaskInstance());
+
+        Mockito.when(processService.saveTaskInstance(getTaskInstance()))
+                .thenReturn(true);
+
+        Mockito.when(processService.findProcessInstanceById(10112))
+                .thenReturn(getProcessInstance());
+
+        Mockito.when(processService
+                .findValidTaskListByProcessId(10112))
+                .thenReturn(getTaskInstances());
+    }
+
+    @Test
+    public void testCondition(){
+        TaskInstance taskInstance = getTaskInstance();
+        String dependString = "{\"dependTaskList\":[{\"dependItemList\":[{\"depTasks\":\"1\",\"status\":\"SUCCESS\"}],\"relation\":\"AND\"}],\"relation\":\"AND\"}";
+        String conditionResult = "{\"successNode\":[\"2\"],\"failedNode\":[\"3\"]}";
+
+        taskInstance.setDependency(dependString);
+        Mockito.when(processService.submitTask(taskInstance))
+                .thenReturn(taskInstance);
+        ConditionsTaskExecThread conditions =
+                new ConditionsTaskExecThread(taskInstance);
+
+        try {
+            conditions.call();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Assert.assertEquals(ExecutionStatus.SUCCESS, conditions.getTaskInstance().getState());
+    }
+
+
+    private TaskInstance getTaskInstance(){
+        TaskInstance taskInstance = new TaskInstance();
+        taskInstance.setId(252612);
+        taskInstance.setName("C");
+        taskInstance.setTaskType("CONDITIONS");
+        taskInstance.setProcessInstanceId(10112);
+        taskInstance.setProcessDefinitionId(100001);
+        return taskInstance;
+    }
+
+
+
+    private List<TaskInstance> getTaskInstances(){
+        List<TaskInstance> list = new ArrayList<>();
+        TaskInstance taskInstance = new TaskInstance();
+        taskInstance.setId(199999);
+        taskInstance.setName("1");
+        taskInstance.setState(ExecutionStatus.SUCCESS);
+        list.add(taskInstance);
+        return list;
+    }
+
+    private ProcessInstance getProcessInstance(){
+        ProcessInstance processInstance = new ProcessInstance();
+        processInstance.setId(10112);
+        processInstance.setProcessDefinitionId(100001);
+        processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+
+        return processInstance;
+    }
+
+}

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dolphinscheduler.server.worker.task.dependent;
+package org.apache.dolphinscheduler.server.master;
 
-import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.model.DateInterval;
 import org.apache.dolphinscheduler.common.model.TaskNode;
 import org.apache.dolphinscheduler.common.utils.dependent.DependentDateUtils;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
 import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
 import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.entity.TaskExecutionContext;
+import org.apache.dolphinscheduler.server.master.config.MasterConfig;
-import org.apache.dolphinscheduler.server.worker.task.TaskProps;
+import org.apache.dolphinscheduler.server.master.runner.DependentTaskExecThread;
 import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 import org.apache.dolphinscheduler.service.process.ProcessService;
 import org.junit.Assert;
@@ -50,12 +50,23 @@ public class DependentTaskTest {
     private ApplicationContext applicationContext;
 
 
+    private MasterConfig config;
+
     @Before
     public void before() throws Exception{
+
+        config = new MasterConfig();
+        config.setMasterTaskCommitRetryTimes(3);
+        config.setMasterTaskCommitInterval(1000);
         processService = Mockito.mock(ProcessService.class);
+        DateInterval dateInterval =DependentDateUtils.getTodayInterval(new Date()).get(0);
         Mockito.when(processService
-                .findLastRunningProcess(4,DependentDateUtils.getTodayInterval(new Date()).get(0)))
+                .findLastRunningProcess(4, dateInterval.getStartTime(),
+                        dateInterval.getEndTime()))
                 .thenReturn(findLastProcessInterval());
+
+
+
         Mockito.when(processService
                 .getTaskNodeListByDefinitionId(4))
                 .thenReturn(getTaskNodes());
@@ -66,32 +77,62 @@ public class DependentTaskTest {
         Mockito.when(processService
                 .findTaskInstanceById(252612))
                 .thenReturn(getTaskInstance());
+
+
+        Mockito.when(processService.findProcessInstanceById(10111))
+                .thenReturn(getProcessInstance());
+        Mockito.when(processService.findProcessDefineById(0))
+                .thenReturn(getProcessDefinition());
+        Mockito.when(processService.saveTaskInstance(getTaskInstance()))
+                .thenReturn(true);
+
         applicationContext = Mockito.mock(ApplicationContext.class);
         SpringApplicationContext springApplicationContext = new SpringApplicationContext();
         springApplicationContext.setApplicationContext(applicationContext);
         Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService);
+        Mockito.when(applicationContext.getBean(MasterConfig.class)).thenReturn(config);
     }
 
     @Test
     public void test() throws Exception{
 
-        TaskProps taskProps = new TaskProps();
+        TaskInstance taskInstance = getTaskInstance();
         String dependString = "{\"dependTaskList\":[{\"dependItemList\":[{\"dateValue\":\"today\",\"depTasks\":\"ALL\",\"projectId\":1,\"definitionList\":[{\"label\":\"C\",\"value\":4},{\"label\":\"B\",\"value\":3},{\"label\":\"A\",\"value\":2}],\"cycle\":\"day\",\"definitionId\":4}],\"relation\":\"AND\"}],\"relation\":\"AND\"}";
-        taskProps.setDependence(dependString);
+        taskInstance.setDependency(dependString);
-        taskProps.setTaskStartTime(new Date());
+        Mockito.when(processService.submitTask(taskInstance))
-        DependentTask dependentTask = new DependentTask(new TaskExecutionContext(), logger);
+                .thenReturn(taskInstance);
-        dependentTask.init();
+        DependentTaskExecThread dependentTask =
-        dependentTask.handle();
+                new DependentTaskExecThread(taskInstance);
-        Assert.assertEquals(dependentTask.getExitStatusCode(), Constants.EXIT_CODE_SUCCESS );
+
+        dependentTask.call();
+
+        Assert.assertEquals(ExecutionStatus.SUCCESS, dependentTask.getTaskInstance().getState());
     }
 
     private ProcessInstance findLastProcessInterval(){
         ProcessInstance processInstance = new ProcessInstance();
         processInstance.setId(11);
+        processInstance.setProcessDefinitionId(4);
         processInstance.setState(ExecutionStatus.SUCCESS);
         return  processInstance;
     }
 
+    private ProcessDefinition getProcessDefinition(){
+        ProcessDefinition processDefinition = new ProcessDefinition();
+        processDefinition.setId(0);
+        return processDefinition;
+    }
+
+    private ProcessInstance getProcessInstance(){
+        ProcessInstance processInstance = new ProcessInstance();
+        processInstance.setId(10111);
+        processInstance.setProcessDefinitionId(0);
+        processInstance.setState(ExecutionStatus.RUNNING_EXEUTION);
+
+        return processInstance;
+    }
+
+
     private List<TaskNode> getTaskNodes(){
         List<TaskNode> list = new ArrayList<>();
         TaskNode taskNode = new TaskNode();
@@ -113,9 +154,10 @@ public class DependentTaskTest {
 
     private TaskInstance getTaskInstance(){
         TaskInstance taskInstance = new TaskInstance();
+        taskInstance.setTaskType("DEPENDENT");
         taskInstance.setId(252612);
         taskInstance.setName("C");
-        taskInstance.setState(ExecutionStatus.SUCCESS);
+        taskInstance.setProcessInstanceId(10111);
         return taskInstance;
     }
 

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackServiceTest.java

@@ -17,21 +17,26 @@
 package org.apache.dolphinscheduler.server.worker.processor;
 
 import io.netty.channel.Channel;
+import org.apache.dolphinscheduler.common.thread.Stopper;
 import org.apache.dolphinscheduler.remote.NettyRemotingClient;
 import org.apache.dolphinscheduler.remote.NettyRemotingServer;
 import org.apache.dolphinscheduler.remote.command.CommandType;
 import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand;
+import org.apache.dolphinscheduler.remote.command.TaskExecuteResponseCommand;
 import org.apache.dolphinscheduler.remote.config.NettyClientConfig;
 import org.apache.dolphinscheduler.remote.config.NettyServerConfig;
 import org.apache.dolphinscheduler.remote.utils.Host;
 import org.apache.dolphinscheduler.server.master.config.MasterConfig;
 import org.apache.dolphinscheduler.server.master.processor.TaskAckProcessor;
+import org.apache.dolphinscheduler.server.master.processor.TaskResponseProcessor;
+import org.apache.dolphinscheduler.server.master.processor.queue.TaskResponseService;
 import org.apache.dolphinscheduler.server.master.registry.MasterRegistry;
 import org.apache.dolphinscheduler.server.registry.ZookeeperNodeManager;
 import org.apache.dolphinscheduler.server.registry.ZookeeperRegistryCenter;
 import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;
 import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistry;
 import org.apache.dolphinscheduler.server.zk.SpringZKServer;
+import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
 import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;
 import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;
 import org.junit.Test;
@@ -47,9 +52,10 @@ import java.util.Date;
  * test task call back service
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes={TaskCallbackServiceTestConfig.class, SpringZKServer.class, MasterRegistry.class, WorkerRegistry.class,
+@ContextConfiguration(classes={TaskCallbackServiceTestConfig.class, SpringZKServer.class, SpringApplicationContext.class, MasterRegistry.class, WorkerRegistry.class,
         ZookeeperRegistryCenter.class, MasterConfig.class, WorkerConfig.class,
-        ZookeeperCachedOperator.class, ZookeeperConfig.class, ZookeeperNodeManager.class, TaskCallbackService.class})
+        ZookeeperCachedOperator.class, ZookeeperConfig.class, ZookeeperNodeManager.class, TaskCallbackService.class,
+        TaskResponseService.class, TaskAckProcessor.class,TaskResponseProcessor.class})
 public class TaskCallbackServiceTest {
 
     @Autowired
@@ -58,12 +64,22 @@ public class TaskCallbackServiceTest {
     @Autowired
     private MasterRegistry masterRegistry;
 
+    @Autowired
+    private TaskAckProcessor taskAckProcessor;
+
+    @Autowired
+    private TaskResponseProcessor taskResponseProcessor;
+
+    /**
+     * send ack test
+     * @throws Exception
+     */
     @Test
-    public void testSendAck(){
+    public void testSendAck() throws Exception{
         final NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(30000);
         NettyRemotingServer nettyRemotingServer = new NettyRemotingServer(serverConfig);
-        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, Mockito.mock(TaskAckProcessor.class));
+        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, taskAckProcessor);
         nettyRemotingServer.start();
 
         final NettyClientConfig clientConfig = new NettyClientConfig();
@@ -75,22 +91,64 @@ public class TaskCallbackServiceTest {
         ackCommand.setStartTime(new Date());
         taskCallbackService.sendAck(1, ackCommand.convert2Command());
 
+        Thread.sleep(5000);
+
+        Stopper.stop();
+
+        Thread.sleep(5000);
+
         nettyRemotingServer.close();
         nettyRemotingClient.close();
     }
 
+    /**
+     * send result test
+     * @throws Exception
+     */
+    @Test
+    public void testSendResult() throws Exception{
+        final NettyServerConfig serverConfig = new NettyServerConfig();
+        serverConfig.setListenPort(30000);
+        NettyRemotingServer nettyRemotingServer = new NettyRemotingServer(serverConfig);
+        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_RESPONSE, taskResponseProcessor);
+        nettyRemotingServer.start();
+
+        final NettyClientConfig clientConfig = new NettyClientConfig();
+        NettyRemotingClient nettyRemotingClient = new NettyRemotingClient(clientConfig);
+        Channel channel = nettyRemotingClient.getChannel(Host.of("localhost:30000"));
+        taskCallbackService.addRemoteChannel(1, new NettyRemoteChannel(channel, 1));
+        TaskExecuteResponseCommand responseCommand  = new TaskExecuteResponseCommand();
+        responseCommand.setTaskInstanceId(1);
+        responseCommand.setEndTime(new Date());
+
+        taskCallbackService.sendResult(1, responseCommand.convert2Command());
+
+        Thread.sleep(5000);
+
+        Stopper.stop();
+
+        Thread.sleep(5000);
+
+        nettyRemotingServer.close();
+        nettyRemotingClient.close();
+    }
+
+
+
     @Test(expected = IllegalArgumentException.class)
     public void testSendAckWithIllegalArgumentException(){
         TaskExecuteAckCommand ackCommand = Mockito.mock(TaskExecuteAckCommand.class);
         taskCallbackService.sendAck(1, ackCommand.convert2Command());
+        Stopper.stop();
     }
 
     @Test(expected = IllegalStateException.class)
     public void testSendAckWithIllegalStateException1(){
+        masterRegistry.registry();
         final NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(30000);
         NettyRemotingServer nettyRemotingServer = new NettyRemotingServer(serverConfig);
-        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, Mockito.mock(TaskAckProcessor.class));
+        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, taskAckProcessor);
         nettyRemotingServer.start();
 
         final NettyClientConfig clientConfig = new NettyClientConfig();
@@ -103,7 +161,21 @@ public class TaskCallbackServiceTest {
         ackCommand.setStartTime(new Date());
 
         nettyRemotingServer.close();
+
         taskCallbackService.sendAck(1, ackCommand.convert2Command());
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        Stopper.stop();
+
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
 
     @Test(expected = IllegalStateException.class)
@@ -112,7 +184,7 @@ public class TaskCallbackServiceTest {
         final NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(30000);
         NettyRemotingServer nettyRemotingServer = new NettyRemotingServer(serverConfig);
-        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, Mockito.mock(TaskAckProcessor.class));
+        nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_ACK, taskAckProcessor);
         nettyRemotingServer.start();
 
         final NettyClientConfig clientConfig = new NettyClientConfig();
@@ -125,6 +197,20 @@ public class TaskCallbackServiceTest {
         ackCommand.setStartTime(new Date());
 
         nettyRemotingServer.close();
+
         taskCallbackService.sendAck(1, ackCommand.convert2Command());
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        Stopper.stop();
+
+        try {
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
 }

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

@@ -782,14 +782,13 @@ public class ProcessService {
      * submit task to db
      * submit sub process to command
      * @param taskInstance taskInstance
-     * @param processInstance processInstance
      * @return task instance
      */
     @Transactional(rollbackFor = Exception.class)
-    public TaskInstance submitTask(TaskInstance taskInstance, ProcessInstance processInstance){
+    public TaskInstance submitTask(TaskInstance taskInstance){
-        logger.info("start submit task : {}, instance id:{}, state: {}, ",
+        ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
-                taskInstance.getName(), processInstance.getId(), processInstance.getState() );
+        logger.info("start submit task : {}, instance id:{}, state: {}",
-        processInstance = this.findProcessInstanceDetailById(processInstance.getId());
+                taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
         //submit to db
         TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
         if(task == null){
@@ -1637,13 +1636,14 @@ public class ProcessService {
     /**
      * find last running process instance
      * @param definitionId  process definition id
-     * @param dateInterval dateInterval
+     * @param startTime start time
+     * @param endTime end time
      * @return process instance
      */
-    public ProcessInstance findLastRunningProcess(int definitionId, DateInterval dateInterval) {
+    public ProcessInstance findLastRunningProcess(int definitionId, Date startTime, Date endTime) {
         return processInstanceMapper.queryLastRunningProcess(definitionId,
-                dateInterval.getStartTime(),
+                startTime,
-                dateInterval.getEndTime(),
+                endTime,
                 stateArray);
     }
 
@@ -1799,5 +1799,22 @@ public class ProcessService {
         return resourceMapper.listResourceByIds(resIds);
     }
 
+    /**
+     * format task app id in task instance
+     * @param taskInstance
+     * @return
+     */
+    public String formatTaskAppId(TaskInstance taskInstance){
+        ProcessDefinition definition = this.findProcessDefineById(taskInstance.getProcessDefinitionId());
+        ProcessInstance processInstanceById = this.findProcessInstanceById(taskInstance.getProcessInstanceId());
+
+        if(definition == null || processInstanceById == null){
+            return "";
+        }
+        return String.format("%s_%s_%s",
+                definition.getId(),
+                processInstanceById.getId(),
+                taskInstance.getId());
+    }
 
 }

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@@ -630,6 +630,8 @@
         this.dependence = o.dependence || {}
         this.cacheDependence = o.dependence || {}
 
+      } else {
+        this.workerGroup = this.store.state.security.workerGroupsListAll[0].id
       }
       this.isContentBox = true
     },
@@ -694,4 +696,9 @@
 
 <style lang="scss" rel="stylesheet/scss">
   @import "./formModel";
+  .ans-radio-disabled {
+    .ans-radio-inner:after {
+      background-color: #6F8391
+    }
+  }
 </style>

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue

@@ -141,7 +141,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -211,7 +211,9 @@
           return {
             label: node.name
           }
-        }
+        },
+        allNoResources: [],
+        noRes: [],
       }
     },
     props: {
@@ -300,6 +302,12 @@
           return false
         }
 
+        // noRes
+        if (this.noRes.length>0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+          return false
+        }
+
         // localParams Subcomponent verification
         if (!this.$refs.refLocalParams._verifProp()) {
           return false
@@ -339,6 +347,67 @@
         }
         delete item.children
       },
+      searchTree(element, id) {
+        // 根据id查找节点
+        if (element.id == id) {
+          return element;
+        } else if (element.children != null) {
+          var i;
+          var result = null;
+          for (i = 0; result == null && i < element.children.length; i++) {
+            result = this.searchTree(element.children[i], id);
+          }
+          return result;
+        }
+        return null;
+      },
+      dataProcess(backResource) {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return item.id
+          })
+          Array.prototype.diff = function(a) {
+            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          };
+          let diffSet = this.resourceList.diff(resourceIdArr);
+          let optionsCmp = []
+          if(diffSet.length>0) {
+            diffSet.forEach(item=>{
+              backResource.forEach(item1=>{
+                if(item==item1.id || item==item1.res) {
+                  optionsCmp.push(item1)
+                }
+              })
+            })
+          }
+          let noResources = [{
+            id: -1,
+            name: $t('Unauthorized or deleted resources'),
+            fullName: '/'+$t('Unauthorized or deleted resources'),
+            children: []
+          }]
+          if(optionsCmp.length>0) {
+            this.allNoResources = optionsCmp
+            optionsCmp = optionsCmp.map(item=>{
+              return {id: item.id,name: item.name,fullName: item.res}
+            })
+            optionsCmp.forEach(item=>{
+              item.isNew = true
+            })
+            noResources[0].children = optionsCmp
+            this.mainJarList = this.mainJarList.concat(noResources)
+          }
+        }
+      },
     },
     watch: {
       // Listening type
@@ -354,15 +423,37 @@
     },
     computed: {
       cacheParams () {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return {id: item.id,name: item.name,res: item.fullName}
+          })
+        }
+        let result = []
+        resourceIdArr.forEach(item=>{
+          this.allNoResources.forEach(item1=>{
+            if(item.id==item1.id) {
+              // resultBool = true
+             result.push(item1)
+            }
+          })
+        })
+        this.noRes = result
         return {
           mainClass: this.mainClass,
           mainJar: {
             id: this.mainJar
           },
           deployMode: this.deployMode,
-          resourceList: _.map(this.resourceList, v => {
+          resourceList: resourceIdArr,
-            return {id: v}
-          }),
           localParams: this.localParams,
           slot: this.slot,
           taskManager: this.taskManager,
@@ -404,20 +495,24 @@
           this.programType = o.params.programType || 'SCALA'
 
           // backfill resourceList
+          let backResource = o.params.resourceList || []
           let resourceList = o.params.resourceList || []
           if (resourceList.length) {
             _.map(resourceList, v => {
-              if(v.res) {
+              if(!v.id) {
                 this.store.dispatch('dag/getResourceId',{
                   type: 'FILE',
                   fullName: '/'+v.res
                 }).then(res => {
                   this.resourceList.push(res.id)
+                  this.dataProcess(backResource)
                 }).catch(e => {
-                  this.$message.error(e.msg || '')
+                  this.resourceList.push(v.res)
+                  this.dataProcess(backResource)
                 })
               } else {
                 this.resourceList.push(v.id)
+                this.dataProcess(backResource)
               }
             })
             this.cacheResourceList = resourceList

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue

@@ -44,7 +44,7 @@
     <m-list-box>
       <div slot="text">{{$t('Main jar package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf"  :placeholder="$t('Please enter main jar package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -78,7 +78,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :placeholder="$t('Please select resources')">
+        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -109,6 +109,7 @@
     name: 'mr',
     data () {
       return {
+        valueConsistsOf: 'LEAF_PRIORITY',
         // Main function class
         mainClass: '',
         // Master jar package
@@ -134,7 +135,9 @@
           return {
             label: node.name
           }
-        }
+        },
+        allNoResources: [],
+        noRes: []
       }
     },
     props: {
@@ -176,9 +179,76 @@
       diGuiTree(item) {  // Recursive convenience tree structure
         item.forEach(item => {
           item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?　　　　　　　　
-            delete item.children : this.diGuiTree(item.children);
+            this.operationTree(item) : this.diGuiTree(item.children);
         })
       },
+      operationTree(item) {
+        if(item.dirctory) {
+          item.isDisabled =true
+        }
+        delete item.children
+      },
+      searchTree(element, id) {
+        // 根据id查找节点
+        if (element.id == id) {
+          return element;
+        } else if (element.children != null) {
+          var i;
+          var result = null;
+          for (i = 0; result == null && i < element.children.length; i++) {
+            result = this.searchTree(element.children[i], id);
+          }
+          return result;
+        }
+        return null;
+      },
+      dataProcess(backResource) {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return item.id
+          })
+          Array.prototype.diff = function(a) {
+            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          };
+          let diffSet = this.resourceList.diff(resourceIdArr);
+          let optionsCmp = []
+          if(diffSet.length>0) {
+            diffSet.forEach(item=>{
+              backResource.forEach(item1=>{
+                if(item==item1.id || item==item1.res) {
+                  optionsCmp.push(item1)
+                }
+              })
+            })
+          }
+          let noResources = [{
+            id: -1,
+            name: $t('Unauthorized or deleted resources'),
+            fullName: '/'+$t('Unauthorized or deleted resources'),
+            children: []
+          }]
+          if(optionsCmp.length>0) {
+            this.allNoResources = optionsCmp
+            optionsCmp = optionsCmp.map(item=>{
+              return {id: item.id,name: item.name,fullName: item.res}
+            })
+            optionsCmp.forEach(item=>{
+              item.isNew = true
+            })
+            noResources[0].children = optionsCmp
+            this.mainJarList = this.mainJarList.concat(noResources)
+          }
+        }
+      },
       /**
        * verification
        */
@@ -193,6 +263,12 @@
           return false
         }
 
+        // noRes
+        if (this.noRes.length>0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+          return false
+        }
+
         // localParams Subcomponent verification
         if (!this.$refs.refLocalParams._verifProp()) {
           return false
@@ -231,14 +307,36 @@
     },
     computed: {
       cacheParams () {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return {id: item.id,name: item.name,res: item.fullName}
+          })
+        }
+        let result = []
+        resourceIdArr.forEach(item=>{
+          this.allNoResources.forEach(item1=>{
+            if(item.id==item1.id) {
+              // resultBool = true
+             result.push(item1)
+            }
+          })
+        })
+        this.noRes = result
         return {
           mainClass: this.mainClass,
           mainJar: {
             id: this.mainJar
           },
-          resourceList: _.map(this.resourceList, v => {
+          resourceList: resourceIdArr,
-            return {id: v}
-          }),
           localParams: this.localParams,
           mainArgs: this.mainArgs,
           others: this.others,
@@ -273,23 +371,27 @@
           let resourceList = o.params.resourceList || []
           if (resourceList.length) {
             _.map(resourceList, v => {
-              if(v.res) {
+              if(!v.id) {
                 this.store.dispatch('dag/getResourceId',{
                   type: 'FILE',
                   fullName: '/'+v.res
                 }).then(res => {
                   this.resourceList.push(res.id)
+                  this.dataProcess(backResource)
                 }).catch(e => {
-                  this.$message.error(e.msg || '')
+                  this.resourceList.push(v.res)
+                  this.dataProcess(backResource)
                 })
               } else {
                 this.resourceList.push(v.id)
+                this.dataProcess(backResource)
               }
             })
             this.cacheResourceList = resourceList
           }
 
           // backfill localParams
+          let backResource = o.params.resourceList || []
           let localParams = o.params.localParams || []
           if (localParams.length) {
             this.localParams = localParams

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue

@@ -28,7 +28,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="resourceOptions" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-model="resourceList" :multiple="true" :options="resourceOptions" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
         <!-- <m-resources
@@ -80,6 +80,13 @@
         // Cache ResourceList
         cacheResourceList: [],
         resourceOptions: [],
+        normalizer(node) {
+          return {
+            label: node.name
+          }
+        },
+        allNoResources: [],
+        noRes: []
       }
     },
     mixins: [disabledState],
@@ -96,9 +103,9 @@
       /**
        * return resourceList
        */
-      _onResourcesData (a) {
+      // _onResourcesData (a) {
-        this.resourceList = a
+      //   this.resourceList = a
-      },
+      // },
       /**
        * cache resourceList
        */
@@ -120,6 +127,12 @@
           return false
         }
 
+        // noRes
+        if (this.noRes.length>0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+          return false
+        }
+
         // storage
         this.$emit('on-params', {
           resourceList: _.map(this.resourceList, v => {
@@ -166,6 +179,67 @@
           item.isDisabled =true
         }
         delete item.children
+      },
+      searchTree(element, id) {
+        // 根据id查找节点
+        if (element.id == id) {
+          return element;
+        } else if (element.children != null) {
+          var i;
+          var result = null;
+          for (i = 0; result == null && i < element.children.length; i++) {
+            result = this.searchTree(element.children[i], id);
+          }
+          return result;
+        }
+        return null;
+      },
+      dataProcess(backResource) {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.resourceOptions.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return item.id
+          })
+          Array.prototype.diff = function(a) {
+            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          };
+          let diffSet = this.resourceList.diff(resourceIdArr);
+          let optionsCmp = []
+          if(diffSet.length>0) {
+            diffSet.forEach(item=>{
+              backResource.forEach(item1=>{
+                if(item==item1.id || item==item1.res) {
+                  optionsCmp.push(item1)
+                }
+              })
+            })
+          }
+          let noResources = [{
+            id: -1,
+            name: $t('Unauthorized or deleted resources'),
+            fullName: '/'+$t('Unauthorized or deleted resources'),
+            children: []
+          }]
+          if(optionsCmp.length>0) {
+            this.allNoResources = optionsCmp
+            optionsCmp = optionsCmp.map(item=>{
+              return {id: item.id,name: item.name,fullName: item.res}
+            })
+            optionsCmp.forEach(item=>{
+              item.isNew = true
+            })
+            noResources[0].children = optionsCmp
+            this.resourceOptions = this.resourceOptions.concat(noResources)
+          }
+        }
       }
     },
     watch: {
@@ -176,10 +250,32 @@
     },
     computed: {
       cacheParams () {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.resourceOptions.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return {id: item.id,name: item.name,res: item.fullName}
+          })
+        }
+        let result = []
+        resourceIdArr.forEach(item=>{
+          this.allNoResources.forEach(item1=>{
+            if(item.id==item1.id) {
+              // resultBool = true
+             result.push(item1)
+            }
+          })
+        })
+        this.noRes = result
         return {
-          resourceList: _.map(this.resourceList, v => {
+          resourceList: resourceIdArr,
-            return {id: v}
-          }),
           localParams: this.localParams
         }
       }
@@ -187,7 +283,7 @@
     created () {
       let item = this.store.state.dag.resourcesListS
       this.diGuiTree(item)
-      this.options = item
+      this.resourceOptions = item
       let o = this.backfillItem
 
       // Non-null objects represent backfill
@@ -195,20 +291,24 @@
         this.rawScript = o.params.rawScript || ''
 
         // backfill resourceList
+        let backResource = o.params.resourceList || []
         let resourceList = o.params.resourceList || []
         if (resourceList.length) {
           _.map(resourceList, v => {
-            if(v.res) {
+            if(!v.id) {
               this.store.dispatch('dag/getResourceId',{
                 type: 'FILE',
                 fullName: '/'+v.res
               }).then(res => {
                 this.resourceList.push(res.id)
+                this.dataProcess(backResource)
               }).catch(e => {
-                this.$message.error(e.msg || '')
+                this.resourceList.push(v.res)
+                this.dataProcess(backResource)
               })
             } else {
               this.resourceList.push(v.id)
+              this.dataProcess(backResource)
             }
           })
           this.cacheResourceList = resourceList
@@ -230,6 +330,6 @@
       editor.toTextArea() // Uninstall
       editor.off($('.code-python-mirror'), 'keypress', this.keypress)
     },
-    components: { mLocalParams, mListBox, mResources }
+    components: { mLocalParams, mListBox, mResources,Treeselect }
   }
 </script>

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue

@@ -34,7 +34,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="options" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect  v-model="resourceList" :multiple="true" :options="options" :normalizer="normalizer" :disabled="isDetails" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -266,8 +266,8 @@
           }
           let noResources = [{
             id: -1,
-            name: $t('No resources'),
+            name: $t('Unauthorized or deleted resources'),
-            fullName: '/'+$t('No resources'),
+            fullName: '/'+$t('Unauthorized or deleted resources'),
             children: []
           }]
           if(optionsCmp.length>0) {

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue

@@ -169,7 +169,7 @@
     <m-list-box>
       <div slot="text">{{$t('Resources')}}</div>
       <div slot="content">
-        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">
+        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails" :placeholder="$t('Please select resources')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -254,7 +254,9 @@
           return {
             label: node.name
           }
-        }
+        },
+        allNoResources: [],
+        noRes: []
       }
     },
     props: {
@@ -305,6 +307,67 @@
         }
         delete item.children
       },
+      searchTree(element, id) {
+        // 根据id查找节点
+        if (element.id == id) {
+          return element;
+        } else if (element.children != null) {
+          var i;
+          var result = null;
+          for (i = 0; result == null && i < element.children.length; i++) {
+            result = this.searchTree(element.children[i], id);
+          }
+          return result;
+        }
+        return null;
+      },
+      dataProcess(backResource) {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return item.id
+          })
+          Array.prototype.diff = function(a) {
+            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          };
+          let diffSet = this.resourceList.diff(resourceIdArr);
+          let optionsCmp = []
+          if(diffSet.length>0) {
+            diffSet.forEach(item=>{
+              backResource.forEach(item1=>{
+                if(item==item1.id || item==item1.res) {
+                  optionsCmp.push(item1)
+                }
+              })
+            })
+          }
+          let noResources = [{
+            id: -1,
+            name: $t('Unauthorized or deleted resources'),
+            fullName: '/'+$t('Unauthorized or deleted resources'),
+            children: []
+          }]
+          if(optionsCmp.length>0) {
+            this.allNoResources = optionsCmp
+            optionsCmp = optionsCmp.map(item=>{
+              return {id: item.id,name: item.name,fullName: item.res}
+            })
+            optionsCmp.forEach(item=>{
+              item.isNew = true
+            })
+            noResources[0].children = optionsCmp
+            this.mainJarList = this.mainJarList.concat(noResources)
+          }
+        }
+      },
       /**
        * verification
        */
@@ -324,6 +387,12 @@
           return false
         }
 
+        // noRes
+        if (this.noRes.length>0) {
+          this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
+          return false
+        }
+
         if (!Number.isInteger(parseInt(this.numExecutors))) {
           this.$message.warning(`${i18n.$t('The number of Executors should be a positive integer')}`)
           return false
@@ -400,15 +469,37 @@
     },
     computed: {
       cacheParams () {
+        let isResourceId = []
+        let resourceIdArr = []
+        if(this.resourceList.length>0) {
+          this.resourceList.forEach(v=>{
+            this.mainJarList.forEach(v1=>{
+              if(this.searchTree(v1,v)) {
+                isResourceId.push(this.searchTree(v1,v))
+              }
+            })
+          })
+          resourceIdArr = isResourceId.map(item=>{
+            return {id: item.id,name: item.name,res: item.fullName}
+          })
+        }
+        let result = []
+        resourceIdArr.forEach(item=>{
+          this.allNoResources.forEach(item1=>{
+            if(item.id==item1.id) {
+              // resultBool = true
+             result.push(item1)
+            }
+          })
+        })
+        this.noRes = result
         return {
           mainClass: this.mainClass,
           mainJar: {
             id: this.mainJar
           },
           deployMode: this.deployMode,
-          resourceList: _.map(this.resourceList, v => {
+          resourceList: resourceIdArr,
-            return {id: v}
-          }),
           localParams: this.localParams,
           driverCores: this.driverCores,
           driverMemory: this.driverMemory,
@@ -453,20 +544,24 @@
           this.sparkVersion = o.params.sparkVersion || 'SPARK2'
 
           // backfill resourceList
+          let backResource = o.params.resourceList || []
           let resourceList = o.params.resourceList || []
           if (resourceList.length) {
             _.map(resourceList, v => {
-              if(v.res) {
+              if(!v.id) {
                 this.store.dispatch('dag/getResourceId',{
                   type: 'FILE',
                   fullName: '/'+v.res
                 }).then(res => {
                   this.resourceList.push(res.id)
+                  this.dataProcess(backResource)
                 }).catch(e => {
-                  this.$message.error(e.msg || '')
+                  this.resourceList.push(v.res)
+                  this.dataProcess(backResource)
                 })
               } else {
                 this.resourceList.push(v.id)
+                this.dataProcess(backResource)
               }
             })
             this.cacheResourceList = resourceList

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js

@@ -24,7 +24,7 @@ let Gantt = function () {
   this.tasks = []
   this.width = null
   this.height = null
-  this.tasksName = []
+  this.taskNames = []
   this.tickFormat = `%H:%M:%S`
   this.margin = {
     top: 10,
@@ -39,8 +39,12 @@ let Gantt = function () {
 Gantt.prototype.init = function ({ el, tasks }) {
   this.el = el
   this.tasks = tasks
-  this.tasksName = _.map(_.cloneDeep(tasks), v => v.taskName)
+  this.taskNames = _.map(_.cloneDeep(tasks), v => v.taskName)
-  this.height = parseInt(this.tasksName.length * 30)
+  this.taskNames = this.taskNames.reduce(function (prev, cur) {
+    prev.indexOf(cur) === -1 && prev.push(cur);
+    return prev;
+  },[])
+  this.height = parseInt(this.taskNames.length * 30)
   this.width = $(this.el).width() - this.margin.right - this.margin.left - 5
 
   this.x = d3.time.scale()
@@ -49,7 +53,7 @@ Gantt.prototype.init = function ({ el, tasks }) {
     .clamp(true)
 
   this.y = d3.scale.ordinal()
-    .domain(this.tasksName)
+    .domain(this.taskNames)
     .rangeRoundBands([ 0, this.height - this.margin.top - this.margin.bottom ], 0.1)
 
   this.xAxis = d3.svg.axis()
@@ -98,7 +102,7 @@ Gantt.prototype.initializeXAxis = function () {
     .clamp(true)
 
   this.y = d3.scale.ordinal()
-    .domain(this.tasksName)
+    .domain(this.taskNames)
     .rangeRoundBands([ 0, this.height - this.margin.top - this.margin.bottom ], 0.1)
 
   this.xAxis = d3.svg.axis()

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@@ -49,10 +49,10 @@
           <th scope="col" width="60">
             <span>{{$t('Run Times')}}</span>
           </th>
-          <th scope="col" width="100">
+          <th scope="col" width="125">
             <span>{{$t('host')}}</span>
           </th>
-          <th scope="col" width="60">
+          <th scope="col" width="55">
             <span>{{$t('fault-tolerant sign')}}</span>
           </th>
           <th scope="col" width="30">
@@ -311,9 +311,9 @@
     name: 'list',
     data () {
       return {
-        // 数据
+        // data
         list: [],
-        // 按钮类型
+        // btn type
         buttonType: '',
         strDelete: '',
         checkAll: false

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@@ -43,13 +43,13 @@
           <th scope="col" width="140">
             <span>{{$t('Start Time')}}</span>
           </th>
-          <th scope="col" width="140">
+          <th scope="col" width="125">
             <span>{{$t('End Time')}}</span>
           </th>
-          <th scope="col" width="110">
+          <th scope="col" width="130">
             <span>{{$t('host')}}</span>
           </th>
-          <th scope="col" width="74">
+          <th scope="col" width="70">
             <span>{{$t('Duration')}}(s)</span>
           </th>
           <th scope="col" width="84">

dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@@ -293,7 +293,7 @@ export default {
    */
   getProcessByProjectId ({ state }, payload) {
     return new Promise((resolve, reject) => {
-      io.get(`projects/${state.projectName}/process/queryProccessDefinitionAllByProjectId`, payload, res => {
+      io.get(`projects/${state.projectName}/process/queryProcessDefinitionAllByProjectId`, payload, res => {
         resolve(res.data)
   }).catch(res => {
       reject(res)

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -588,6 +588,6 @@ export default {
   'Branch flow': 'Branch flow',
   'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
   'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required',
-  'No resources': 'No resources',
+  'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
   'Please delete all non-existent resources': 'Please delete all non-existent resources',
 }

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -588,6 +588,6 @@ export default {
   'Branch flow': '分支流转',
   'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
   'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填',
-  'No resources': '未授权或已删除资源',
+  'Unauthorized or deleted resources': '未授权或已删除资源',
   'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
 }

install.sh

@@ -19,309 +19,25 @@
 workDir=`dirname $0`
 workDir=`cd ${workDir};pwd`
 
-#To be compatible with MacOS and Linux
+source ${workDir}/conf/config/install_config.conf
+
+# 1.replace file
+echo "1.replace file"
+
 txt=""
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # Mac OSX
     txt="''"
-elif [[ "$OSTYPE" == "linux-gnu" ]]; then
-    # linux
-    txt=""
-elif [[ "$OSTYPE" == "cygwin" ]]; then
-    # POSIX compatibility layer and Linux environment emulation for Windows
-    echo "DolphinScheduler not support Windows operating system"
-    exit 1
-elif [[ "$OSTYPE" == "msys" ]]; then
-    # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
-    echo "DolphinScheduler not support Windows operating system"
-    exit 1
-elif [[ "$OSTYPE" == "win32" ]]; then
-    echo "DolphinScheduler not support Windows operating system"
-    exit 1
-elif [[ "$OSTYPE" == "freebsd"* ]]; then
-    # ...
-    txt=""
-else
-    # Unknown.
-    echo "Operating system unknown, please tell us(submit issue) for better service"
-    exit 1
-fi
-
-source ${workDir}/conf/config/install_config.conf
-
-# for example postgresql or mysql ...
-dbtype="postgresql"
-
-# db config
-# db address and port
-dbhost="192.168.xx.xx:5432"
-
-# db name
-dbname="dolphinscheduler"
-
-# db username
-username="xx"
-
-# db passwprd
-# Note: if there are special characters, please use the \ transfer character to transfer
-passowrd="xx"
-
-# conf/config/install_config.conf config
-# Note: the installation path is not the same as the current path (pwd)
-installPath="/data1_1T/dolphinscheduler"
-
-# deployment user
-# Note: the deployment user needs to have sudo privileges and permissions to operate hdfs. If hdfs is enabled, the root directory needs to be created by itself
-deployUser="dolphinscheduler"
-
-# zk cluster
-zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
-
-# install hosts
-# Note: install the scheduled hostname list. If it is pseudo-distributed, just write a pseudo-distributed hostname
-ips="ark0,ark1,ark2,ark3,ark4"
-
-# ssh port, default 22
-# Note: if ssh port is not default, modify here
-sshPort=22
-
-# run master machine
-# Note: list of hosts hostname for deploying master
-masters="ark0,ark1"
-
-# run worker machine
-# note: list of machine hostnames for deploying workers
-workers="ark2,ark3,ark4"
-
-# run alert machine
-# note: list of machine hostnames for deploying alert server
-alertServer="ark3"
-
-# run api machine
-# note: list of machine hostnames for deploying api server
-apiServers="ark1"
-
-# alert config
-# mail protocol
-mailProtocol="SMTP"
-
-# mail server host
-mailServerHost="smtp.exmail.qq.com"
-
-# mail server port
-# note: Different protocols and encryption methods correspond to different ports, when SSL/TLS is enabled, make sure the port is correct.
-mailServerPort="25"
-
-# sender
-mailSender="xxxxxxxxxx"
-
-# user
-mailUser="xxxxxxxxxx"
-
-# sender password
-# note: The mail.passwd is email service authorization code, not the email login password.
-mailPassword="xxxxxxxxxx"
-
-# TLS mail protocol support
-starttlsEnable="false"
-
-sslTrust="xxxxxxxxxx"
-
-# SSL mail protocol support
-# note: The SSL protocol is enabled by default. 
-# only one of TLS and SSL can be in the true state.
-sslEnable="true"
-
-# download excel path
-xlsFilePath="/tmp/xls"
-
-# Enterprise WeChat Enterprise ID Configuration
-enterpriseWechatCorpId="xxxxxxxxxx"
-
-# Enterprise WeChat application Secret configuration
-enterpriseWechatSecret="xxxxxxxxxx"
-
-# Enterprise WeChat Application AgentId Configuration
-enterpriseWechatAgentId="xxxxxxxxxx"
-
-# Enterprise WeChat user configuration, multiple users to , split
-enterpriseWechatUsers="xxxxx,xxxxx"
-
-
-# whether to start monitoring self-starting scripts
-monitorServerState="false"
-
-# resource Center upload and select storage method：HDFS,S3,NONE
-resUploadStartupType="NONE"
-
-# if resUploadStartupType is HDFS，defaultFS write namenode address，HA you need to put core-site.xml and hdfs-site.xml in the conf directory.
-# if S3，write S3 address，HA，for example ：s3a://dolphinscheduler，
-# Note，s3 be sure to create the root directory /dolphinscheduler
-defaultFS="hdfs://mycluster:8020"
-
-# if S3 is configured, the following configuration is required.
-s3Endpoint="http://192.168.xx.xx:9010"
-s3AccessKey="xxxxxxxxxx"
-s3SecretKey="xxxxxxxxxx"
-
-# resourcemanager HA configuration, if it is a single resourcemanager, here is yarnHaIps=""
-yarnHaIps="192.168.xx.xx,192.168.xx.xx"
-
-# if it is a single resourcemanager, you only need to configure one host name. If it is resourcemanager HA, the default configuration is fine.
-singleYarnIp="ark1"
-
-# hdfs root path, the owner of the root path must be the deployment user. 
-# versions prior to 1.1.0 do not automatically create the hdfs root directory, you need to create it yourself.
-hdfsPath="/dolphinscheduler"
-
-# have users who create directory permissions under hdfs root path /
-# Note: if kerberos is enabled, hdfsRootUser="" can be used directly.
-hdfsRootUser="hdfs"
-
-# common config
-# Program root path
-programPath="/tmp/dolphinscheduler"
-
-# download path
-downloadPath="/tmp/dolphinscheduler/download"
-
-# task execute path
-execPath="/tmp/dolphinscheduler/exec"
-
-# SHELL environmental variable path
-shellEnvPath="$installPath/conf/env/dolphinscheduler_env.sh"
-
-# suffix of the resource file
-resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml"
-
-# development status, if true, for the SHELL script, you can view the encapsulated SHELL script in the execPath directory. 
-# If it is false, execute the direct delete
-devState="true"
-
-# kerberos config
-# kerberos whether to start
-kerberosStartUp="false"
-
-# kdc krb5 config file path
-krb5ConfPath="$installPath/conf/krb5.conf"
-
-# keytab username
-keytabUserName="hdfs-mycluster@ESZ.COM"
-
-# username keytab path
-keytabPath="$installPath/conf/hdfs.headless.keytab"
-
-# zk config
-# zk root directory
-zkRoot="/dolphinscheduler"
-
-# zk session timeout
-zkSessionTimeout="300"
-
-# zk connection timeout
-zkConnectionTimeout="300"
-
-# zk retry interval
-zkRetryMaxSleep="100"
-
-# zk retry maximum number of times
-zkRetryMaxtime="5"
-
-
-# master config 
-# master execution thread maximum number, maximum parallelism of process instance
-masterExecThreads="100"
-
-# the maximum number of master task execution threads, the maximum degree of parallelism for each process instance
-masterExecTaskNum="20"
-
-# master heartbeat interval
-masterHeartbeatInterval="10"
-
-# master task submission retries
-masterTaskCommitRetryTimes="5"
-
-# master task submission retry interval
-masterTaskCommitInterval="1000"
-
-# master maximum cpu average load, used to determine whether the master has execution capability
-masterMaxCpuLoadAvg="100"
-
-# master reserve memory to determine if the master has execution capability
-masterReservedMemory="0.1"
-
-# worker config
-# worker execution thread
-workerExecThreads="100"
-
-# worker heartbeat interval
-workerHeartbeatInterval="10"
-
-# worker number of fetch tasks
-workerFetchTaskNum="3"
-
-# worker reserve memory to determine if the master has execution capability
-workerReservedMemory="0.1"
-
-# api config
-# api server port
-apiServerPort="12345"
-
-# api session timeout
-apiServerSessionTimeout="7200"
-
-# api server context path
-apiServerContextPath="/dolphinscheduler/"
-
-# spring max file size
-springMaxFileSize="1024MB"
-
-# spring max request size
-springMaxRequestSize="1024MB"
-
-# api max http post size
-apiMaxHttpPostSize="5000000"
-
-
-# 1,replace file
-echo "1,replace file"
-if [ $dbtype == "mysql" ];then
-    sed -i ${txt} "s#spring.datasource.url.*#spring.datasource.url=jdbc:mysql://${dbhost}/${dbname}?characterEncoding=UTF-8#g" conf/application.properties
-    sed -i ${txt} "s#spring.datasource.username.*#spring.datasource.username=${username}#g" conf/application.properties
-    sed -i ${txt} "s#spring.datasource.password.*#spring.datasource.password=${passowrd}#g" conf/application.properties
-    sed -i ${txt} "s#spring.datasource.driver-class-name.*#spring.datasource.driver-class-name=com.mysql.jdbc.Driver#g" conf/application.properties
-
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.URL.*#org.quartz.dataSource.myDs.URL=jdbc:mysql://${dbhost}/${dbname}?characterEncoding=UTF-8#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.user.*#org.quartz.dataSource.myDs.user=${username}#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.password.*#org.quartz.dataSource.myDs.password=${passowrd}#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.driver.*#org.quartz.dataSource.myDs.driver=com.mysql.jdbc.Driver#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.jobStore.driverDelegateClass.*#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate#g" conf/quartz.properties
 fi
 
+datasourceDriverClassname="com.mysql.jdbc.Driver"
 if [ $dbtype == "postgresql" ];then
-    sed -i ${txt} "s#spring.datasource.url.*#spring.datasource.url=jdbc:postgresql://${dbhost}/${dbname}?characterEncoding=UTF-8#g" conf/application.properties
+  datasourceDriverClassname="org.postgresql.Driver"
-    sed -i ${txt} "s#spring.datasource.username.*#spring.datasource.username=${username}#g" conf/application.properties
-    sed -i ${txt} "s#spring.datasource.password.*#spring.datasource.password=${passowrd}#g" conf/application.properties
-    sed -i ${txt} "s#spring.datasource.driver-class-name.*#spring.datasource.driver-class-name=org.postgresql.Driver#g" conf/application.properties
-
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.URL.*#org.quartz.dataSource.myDs.URL=jdbc:postgresql://${dbhost}/${dbname}?characterEncoding=UTF-8#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.user.*#org.quartz.dataSource.myDs.user=${username}#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.password.*#org.quartz.dataSource.myDs.password=${passowrd}#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.dataSource.myDs.driver.*#org.quartz.dataSource.myDs.driver=org.postgresql.Driver#g" conf/quartz.properties
-    sed -i ${txt} "s#org.quartz.jobStore.driverDelegateClass.*#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate#g" conf/quartz.properties
 fi
-
+sed -i ${txt} "s#spring.datasource.driver-class-name.*#spring.datasource.driver-class-name=${datasourceDriverClassname}#g" conf/datasource.properties
-sed -i ${txt} "s#master.exec.threads.*#master.exec.threads=${masterExecThreads}#g" conf/application.properties
+sed -i ${txt} "s#spring.datasource.url.*#spring.datasource.url=jdbc:${dbtype}://${dbhost}/dolphinscheduler?characterEncoding=UTF-8#g" conf/datasource.properties
-sed -i ${txt} "s#master.exec.task.num.*#master.exec.task.num=${masterExecTaskNum}#g" conf/application.properties
+sed -i ${txt} "s#spring.datasource.username.*#spring.datasource.username=${username}#g" conf/datasource.properties
-sed -i ${txt} "s#master.heartbeat.interval.*#master.heartbeat.interval=${masterHeartbeatInterval}#g" conf/application.properties
+sed -i ${txt} "s#spring.datasource.password.*#spring.datasource.password=${password}#g" conf/datasource.properties
-sed -i ${txt} "s#master.task.commit.retryTimes.*#master.task.commit.retryTimes=${masterTaskCommitRetryTimes}#g" conf/application.properties
-sed -i ${txt} "s#master.task.commit.interval.*#master.task.commit.interval=${masterTaskCommitInterval}#g" conf/application.properties
-sed -i ${txt} "s#master.reserved.memory.*#master.reserved.memory=${masterReservedMemory}#g" conf/application.properties
-
-sed -i ${txt} "s#worker.exec.threads.*#worker.exec.threads=${workerExecThreads}#g" conf/application.properties
-sed -i ${txt} "s#worker.heartbeat.interval.*#worker.heartbeat.interval=${workerHeartbeatInterval}#g" conf/application.properties
-sed -i ${txt} "s#worker.fetch.task.num.*#worker.fetch.task.num=${workerFetchTaskNum}#g" conf/application.properties
-sed -i ${txt} "s#worker.reserved.memory.*#worker.reserved.memory=${workerReservedMemory}#g" conf/application.properties
 
 sed -i ${txt} "s#fs.defaultFS.*#fs.defaultFS=${defaultFS}#g" conf/common.properties
 sed -i ${txt} "s#fs.s3a.endpoint.*#fs.s3a.endpoint=${s3Endpoint}#g" conf/common.properties
@@ -329,37 +45,18 @@ sed -i ${txt} "s#fs.s3a.access.key.*#fs.s3a.access.key=${s3AccessKey}#g" conf/co
 sed -i ${txt} "s#fs.s3a.secret.key.*#fs.s3a.secret.key=${s3SecretKey}#g" conf/common.properties
 sed -i ${txt} "s#yarn.resourcemanager.ha.rm.ids.*#yarn.resourcemanager.ha.rm.ids=${yarnHaIps}#g" conf/common.properties
 sed -i ${txt} "s#yarn.application.status.address.*#yarn.application.status.address=http://${singleYarnIp}:8088/ws/v1/cluster/apps/%s#g" conf/common.properties
-
-sed -i ${txt} "s#data.basedir.path.*#data.basedir.path=${programPath}#g" conf/common.properties
-sed -i ${txt} "s#data.download.basedir.path.*#data.download.basedir.path=${downloadPath}#g" conf/common.properties
-sed -i ${txt} "s#process.exec.basepath.*#process.exec.basepath=${execPath}#g" conf/common.properties
 sed -i ${txt} "s#hdfs.root.user.*#hdfs.root.user=${hdfsRootUser}#g" conf/common.properties
-sed -i ${txt} "s#data.store2hdfs.basepath.*#data.store2hdfs.basepath=${hdfsPath}#g" conf/common.properties
+sed -i ${txt} "s#resource.upload.path.*#resource.upload.path=${resourceUploadPath}#g" conf/common.properties
-sed -i ${txt} "s#res.upload.startup.type.*#res.upload.startup.type=${resUploadStartupType}#g" conf/common.properties
+sed -i ${txt} "s#resource.storage.type.*#resource.storage.type=${resourceStorageType}#g" conf/common.properties
-sed -i ${txt} "s#dolphinscheduler.env.path.*#dolphinscheduler.env.path=${shellEnvPath}#g" conf/common.properties
-sed -i ${txt} "s#resource.view.suffixs.*#resource.view.suffixs=${resSuffixs}#g" conf/common.properties
-sed -i ${txt} "s#development.state.*#development.state=${devState}#g" conf/common.properties
 sed -i ${txt} "s#hadoop.security.authentication.startup.state.*#hadoop.security.authentication.startup.state=${kerberosStartUp}#g" conf/common.properties
 sed -i ${txt} "s#java.security.krb5.conf.path.*#java.security.krb5.conf.path=${krb5ConfPath}#g" conf/common.properties
 sed -i ${txt} "s#login.user.keytab.username.*#login.user.keytab.username=${keytabUserName}#g" conf/common.properties
 sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g" conf/common.properties
-
 sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/common.properties
-sed -i ${txt} "s#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/common.properties
-sed -i ${txt} "s#zookeeper.session.timeout.*#zookeeper.session.timeout=${zkSessionTimeout}#g" conf/common.properties
-sed -i ${txt} "s#zookeeper.connection.timeout.*#zookeeper.connection.timeout=${zkConnectionTimeout}#g" conf/common.properties
-sed -i ${txt} "s#zookeeper.retry.max.sleep.*#zookeeper.retry.max.sleep=${zkRetryMaxSleep}#g" conf/common.properties
-sed -i ${txt} "s#zookeeper.retry.maxtime.*#zookeeper.retry.maxtime=${zkRetryMaxtime}#g" conf/common.properties
 
 sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties
-sed -i ${txt} "s#server.servlet.session.timeout.*#server.servlet.session.timeout=${apiServerSessionTimeout}#g" conf/application-api.properties
-sed -i ${txt} "s#server.servlet.context-path.*#server.servlet.context-path=${apiServerContextPath}#g" conf/application-api.properties
-sed -i ${txt} "s#spring.servlet.multipart.max-file-size.*#spring.servlet.multipart.max-file-size=${springMaxFileSize}#g" conf/application-api.properties
-sed -i ${txt} "s#spring.servlet.multipart.max-request-size.*#spring.servlet.multipart.max-request-size=${springMaxRequestSize}#g" conf/application-api.properties
-sed -i ${txt} "s#server.jetty.max-http-post-size.*#server.jetty.max-http-post-size=${apiMaxHttpPostSize}#g" conf/application-api.properties
 
 
-sed -i ${txt} "s#mail.protocol.*#mail.protocol=${mailProtocol}#g" conf/alert.properties
 sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/alert.properties
 sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties
 sed -i ${txt} "s#mail.sender.*#mail.sender=${mailSender}#g" conf/alert.properties
@@ -368,85 +65,38 @@ sed -i ${txt} "s#mail.passwd.*#mail.passwd=${mailPassword}#g" conf/alert.propert
 sed -i ${txt} "s#mail.smtp.starttls.enable.*#mail.smtp.starttls.enable=${starttlsEnable}#g" conf/alert.properties
 sed -i ${txt} "s#mail.smtp.ssl.trust.*#mail.smtp.ssl.trust=${sslTrust}#g" conf/alert.properties
 sed -i ${txt} "s#mail.smtp.ssl.enable.*#mail.smtp.ssl.enable=${sslEnable}#g" conf/alert.properties
-sed -i ${txt} "s#xls.file.path.*#xls.file.path=${xlsFilePath}#g" conf/alert.properties
-sed -i ${txt} "s#enterprise.wechat.corp.id.*#enterprise.wechat.corp.id=${enterpriseWechatCorpId}#g" conf/alert.properties
-sed -i ${txt} "s#enterprise.wechat.secret.*#enterprise.wechat.secret=${enterpriseWechatSecret}#g" conf/alert.properties
-sed -i ${txt} "s#enterprise.wechat.agent.id.*#enterprise.wechat.agent.id=${enterpriseWechatAgentId}#g" conf/alert.properties
-sed -i ${txt} "s#enterprise.wechat.users.*#enterprise.wechat.users=${enterpriseWechatUsers}#g" conf/alert.properties
-
-
-
-sed -i ${txt} "s#installPath.*#installPath=${installPath}#g" conf/config/install_config.conf
-sed -i ${txt} "s#deployUser.*#deployUser=${deployUser}#g" conf/config/install_config.conf
-sed -i ${txt} "s#ips.*#ips=${ips}#g" conf/config/install_config.conf
-sed -i ${txt} "s#sshPort.*#sshPort=${sshPort}#g" conf/config/install_config.conf
-
-
-sed -i ${txt} "s#masters.*#masters=${masters}#g" conf/config/install_config.conf
-sed -i ${txt} "s#workers.*#workers=${workers}#g" conf/config/install_config.conf
-sed -i ${txt} "s#alertServer.*#alertServer=${alertServer}#g" conf/config/install_config.conf
-sed -i ${txt} "s#apiServers.*#apiServers=${apiServers}#g" conf/config/install_config.conf
-sed -i ${txt} "s#sshPort.*#sshPort=${sshPort}#g" conf/config/install_config.conf
 
-
+# 2.create directory
-# 2,create directory
+echo "2.create directory"
-echo "2,create directory"
 
 if [ ! -d $installPath ];then
   sudo mkdir -p $installPath
   sudo chown -R $deployUser:$deployUser $installPath
 fi
 
-hostsArr=(${ips//,/ })
+# 3.scp resources
-for host in ${hostsArr[@]}
+echo "3.scp resources"
-do
-
-# create if programPath does not exist
-if ! ssh -p $sshPort $host test -e $programPath; then
-  ssh -p $sshPort $host "sudo mkdir -p $programPath;sudo chown -R $deployUser:$deployUser $programPath"
-fi
-
-# create if downloadPath does not exist
-if ! ssh -p $sshPort $host test -e $downloadPath; then
-  ssh -p $sshPort $host "sudo mkdir -p $downloadPath;sudo chown -R $deployUser:$deployUser $downloadPath"
-fi
-
-# create if execPath does not exist
-if ! ssh -p $sshPort $host test -e $execPath; then
-  ssh -p $sshPort $host "sudo mkdir -p $execPath; sudo chown -R $deployUser:$deployUser $execPath"
-fi
-
-# create if xlsFilePath does not exist
-if ! ssh -p $sshPort $host test -e $xlsFilePath; then
-  ssh -p $sshPort $host "sudo mkdir -p $xlsFilePath; sudo chown -R $deployUser:$deployUser $xlsFilePath"
-fi
-
-done
-
-
-# 3,scp resources
-echo "3,scp resources"
 sh ${workDir}/script/scp-hosts.sh
 if [ $? -eq 0 ]
 then
 	echo 'scp copy completed'
 else
 	echo 'scp copy failed to exit'
-	exit -1
+	exit 1
 fi
 
 
-# 4,stop server
+# 4.stop server
-echo "4,stop server"
+echo "4.stop server"
 sh ${workDir}/script/stop-all.sh
 
 
-# 5,delete zk node
+# 5.delete zk node
-echo "5,delete zk node"
+echo "5.delete zk node"
 
 sh ${workDir}/script/remove-zk-node.sh $zkRoot
 
 
-# 6,startup
+# 6.startup
-echo "6,startup"
+echo "6.startup"
 sh ${workDir}/script/start-all.sh

pom.xml

@@ -721,6 +721,7 @@
                         <include>**/api/service/UserAlertGroupServiceTest.java</include>
                         <include>**/api/service/UsersServiceTest.java</include>
                         <include>**/api/service/WorkerGroupServiceTest.java</include>
+                        <include>**/api/controller/ProcessDefinitionControllerTest.java</include>
                         <include>**/api/utils/exportprocess/DataSourceParamTest.java</include>
                         <include>**/api/utils/exportprocess/DependentParamTest.java</include>
                         <include>**/api/utils/CheckUtilsTest.java</include>
@@ -746,7 +747,6 @@
                         <include>**/common/utils/DependentUtilsTest.java</include>
                         <include>**/common/utils/EncryptionUtilsTest.java</include>
                         <include>**/common/utils/FileUtilsTest.java</include>
-                        <include>**/common/utils/HadoopUtilsTest.java</include>
                         <include>**/common/utils/IpUtilsTest.java</include>
                         <include>**/common/utils/JSONUtilsTest.java</include>
                         <include>**/common/utils/LoggerUtilsTest.java</include>
@@ -760,6 +760,8 @@
                         <include>**/common/utils/StringTest.java</include>
                         <include>**/common/utils/StringUtilsTest.java</include>
                         <include>**/common/utils/TaskParametersUtilsTest.java</include>
+                        <include>**/common/utils/HadoopUtilsTest.java</include>
+                        <include>**/common/utils/HttpUtilsTest.java</include>
                         <include>**/common/ConstantsTest.java</include>
                         <include>**/dao/mapper/AccessTokenMapperTest.java</include>
                         <include>**/dao/mapper/AlertGroupMapperTest.java</include>
@@ -781,6 +783,8 @@
                         <include>**/server/master/register/MasterRegistryTest.java</include>
                         <include>**/server/master/AlertManagerTest.java</include>
                         <include>**/server/master/MasterCommandTest.java</include>
+                        <include>**/server/master/DependentTaskTest.java</include>
+                        <include>**/server/master/ConditionsTaskTest.java</include>
                         <include>**/server/master/MasterExecThreadTest.java</include>
                         <include>**/server/master/ParamsTest.java</include>
                         <include>**/server/register/ZookeeperNodeManagerTest.java</include>

script/dolphinscheduler-daemon.sh

@@ -35,6 +35,8 @@ BIN_DIR=`dirname $0`
 BIN_DIR=`cd "$BIN_DIR"; pwd`
 DOLPHINSCHEDULER_HOME=$BIN_DIR/..
 
+source /etc/profile
+
 export JAVA_HOME=$JAVA_HOME
 #export JAVA_HOME=/opt/soft/jdk
 export HOSTNAME=`hostname`
@@ -90,8 +92,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 &"
+    echo "nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 &"
-    nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 > /dev/null &
+    nohup $JAVA_HOME/bin/java $exec_command > $log 2>&1 &
     echo $! > $pid
     ;;
 

script/scp-hosts.sh

@@ -28,12 +28,14 @@ do
     ssh -p $sshPort $host "sudo mkdir -p $installPath; sudo chown -R $deployUser:$deployUser $installPath"
   fi
 
+  echo "scp dirs to $host/$installPath starting"
 	ssh -p $sshPort $host  "cd $installPath/; rm -rf bin/ conf/ lib/ script/ sql/ ui/"
-	scp -P $sshPort -r $workDir/../bin  $host:$installPath
+
-	scp -P $sshPort -r $workDir/../conf  $host:$installPath
+  for dsDir in bin conf lib script sql ui install.sh
-	scp -P $sshPort -r $workDir/../lib   $host:$installPath
+  do
-	scp -P $sshPort -r $workDir/../script  $host:$installPath
+    echo "start to scp $dsDir to $host/$installPath"
-	scp -P $sshPort -r $workDir/../sql  $host:$installPath
+    scp -P $sshPort -r $workDir/../$dsDir  $host:$installPath
-	scp -P $sshPort -r $workDir/../ui  $host:$installPath
+  done
-	scp -P $sshPort  $workDir/../install.sh  $host:$installPath
+
+  echo "scp dirs to $host/$installPath complete"
 done

script/start-all.sh

@@ -23,7 +23,7 @@ source $workDir/../conf/config/install_config.conf
 mastersHost=(${masters//,/ })
 for master in ${mastersHost[@]}
 do
-        echo $master
+  echo "$master master server is starting"
 	ssh -p $sshPort $master  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start master-server;"
 
 done
@@ -31,7 +31,7 @@ done
 workersHost=(${workers//,/ })
 for worker in ${workersHost[@]}
 do
-        echo $worker
+  echo "$worker worker server is starting"
 
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start worker-server;"
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start logger-server;"
@@ -42,8 +42,7 @@ ssh -p $sshPort $alertServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.
 apiServersHost=(${apiServers//,/ })
 for apiServer in ${apiServersHost[@]}
 do
-        echo $apiServer
+  echo "$apiServer worker server is starting"
-
   ssh -p $sshPort $apiServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start api-server;"
 done
 

script/stop-all.sh

@@ -24,7 +24,7 @@ source $workDir/../conf/config/install_config.conf
 mastersHost=(${masters//,/ })
 for master in ${mastersHost[@]}
 do
-        echo $master
+  echo "$master master server is stopping"
 	ssh -p $sshPort $master  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop master-server;"
 
 done
@@ -32,8 +32,7 @@ done
 workersHost=(${workers//,/ })
 for worker in ${workersHost[@]}
 do
-        echo $worker
+  echo "$worker worker server is stopping"
-
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop worker-server;"
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop logger-server;"
 done
@@ -43,8 +42,7 @@ ssh -p $sshPort $alertServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.
 apiServersHost=(${apiServers//,/ })
 for apiServer in ${apiServersHost[@]}
 do
-        echo $apiServer
+  echo "$apiServer worker server is stopping"
-
   ssh -p $sshPort $apiServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop api-server;"
 done
 

sql/dolphinscheduler-postgre.sql

@@ -234,7 +234,7 @@ CREATE TABLE t_ds_command (
   dependence varchar(255) DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64),
   PRIMARY KEY (id)
 ) ;
 
@@ -275,7 +275,7 @@ CREATE TABLE t_ds_error_command (
   update_time timestamp DEFAULT NULL ,
   dependence text ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64),
   message text ,
   PRIMARY KEY (id)
 );
@@ -748,7 +748,7 @@ CREATE SEQUENCE  t_ds_worker_server_id_sequence;
 ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_server_id_sequence');
 
 
--- Records of t_ds_user，user : admin , password : dolphinscheduler123
+-- Records of t_ds_user?user : admin , password : dolphinscheduler123
 INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
 
 -- Records of t_ds_alertgroup，dolphinscheduler warning group

sql/dolphinscheduler_mysql.sql

@@ -333,7 +333,7 @@ CREATE TABLE `t_ds_command` (
   `dependence` varchar(255) DEFAULT NULL COMMENT 'dependence',
   `update_time` datetime DEFAULT NULL COMMENT 'update time',
   `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority: 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
-  `worker_group_id` int(11) DEFAULT '-1' COMMENT 'worker group id',
+  `worker_group` varchar(64)  COMMENT 'worker group',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
@@ -380,7 +380,7 @@ CREATE TABLE `t_ds_error_command` (
   `update_time` datetime DEFAULT NULL COMMENT 'update time',
   `dependence` text COMMENT 'dependence',
   `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
-  `worker_group_id` int(11) DEFAULT '-1' COMMENT 'worker group id',
+  `worker_group` varchar(64)  COMMENT 'worker group',
   `message` text COMMENT 'message',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;

sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql

@@ -167,7 +167,7 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group()
            AND TABLE_SCHEMA=(SELECT DATABASE())
            AND COLUMN_NAME ='worker_group')
    THEN
-         ALTER TABLE t_ds_process_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+         ALTER TABLE t_ds_process_instance ADD `worker_group` varchar(64) DEFAULT '' COMMENT 'worker group';
        END IF;
  END;
 
@@ -207,7 +207,7 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group()
            AND TABLE_SCHEMA=(SELECT DATABASE())
            AND COLUMN_NAME ='worker_group')
    THEN
-         ALTER TABLE t_ds_task_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+         ALTER TABLE t_ds_task_instance ADD `worker_group` varchar(64) DEFAULT '' COMMENT 'worker group';
        END IF;
  END;
 
@@ -247,7 +247,7 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group()
            AND TABLE_SCHEMA=(SELECT DATABASE())
            AND COLUMN_NAME ='worker_group')
    THEN
-         ALTER TABLE t_ds_schedules ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+         ALTER TABLE t_ds_schedules ADD `worker_group` varchar(64) DEFAULT '' COMMENT 'worker group';
        END IF;
  END;
 
@@ -277,4 +277,83 @@ delimiter ;
 CALL dc_dolphin_T_t_ds_schedules_D_worker_group_id;
 DROP PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id;
 
+-- ac_dolphin_T_t_ds_command_A_worker_group
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_command_A_worker_group;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_command_A_worker_group()
+   BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_command'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group')
+   THEN
+         ALTER TABLE t_ds_command ADD `worker_group` varchar(64) DEFAULT '' COMMENT 'worker group';
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_command_A_worker_group;
+DROP PROCEDURE ac_dolphin_T_t_ds_command_A_worker_group;
+
+-- dc_dolphin_T_t_ds_command_D_worker_group_id
+drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_command_D_worker_group_id;
+delimiter d//
+CREATE PROCEDURE dc_dolphin_T_t_ds_command_D_worker_group_id()
+   BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_command'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group_id')
+   THEN
+         ALTER TABLE t_ds_command DROP COLUMN worker_group_id;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL dc_dolphin_T_t_ds_command_D_worker_group_id;
+DROP PROCEDURE dc_dolphin_T_t_ds_command_D_worker_group_id;
+
+-- ac_dolphin_T_t_ds_error_command_A_worker_group
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_error_command_A_worker_group;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_error_command_A_worker_group()
+   BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_error_command'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group')
+   THEN
+         ALTER TABLE t_ds_error_command ADD `worker_group` varchar(64) DEFAULT '' COMMENT 'worker group';
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_error_command_A_worker_group;
+DROP PROCEDURE ac_dolphin_T_t_ds_error_command_A_worker_group;
+
+-- dc_dolphin_T_t_ds_error_command_D_worker_group_id
+drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_error_command_D_worker_group_id;
+delimiter d//
+CREATE PROCEDURE dc_dolphin_T_t_ds_error_command_D_worker_group_id()
+   BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_error_command'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group_id')
+   THEN
+         ALTER TABLE t_ds_error_command DROP COLUMN worker_group_id;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL dc_dolphin_T_t_ds_error_command_D_worker_group_id;
+DROP PROCEDURE dc_dolphin_T_t_ds_error_command_D_worker_group_id;
 

sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql

@@ -164,7 +164,7 @@ BEGIN
           AND TABLE_NAME='t_ds_process_instance'
           AND COLUMN_NAME ='worker_group')
       THEN
-         ALTER TABLE t_ds_process_instance ADD COLUMN worker_group varchar(255) DEFAULT null;
+         ALTER TABLE t_ds_process_instance ADD COLUMN worker_group varchar(64) DEFAULT null;
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -207,7 +207,7 @@ BEGIN
           AND TABLE_NAME='t_ds_task_instance'
           AND COLUMN_NAME ='worker_group')
       THEN
-         ALTER TABLE t_ds_task_instance ADD COLUMN worker_group varchar(255) DEFAULT null;
+         ALTER TABLE t_ds_task_instance ADD COLUMN worker_group varchar(64) DEFAULT null;
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -249,7 +249,7 @@ BEGIN
           AND TABLE_NAME='t_ds_schedules'
           AND COLUMN_NAME ='worker_group')
       THEN
-         ALTER TABLE t_ds_schedules ADD COLUMN worker_group varchar(255) DEFAULT null;
+         ALTER TABLE t_ds_schedules ADD COLUMN worker_group varchar(64) DEFAULT null;
        END IF;
 END;
 $$ LANGUAGE plpgsql;
@@ -279,4 +279,88 @@ delimiter ;
 select dc_dolphin_T_t_ds_schedules_D_worker_group_id();
 DROP FUNCTION dc_dolphin_T_t_ds_schedules_D_worker_group_id();
 
+-- ac_dolphin_T_t_ds_command_A_worker_group
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_command_A_worker_group();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_command_A_worker_group() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_command'
+          AND COLUMN_NAME ='worker_group')
+      THEN
+         ALTER TABLE t_ds_command ADD COLUMN worker_group varchar(64) DEFAULT null;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_command_A_worker_group();
+DROP FUNCTION ac_dolphin_T_t_ds_command_A_worker_group();
+
+-- dc_dolphin_T_t_ds_command_D_worker_group_id
+delimiter ;
+DROP FUNCTION IF EXISTS dc_dolphin_T_t_ds_command_D_worker_group_id();
+delimiter d//
+CREATE FUNCTION dc_dolphin_T_t_ds_command_D_worker_group_id() RETURNS void AS $$
+BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_command'
+          AND COLUMN_NAME ='worker_group_id')
+      THEN
+         ALTER TABLE t_ds_command DROP COLUMN worker_group_id;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select dc_dolphin_T_t_ds_command_D_worker_group_id();
+DROP FUNCTION dc_dolphin_T_t_ds_command_D_worker_group_id();
+
+-- ac_dolphin_T_t_ds_error_command_A_worker_group
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_error_command_A_worker_group();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_error_command_A_worker_group() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_error_command'
+          AND COLUMN_NAME ='worker_group')
+      THEN
+         ALTER TABLE t_ds_error_command ADD COLUMN worker_group varchar(64) DEFAULT null;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_error_command_A_worker_group();
+DROP FUNCTION ac_dolphin_T_t_ds_error_command_A_worker_group();
+
+-- dc_dolphin_T_t_ds_error_command_D_worker_group_id
+delimiter ;
+DROP FUNCTION IF EXISTS dc_dolphin_T_t_ds_error_command_D_worker_group_id();
+delimiter d//
+CREATE FUNCTION dc_dolphin_T_t_ds_error_command_D_worker_group_id() RETURNS void AS $$
+BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_error_command'
+          AND COLUMN_NAME ='worker_group_id')
+      THEN
+         ALTER TABLE t_ds_error_command DROP COLUMN worker_group_id;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select dc_dolphin_T_t_ds_error_command_D_worker_group_id();
+DROP FUNCTION dc_dolphin_T_t_ds_error_command_D_worker_group_id();
+