fix:統一使用ThingsboardErrorResponseHandler进行异常捕获处理

-package org.thingsboard.server.config.yunteng;
-
-import com.datastax.oss.driver.api.core.uuid.Uuids;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.yunteng.core.exception.*;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.SysLogOperateDTO;
-import org.thingsboard.server.dao.audit.AuditLogService;
-import org.thingsboard.server.exception.yunteng.YunTengErrorResponseHandler;
-import org.thingsboard.server.service.security.model.SecurityUser;
-import org.thingsboard.server.utils.yunteng.LogUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Objects;
-import java.util.UUID;
-
-@ControllerAdvice(basePackages = "org.thingsboard.server.controller.yunteng")
-@RequiredArgsConstructor
-@Slf4j
-public class ControllerExceptionHandler {
-
-  private final AuditLogService auditLogService;
-  private final YunTengErrorResponseHandler errorResponseHandler;
-
-  @ExceptionHandler(YunTengException.class)
-  public void handleYunTengException(YunTengException ex,HttpServletRequest request,  HttpServletResponse response) {
-    produceLog( request, ex);
-    errorResponseHandler.handle(ex, response);
-  }
-
-  @ExceptionHandler(MethodArgumentNotValidException.class)
-  public void handleMethodArgumentNotValidException(
-      MethodArgumentNotValidException ex,HttpServletRequest request,  HttpServletResponse response) {
-    produceLog( request, ex);
-    errorResponseHandler.handle(
-        new YunTengException(
-            ErrorMessage.INVALID_PARAMETER.setMessage(
-                Objects.requireNonNull(ex.getBindingResult().getFieldError()).getDefaultMessage()),
-            HttpStatus.BAD_REQUEST),
-        response);
-  }
-
-  @ExceptionHandler(YtDataValidationException.class)
-  public void handleDataValidationException(
-      YtDataValidationException ex, HttpServletRequest request, HttpServletResponse response) {
-    produceLog( request, ex);
-    YunTengException YunTengException =
-        new YunTengException(
-            ErrorMessage.BAD_PARAMETER.setMessage(ex.getMessage()), HttpStatus.BAD_REQUEST);
-    errorResponseHandler.handle(YunTengException, response);
-  }
-
-  @ExceptionHandler(TooManyRequestException.class)
-  public void handleTooManyRequestException(HttpServletResponse response) {
-    errorResponseHandler.handle(
-        new YunTengException(ErrorMessage.TOO_MANY_REQUEST, HttpStatus.TOO_MANY_REQUESTS),
-        response);
-  }
-
-  @ExceptionHandler(AccessDeniedException.class)
-  public void handleAccessDeniedException(AccessDeniedException ex,HttpServletRequest request,  HttpServletResponse response) {
-    produceLog( request, ex);
-    errorResponseHandler.handle(
-        new YunTengException(
-            ErrorMessage.ACCESS_DENIED.setMessage(ex.getMessage()), HttpStatus.FORBIDDEN),
-        response);
-  }
-
-  @ExceptionHandler(NoneTenantAssetException.class)
-  public void handleNoneTenantAssetException(
-      NoneTenantAssetException ex, HttpServletRequest request, HttpServletResponse response) {
-    produceLog( request, ex);
-    errorResponseHandler.handle(
-        new YunTengException(
-            ErrorMessage.NONE_TENANT_ASSET.setMessage(ex.getMessage()), HttpStatus.NOT_FOUND),
-        response);
-  }
-
-  @ExceptionHandler(EntityCreationException.class)
-  public void handleEntityCreationException(HttpServletResponse response) {
-    errorResponseHandler.handle(
-        new YunTengException(
-            ErrorMessage.SEND_DESTINATION_NOT_FOUND, HttpStatus.BAD_REQUEST),
-        response);
-  }
-
-
-
-  protected SecurityUser getCurrentUser() throws ThingsboardException {
-    Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-    if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
-      return (SecurityUser) authentication.getPrincipal();
-    } else {
-      throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
-    }
-  }
-
-  /**
-   * 生产日志并缓存到队列中
-   *
-   * @param request  响应头
-   * @param e 异常信息
-   */
-  void produceLog(HttpServletRequest request, Exception e)  {
-
-    try {
-      SecurityUser currentUser =  getCurrentUser();
-
-      Asset entity = new Asset();
-      entity.setName(e.getMessage());
-
-      //请求相关信息
-      SysLogOperateDTO additionalInfo = new SysLogOperateDTO();
-      additionalInfo.setApi(request.getRequestURI());
-      additionalInfo.setClientIp(LogUtils.clientIP(request));
-      additionalInfo.setServerIp(LogUtils.serverIP());
-      additionalInfo.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
-      additionalInfo.setMethod(request.getMethod());
-
-
-      EntityId operateId = new EntityId() {
-        @Override
-        public UUID getId() {
-          return Uuids.timeBased();
-        }
-
-        @Override
-        public EntityType getEntityType() {
-          return EntityType.RUNNING_EXCEPTION;
-        }
-      };
-
-
-      auditLogService.logEntityAction(currentUser.getTenantId(),currentUser.getCustomerId(),currentUser.getId(), currentUser.getName(), operateId,entity, ActionType.LOG_EXCEPTION,e,additionalInfo);
-    } catch (ThingsboardException ex) {
-      log.error("异常日志记录异常【{}】",ex);
-    }
-
-  }
-}

