Merge branch 'master' into 20220919

@@ -108,7 +108,7 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
             response.setContentType(MediaType.APPLICATION_JSON_VALUE);
             response.setStatus(HttpStatus.FORBIDDEN.value());
             mapper.writeValue(response.getWriter(),
-                    ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
+                    ThingsboardErrorResponse.of(ErrorMessage.NOT_HAVE_PERMISSION.getMessage(),
                             ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN));
         }
     }
@@ -188,7 +188,7 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
     private void handleAccessDeniedException(HttpServletResponse response) throws IOException {
         response.setStatus(HttpStatus.FORBIDDEN.value());
         mapper.writeValue(response.getWriter(),
-                ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
+                ThingsboardErrorResponse.of(ErrorMessage.NOT_HAVE_PERMISSION.getMessage(),
                         ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN));
 
     }
@@ -196,13 +196,13 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
     private void handleAuthenticationException(AuthenticationException authenticationException, HttpServletResponse response) throws IOException {
         response.setStatus(HttpStatus.UNAUTHORIZED.value());
         if (authenticationException instanceof BadCredentialsException || authenticationException instanceof UsernameNotFoundException) {
-            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.USERNAME_PASSWORD_INCORRECT.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof DisabledException) {
-            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.ACCOUNT_IS_NOT_ACTIVE.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof LockedException) {
             mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.ACCOUNT_LOCKED.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof JwtExpiredTokenException) {
-            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED));
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.TOKEN_EXPIRED.getMessage(), ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof AuthMethodNotSupportedException) {
             mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(authenticationException.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof UserPasswordExpiredException) {
@@ -214,7 +214,7 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
             mapper.writeValue(response.getWriter(), ThingsboardCredentialsExpiredResponse.of(expiredException.getMessage(),ThingsboardErrorCode.AUTHENTICATION, HttpStatus.FORBIDDEN));
         }
         else {
-            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.AUTHENTICATION_METHOD_NOT_SUPPORTED.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         }
     }
 

@@ -10,15 +10,17 @@ public enum ErrorMessage {
   NO_PERMISSION(403001, "没有操作权限"),
   ACCOUNT_DISABLED(403002, "账号已禁用"),
   ACCESS_DENIED(403003, "拒绝访问"),
-  AUTHENTICATION_METHOD_NOT_SUPPORTED(403004, "authentication method not supported"),
-  ACCOUNT_LOCKED(403002, "根据相关安全策略账号已锁定！"),
-  USERNAME_PASSWORD_INCORRECT(401001, "incorrect username or password"),
-  TOKEN_EXPIRED(401002, "token has expired"),
-  NONE_TENANT_ASSET(401003, "not current tenant asset"),
-  AUTHENTICATION_FAILED_ACCOUNT_EXPIRED(401003, "account has expired"),
-  BAD_PARAMETER(400000, "query parameters not valid"),
-  INVALID_PARAMETER(400001, "invalid parameters"),
-  TOO_MANY_REQUEST(429001, "too many requests"),
+  AUTHENTICATION_METHOD_NOT_SUPPORTED(403004, "权限认证失败"),
+  ACCOUNT_LOCKED(403005, "根据相关安全策略账号已锁定！"),
+  NOT_HAVE_PERMISSION(403006, "您没有执行该操作的权限!"),
+  ACCOUNT_IS_NOT_ACTIVE(401000,"用户账号未激活或初始密码未修改"),
+  USERNAME_PASSWORD_INCORRECT(401001, "用户名或密码错误"),
+  TOKEN_EXPIRED(401002, "token已过期"),
+  NONE_TENANT_ASSET(401003, "非当前租户资产"),
+  AUTHENTICATION_FAILED_ACCOUNT_EXPIRED(401003, "账号已过期"),
+  BAD_PARAMETER(400000, "查询参数无效"),
+  INVALID_PARAMETER(400001, "无效参数"),
+  TOO_MANY_REQUEST(429001, "请求过多"),
   EXIST_ENABLE_TEMPLATE(400002,"存在已启用相同类型及用途的模板"),
   NOT_SET_PASSWORD_TEMPLATE(400003,"未设置用于密码重置的模板"),
   PROVIDE_CORRECT_PHONE_NUMBER(400004,"请提供正确的电话号码"),