Merge branch 'dev' into refactor-worker

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());
-        }
     }
 
     /**
@@ -108,18 +108,14 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/verify-name")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR)
     public Result verifyProccessDefinitionName(@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);
         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());
-        }
     }
 
     /**
@@ -146,6 +142,7 @@ public class ProcessDefinitionController extends BaseController{
     })
     @PostMapping(value = "/update")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_PROCESS_DEFINITION_ERROR)
     public Result updateProccessDefinition(@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,
@@ -155,17 +152,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());
-        }
     }
 
     /**
@@ -185,20 +177,16 @@ public class ProcessDefinitionController extends BaseController{
     })
     @PostMapping(value = "/release")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(RELEASE_PROCESS_DEFINITION_ERROR)
     public Result releaseProccessDefinition(@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());
-        }
     }
 
 
@@ -216,19 +204,15 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/select-by-id")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR)
     public Result queryProccessDefinitionById(@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 datail of process definition, login user:{}, project name:{}, process definition id:{}",
                 loginUser.getUserName(), projectName, processId);
         Map<String, Object> result = processDefinitionService.queryProccessDefinitionById(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());
-        }
     }
 
 
@@ -242,22 +226,19 @@ public class ProcessDefinitionController extends BaseController{
     @ApiOperation(value = "queryProccessDefinitionList", notes = "QUERY_PROCCESS_DEFINITION_LIST_NOTES")
     @GetMapping(value = "/list")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCCESS_DEFINITION_LIST)
     public Result queryProccessDefinitionList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                               @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName
     ) {
-        try{
         logger.info("query proccess definition list, login user:{}, project name:{}",
                 loginUser.getUserName(), projectName);
         Map<String, Object> result = processDefinitionService.queryProccessDefinitionList(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
+     *
      * @param loginUser   login user
      * @param projectName project name
      * @param searchVal   search value
@@ -275,13 +256,13 @@ public class ProcessDefinitionController extends BaseController{
     })
     @GetMapping(value = "/list-paging")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCCESS_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 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) {
@@ -290,10 +271,6 @@ 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());
-        }
     }
 
 
@@ -313,25 +290,19 @@ 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 +314,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 +339,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 +365,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 +390,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 +424,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());
-        }
     }
 
     /**
@@ -501,7 +454,6 @@ public class ProcessDefinitionController extends BaseController{
     }
 
 
-
     /**
      * query proccess definition all by project id
      *
@@ -512,17 +464,13 @@ public class ProcessDefinitionController extends BaseController{
     @ApiOperation(value = "queryProccessDefinitionAllByProjectId", notes = "QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
     @GetMapping(value = "/queryProccessDefinitionAllByProjectId")
     @ResponseStatus(HttpStatus.OK)
+    @ApiException(QUERY_PROCCESS_DEFINITION_LIST)
     public Result queryProccessDefinitionAllByProjectId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                         @RequestParam("projectId") Integer projectId) {
-        try{
         logger.info("query proccess definition list, login user:{}, project id:{}",
                 loginUser.getUserName(), projectId);
         Map<String, Object> result = processDefinitionService.queryProccessDefinitionAllByProjectId(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,20 +218,17 @@ 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
@@ -266,40 +239,31 @@ public class ProjectController extends BaseController {
             @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/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/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-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()