@@ -40,6 +40,8 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
 import org.springframework.web.util.WebUtils;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.Result;
+import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
 import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
@@ -130,7 +132,10 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
                     handleAccessDeniedException(response);
                 } else if (exception instanceof AuthenticationException) {
                     handleAuthenticationException((AuthenticationException) exception, response);
-                } else {
+                }else if(exception instanceof ThingsKitException){
+                    handleThingsKitException((ThingsKitException)exception, response);
+                }
+                else {
                     response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
                     mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(exception.getMessage(),
                             ThingsboardErrorCode.GENERAL, HttpStatus.INTERNAL_SERVER_ERROR));
@@ -208,4 +213,10 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
         }
     }
 
+    private void handleThingsKitException(ThingsKitException exception ,HttpServletResponse response) throws IOException {
+        response.setStatus((exception).getHttpStatus().value());
+        mapper.writeValue(
+                response.getWriter(), Result.error(( exception).getError()));
+    }
+
 }

-package org.thingsboard.server.exception.yunteng;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.DisabledException;
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.access.AccessDeniedHandler;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.yunteng.core.Result;
-import org.thingsboard.server.common.data.yunteng.core.exception.YunTengException;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
-import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Component
-@Slf4j
-public class YunTengErrorResponseHandler implements AccessDeniedHandler {
-
-  private final ObjectMapper mapper;
-
-  @Autowired
-  public YunTengErrorResponseHandler(ObjectMapper mapper) {
-    this.mapper = mapper;
-  }
-
-  @Override
-  public void handle(
-      HttpServletRequest request,
-      HttpServletResponse response,
-      AccessDeniedException accessDeniedException)
-      throws IOException {
-    if (!response.isCommitted()) {
-      response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-      response.setStatus(HttpStatus.FORBIDDEN.value());
-      mapper.writeValue(response.getWriter(), Result.error(ErrorMessage.NO_PERMISSION));
-    }
-  }
-
-  public void handle(Exception exception, HttpServletResponse response) {
-    log.debug("Processing exception {}", exception.getMessage(), exception);
-    if (!response.isCommitted()) {
-      try {
-        response.setCharacterEncoding("utf-8");
-        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-
-        if (exception instanceof AccessDeniedException) {
-          response.setStatus(HttpStatus.FORBIDDEN.value());
-          mapper.writeValue(response.getWriter(), Result.error(ErrorMessage.ACCESS_DENIED));
-        } else if (exception instanceof AuthenticationException) {
-          handleAuthenticationException((AuthenticationException) exception, response);
-        } else if (exception instanceof YunTengException) {
-          response.setStatus(((YunTengException) exception).getHttpStatus().value());
-          mapper.writeValue(
-              response.getWriter(), Result.error(((YunTengException) exception).getError()));
-        } else {
-          response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-          mapper.writeValue(response.getWriter(), Result.error(exception.getMessage()));
-        }
-      } catch (IOException e) {
-        log.error("Can't handle exception", e);
-      }
-    }
-  }
-
-  private void handleAuthenticationException(
-      AuthenticationException authenticationException, HttpServletResponse response)
-      throws IOException {
-    response.setStatus(HttpStatus.UNAUTHORIZED.value());
-    if (authenticationException instanceof BadCredentialsException) {
-      mapper.writeValue(
-          response.getWriter(), Result.error(ErrorMessage.USERNAME_PASSWORD_INCORRECT));
-    } else if (authenticationException instanceof DisabledException) {
-      mapper.writeValue(response.getWriter(), Result.error(ErrorMessage.ACCOUNT_DISABLED));
-    } else if (authenticationException instanceof LockedException) {
-      mapper.writeValue(response.getWriter(), Result.error(ErrorMessage.ACCOUNT_DISABLED));
-    } else if (authenticationException instanceof JwtExpiredTokenException) {
-      mapper.writeValue(response.getWriter(), Result.error(ErrorMessage.TOKEN_EXPIRED));
-    } else if (authenticationException instanceof AuthMethodNotSupportedException) {
-      mapper.writeValue(
-          response.getWriter(), Result.error(ErrorMessage.AUTHENTICATION_METHOD_NOT_SUPPORTED));
-    } else {
-      mapper.writeValue(
-          response.getWriter(),
-          Result.error(HttpStatus.UNAUTHORIZED.value(), authenticationException.getMessage()));
-    }
-  }
-}

 package org.thingsboard.server.common.data.yunteng.core.exception;
 
