fix unsuitable error message (#1132)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message

* delete before check to avoid KeeperException$NoNodeException

* fix the message

* check processInstance state before delete tenant

* check processInstance state before delete worker group

* refactor

* merge api constants into common constatns

* update the resource perm

* update the dataSource perm

* fix CheckUtils.checkUserParams method

* update AlertGroupService, extends from BaseService, remove duplicate methods

* refactor

* modify method name

* add hasProjectAndPerm method

* using checkProject instead of getResultStatus

* delete checkAuth method, using hasProjectAndPerm instead.

* correct spelling

* add transactional for deleteWorkerGroupById

* add Transactional for deleteProcessInstanceById method

* change sqlSessionTemplate singleton

* change sqlSessionTemplate singleton and reformat code

* fix unsuitable error message

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

@@ -150,8 +150,8 @@ public class AccessTokenController extends BaseController{
             Map<String, Object> result = accessTokenService.delAccessTokenById(loginUser, id);
             return returnDataList(result);
         }catch (Exception e){
-            logger.error(DELETE_USER_BY_ID_ERROR.getMsg(),e);
+            logger.error(DELETE_ACCESS_TOKEN_ERROR.getMsg(),e);
-            return error(Status.DELETE_USER_BY_ID_ERROR.getCode(), Status.DELETE_USER_BY_ID_ERROR.getMsg());
+            return error(Status.DELETE_ACCESS_TOKEN_ERROR.getCode(), Status.DELETE_ACCESS_TOKEN_ERROR.getMsg());
         }
     }
 
@@ -163,7 +163,7 @@ public class AccessTokenController extends BaseController{
      */
     @ApiIgnore
     @PostMapping(value = "/update")
-    @ResponseStatus(HttpStatus.CREATED)
+    @ResponseStatus(HttpStatus.OK)
     public Result updateToken(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                               @RequestParam(value = "id") int id,
                               @RequestParam(value = "userId") int userId,
@@ -176,8 +176,8 @@ public class AccessTokenController extends BaseController{
             Map<String, Object> result = accessTokenService.updateToken(id,userId, expireTime, token);
             return returnDataList(result);
         }catch (Exception e){
-            logger.error(CREATE_ACCESS_TOKEN_ERROR.getMsg(),e);
+            logger.error(UPDATE_ACCESS_TOKEN_ERROR.getMsg(),e);
-            return error(CREATE_ACCESS_TOKEN_ERROR.getCode(), CREATE_ACCESS_TOKEN_ERROR.getMsg());
+            return error(UPDATE_ACCESS_TOKEN_ERROR.getCode(), UPDATE_ACCESS_TOKEN_ERROR.getMsg());
         }
     }
 

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

@@ -239,6 +239,8 @@ public enum Status {
     CREATE_ACCESS_TOKEN_ERROR(70001,"create access token error"),
     GENERATE_TOKEN_ERROR(70002,"generate token error"),
     QUERY_ACCESSTOKEN_LIST_PAGING_ERROR(70003,"query access token list paging error"),
+    UPDATE_ACCESS_TOKEN_ERROR(70004,"update access token error"),
+    DELETE_ACCESS_TOKEN_ERROR(70005,"delete access token error"),
 
 
     COMMAND_STATE_COUNT_ERROR(80001,"task instance state count error"),