|  | @@ -1,14 +1,5 @@
 | 
	
		
			
				|  |  |  package com.ruoyi.common.security.handler;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -import javax.servlet.http.HttpServletRequest;
 | 
	
		
			
				|  |  | -import org.slf4j.Logger;
 | 
	
		
			
				|  |  | -import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  | -import org.springframework.validation.BindException;
 | 
	
		
			
				|  |  | -import org.springframework.web.HttpRequestMethodNotSupportedException;
 | 
	
		
			
				|  |  | -import org.springframework.web.bind.MethodArgumentNotValidException;
 | 
	
		
			
				|  |  | -import org.springframework.web.bind.MissingPathVariableException;
 | 
	
		
			
				|  |  | -import org.springframework.web.bind.annotation.ExceptionHandler;
 | 
	
		
			
				|  |  | -import org.springframework.web.bind.annotation.RestControllerAdvice;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.constant.HttpStatus;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.exception.DemoModeException;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.exception.InnerAuthException;
 | 
	
	
		
			
				|  | @@ -17,24 +8,32 @@ import com.ruoyi.common.core.exception.auth.NotPermissionException;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.exception.auth.NotRoleException;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.utils.StringUtils;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.web.domain.AjaxResult;
 | 
	
		
			
				|  |  | +import org.slf4j.Logger;
 | 
	
		
			
				|  |  | +import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  | +import org.springframework.validation.BindException;
 | 
	
		
			
				|  |  | +import org.springframework.web.HttpRequestMethodNotSupportedException;
 | 
	
		
			
				|  |  | +import org.springframework.web.bind.MethodArgumentNotValidException;
 | 
	
		
			
				|  |  | +import org.springframework.web.bind.MissingPathVariableException;
 | 
	
		
			
				|  |  | +import org.springframework.web.bind.annotation.ExceptionHandler;
 | 
	
		
			
				|  |  | +import org.springframework.web.bind.annotation.RestControllerAdvice;
 | 
	
		
			
				|  |  |  import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import javax.servlet.http.HttpServletRequest;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  /**
 | 
	
		
			
				|  |  |   * 全局异常处理器
 | 
	
		
			
				|  |  | - * 
 | 
	
		
			
				|  |  | + *
 | 
	
		
			
				|  |  |   * @author ruoyi
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  @RestControllerAdvice
 | 
	
		
			
				|  |  | -public class GlobalExceptionHandler
 | 
	
		
			
				|  |  | -{
 | 
	
		
			
				|  |  | +public class GlobalExceptionHandler {
 | 
	
		
			
				|  |  |      private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 权限码异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(NotPermissionException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
 | 
	
		
			
				|  |  |          String requestURI = request.getRequestURI();
 | 
	
		
			
				|  |  |          log.error("请求地址'{}',权限码校验失败'{}'", requestURI, e.getMessage());
 | 
	
		
			
				|  |  |          return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限,请联系管理员授权");
 | 
	
	
		
			
				|  | @@ -44,8 +43,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 角色权限异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(NotRoleException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleNotRoleException(NotRoleException e, HttpServletRequest request) {
 | 
	
		
			
				|  |  |          String requestURI = request.getRequestURI();
 | 
	
		
			
				|  |  |          log.error("请求地址'{}',角色权限校验失败'{}'", requestURI, e.getMessage());
 | 
	
		
			
				|  |  |          return AjaxResult.error(HttpStatus.FORBIDDEN, "没有访问权限,请联系管理员授权");
 | 
	
	
		
			
				|  | @@ -56,8 +54,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
 | 
	
		
			
				|  |  |      public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
 | 
	
		
			
				|  |  | -            HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +                                                          HttpServletRequest request) {
 | 
	
		
			
				|  |  |          String requestURI = request.getRequestURI();
 | 
	
		
			
				|  |  |          log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
 | 
	
		
			
				|  |  |          return AjaxResult.error(e.getMessage());
 | 
	
	
		
			
				|  | @@ -67,8 +64,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 业务异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(ServiceException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) {
 | 
	
		
			
				|  |  |          log.error(e.getMessage(), e);
 | 
	
		
			
				|  |  |          Integer code = e.getCode();
 | 
	
		
			
				|  |  |          return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
 | 
	
	
		
			
				|  | @@ -98,8 +94,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 拦截未知的运行时异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(RuntimeException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
 | 
	
		
			
				|  |  |          String requestURI = request.getRequestURI();
 | 
	
		
			
				|  |  |          log.error("请求地址'{}',发生未知异常.", requestURI, e);
 | 
	
		
			
				|  |  |          return AjaxResult.error(e.getMessage());
 | 
	
	
		
			
				|  | @@ -109,8 +104,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 系统异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(Exception.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleException(Exception e, HttpServletRequest request)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleException(Exception e, HttpServletRequest request) {
 | 
	
		
			
				|  |  |          String requestURI = request.getRequestURI();
 | 
	
		
			
				|  |  |          log.error("请求地址'{}',发生系统异常.", requestURI, e);
 | 
	
		
			
				|  |  |          return AjaxResult.error(e.getMessage());
 | 
	
	
		
			
				|  | @@ -120,8 +114,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 自定义验证异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(BindException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleBindException(BindException e)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleBindException(BindException e) {
 | 
	
		
			
				|  |  |          log.error(e.getMessage(), e);
 | 
	
		
			
				|  |  |          String message = e.getAllErrors().get(0).getDefaultMessage();
 | 
	
		
			
				|  |  |          return AjaxResult.error(message);
 | 
	
	
		
			
				|  | @@ -131,8 +124,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 自定义验证异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(MethodArgumentNotValidException.class)
 | 
	
		
			
				|  |  | -    public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
 | 
	
		
			
				|  |  |          log.error(e.getMessage(), e);
 | 
	
		
			
				|  |  |          String message = e.getBindingResult().getFieldError().getDefaultMessage();
 | 
	
		
			
				|  |  |          return AjaxResult.error(message);
 | 
	
	
		
			
				|  | @@ -142,8 +134,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 内部认证异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(InnerAuthException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleInnerAuthException(InnerAuthException e)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleInnerAuthException(InnerAuthException e) {
 | 
	
		
			
				|  |  |          return AjaxResult.error(e.getMessage());
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -151,8 +142,7 @@ public class GlobalExceptionHandler
 | 
	
		
			
				|  |  |       * 演示模式异常
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @ExceptionHandler(DemoModeException.class)
 | 
	
		
			
				|  |  | -    public AjaxResult handleDemoModeException(DemoModeException e)
 | 
	
		
			
				|  |  | -    {
 | 
	
		
			
				|  |  | +    public AjaxResult handleDemoModeException(DemoModeException e) {
 | 
	
		
			
				|  |  |          return AjaxResult.error("演示模式,不允许操作");
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  }
 |