-public class EntityCreationException extends RuntimeException {
+import org.springframework.http.HttpStatus;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+
+public class EntityCreationException extends ThingsKitException {
 
   private static final long serialVersionUID = 5255597864949518781L;
 
   public EntityCreationException(String message) {
-    super(message);
+    super(ErrorMessage.BAD_PARAMETER.setMessage(message), HttpStatus.BAD_REQUEST);
   }
 }

 package org.thingsboard.server.common.data.yunteng.core.exception;
 
-public class FileNotFoundException extends RuntimeException{
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+
+public class FileNotFoundException extends ThingsKitException {
     private static final long serialVersionUID = 3466865879043055822L;
 
-    public FileNotFoundException(String message) {
+    public FileNotFoundException(ErrorMessage message) {
     super(message);
     }
 }

 package org.thingsboard.server.common.data.yunteng.core.exception;
 
-public class FileStorageException extends  RuntimeException{
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+
+public class FileStorageException extends ThingsKitException {
     private static final long serialVersionUID = -8866081834891143120L;
 
-    public FileStorageException(String message) {
+    public FileStorageException(ErrorMessage message) {
         super(message);
     }
 }

 package org.thingsboard.server.common.data.yunteng.core.exception;
 
-public class NoneTenantAssetException extends RuntimeException {
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+
+public class NoneTenantAssetException extends ThingsKitException {
   private static final long serialVersionUID = 9135599998185288967L;
 
-  public NoneTenantAssetException(String message) {
+  public NoneTenantAssetException(ErrorMessage message) {
     super(message);
   }
 }

@@ -4,26 +4,27 @@ import lombok.Getter;
 import org.springframework.http.HttpStatus;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 
-public class YunTengException extends RuntimeException {
+public class ThingsKitException extends RuntimeException {
   private static final long serialVersionUID = 4036257507478854844L;
 
   @Getter private final HttpStatus httpStatus;
 
   @Getter private final ErrorMessage error;
 
-  public YunTengException(ErrorMessage errorMessage) {
+
+  public ThingsKitException(ErrorMessage errorMessage) {
     super(errorMessage.getMessage());
-    this.httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
+    this.httpStatus = HttpStatus.BAD_REQUEST;
     this.error = errorMessage;
   }
 
-  public YunTengException(ErrorMessage errorMessage, HttpStatus httpStatus) {
+  public ThingsKitException(ErrorMessage errorMessage, HttpStatus httpStatus) {
     super(errorMessage.getMessage());
     this.httpStatus = httpStatus;
     this.error = errorMessage;
   }
 
-  public YunTengException() {
+  public ThingsKitException() {
     super(ErrorMessage.INTERNAL_ERROR.getMessage());
     this.error = ErrorMessage.INTERNAL_ERROR;
     this.httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;

 package org.thingsboard.server.common.data.yunteng.core.exception;
 
 import lombok.Getter;
+import org.springframework.http.HttpStatus;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 
-public class YtDataValidationException extends RuntimeException {
+public class YtDataValidationException extends ThingsKitException {
   private static final long serialVersionUID = 3556952261254572635L;
 
   @Getter public boolean log = false;
 
   public YtDataValidationException(String message) {
-    super(message);
+    super(ErrorMessage.BAD_PARAMETER.setMessage(message));
   }
 
   public YtDataValidationException(String message, boolean log) {
-    super(message);
+    super(ErrorMessage.BAD_PARAMETER.setMessage(message));
     this.log = log;
   }
 }

@@ -52,6 +52,9 @@ public enum ErrorMessage {
   ORGANIZATION_EXISTED_SCENE_REACT(400033,"组织被场景联动使用中"),
   ORGANIZATION_EXISTED_ALARM_CONTACT(400034,"组织被告警联系人使用中"),
   EXIST_LEADER_MEMBER_RELATION(400035,"上下级之间有一种关系"),
+  FILE_NOT_FOUND(400036,"文件未找到"),
+  STORE_FILE_FAILED(400037,"文件存储失败"),
+  NOT_BELONG_CURRENT_TENANT(400038,"该用户不属于当前租户"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileNotFoundException;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 
 import javax.servlet.http.HttpServletRequest;
@@ -69,8 +70,7 @@ public class LocalFileStorageService implements FileStorageService {
       }
       // Check if the file's name contains invalid characters
       if (fileName.contains("..")) {
-        throw new FileStorageException(
-            "Sorry! Filename contains invalid path sequence " + fileName);
+        throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
       }
 
       // Copy file to the target location (Replacing existing file with the same name)
@@ -79,7 +79,7 @@ public class LocalFileStorageService implements FileStorageService {
 
       return fileName;
     } catch (IOException ex) {
-      throw new FileStorageException("Could not store file " + fileName + ". Please try again!");
+      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
     }
   }
 
@@ -90,10 +90,10 @@ public class LocalFileStorageService implements FileStorageService {
       if (resource.exists()) {
         return resource;
       } else {
-        throw new FileNotFoundException("File not found " + fileName);
+        throw new FileNotFoundException(ErrorMessage.FILE_NOT_FOUND);
       }
     } catch (MalformedURLException ex) {
-      throw new FileNotFoundException("File not found " + fileName);
+      throw new FileNotFoundException(ErrorMessage.FILE_NOT_FOUND);
     }
   }
 

@@ -15,6 +15,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.yunteng.core.exception.FileStorageException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.FileUploadResponse;
 
 import javax.servlet.http.HttpServletRequest;
@@ -59,7 +60,7 @@ public class MinioFileStorageService implements FileStorageService {
     }
     // Check if the file's name contains invalid characters
     if (fileName.contains("..")) {
-      throw new FileStorageException("Sorry! Filename contains invalid path sequence " + fileName);
+      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
     }
 
     // 储存
@@ -76,7 +77,7 @@ public class MinioFileStorageService implements FileStorageService {
       return fileName;
     } catch (Exception ex) {
       ex.printStackTrace();
-      throw new FileStorageException("Could not store file " + fileName + ". Please try again!");
+      throw new FileStorageException(ErrorMessage.STORE_FILE_FAILED);
     }
   }
 

@@ -282,7 +282,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   public UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId) {
     User user = baseMapper.selectById(userDTO.getId());
     if (!isPtSysadmin && !user.getTenantId().equals(tenantId)) {
-      throw new NoneTenantAssetException("this user not belong to current tenant");
+      throw new NoneTenantAssetException(ErrorMessage.NOT_BELONG_CURRENT_TENANT);
     }
     if (!user.getUsername().equals(userDTO.getUsername())) {
       throw new YtDataValidationException(ErrorMessage.USERNAME_IS_IMMUTABLE.getMessage());