Pre Merge pull request !34 from WangXuewen/master

src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java

@@ -11,7 +11,6 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 /**
@@ -33,24 +32,13 @@ public class GlobalExceptionHandler {
         return WVPResult.fail(ErrorCode.ERROR500.getCode(), e.getMessage());
     }
 
-    /**
-     * 默认异常处理
-     * @param e 异常
-     * @return 统一返回结果
-     */
-    @ExceptionHandler(MaxUploadSizeExceededException.class)
-    @ResponseStatus(HttpStatus.FORBIDDEN)
-    public WVPResult<String> exceptionHandler(MaxUploadSizeExceededException e) {
-        return WVPResult.fail(ErrorCode.ERROR403.getCode(), "文件过大");
-    }
-
     /**
      * 默认异常处理
      * @param e 异常
      * @return 统一返回结果
      */
     @ExceptionHandler(NoResourceFoundException.class)
-    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
     public WVPResult<String> exceptionHandler(NoResourceFoundException e) {
         return WVPResult.fail(ErrorCode.ERROR404);
     }