From 6a20ff70332c5d1fae215ff93a2d8837144fbd58 Mon Sep 17 00:00:00 2001
From: likun5 <lk123@126.com>
Date: Mon, 2 May 2022 21:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=89=93=E5=8D=B0=E5=86=85=E5=AE=B9=EF=BC=8C?=
 =?UTF-8?q?@RequestParam=E5=A4=9A=E5=8F=82=E6=95=B0=E6=97=B6=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9B=B4=E8=AF=A6=E7=BB=86=EF=BC=8C@RequestBody?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E6=97=B6=E6=89=93=E5=8D=B0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=8A=A5=E9=94=99=E5=8E=9F=E5=9B=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/exception/GlobalExceptionHandler.java | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index bf0a7ed8f..b2b486632 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -1,6 +1,7 @@
 package com.ruoyi.framework.web.exception;
 
 import javax.servlet.http.HttpServletRequest;
+import com.ruoyi.common.utils.ip.IpUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;
@@ -9,11 +10,13 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
+import java.util.stream.Collectors;
 
 /**
  * 全局异常处理器
@@ -66,7 +69,7 @@ public class GlobalExceptionHandler
     public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)
     {
         String requestURI = request.getRequestURI();
-        log.error("请求地址'{}',发生未知异常.", requestURI, e);
+        log.error("{} {} {}", IpUtils.getIpAddr(request), request.getMethod(), requestURI, e);
         return AjaxResult.error(e.getMessage());
     }
 
@@ -77,7 +80,19 @@ public class GlobalExceptionHandler
     public AjaxResult handleException(Exception e, HttpServletRequest request)
     {
         String requestURI = request.getRequestURI();
-        log.error("请求地址'{}',发生系统异常.", requestURI, e);
+        if(e instanceof MethodArgumentTypeMismatchException)
+        {
+            MethodArgumentTypeMismatchException e1 = (MethodArgumentTypeMismatchException) e;
+            String message = e.getMessage()
+                    +"\n Method: " +e1.getParameter().getMethod().toString()
+                    +"\n Parameter:["+ e1.getName() +"=" + e1.getValue() +"] ";
+            log.error("请求地址'{}',发生系统异常:{}.", requestURI, message);
+            return AjaxResult.error(message);
+        }
+        else
+        {
+            log.error("请求地址'{}',发生系统异常.", requestURI, e);
+        }
         return AjaxResult.error(e.getMessage());
     }
 
@@ -99,7 +114,7 @@ public class GlobalExceptionHandler
     public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e)
     {
         log.error(e.getMessage(), e);
-        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        String message = e.getBindingResult().getFieldErrors().stream().map(o-> (o.getField()+ " "+o.getDefaultMessage())).collect(Collectors.joining("; "));
         return AjaxResult.error(message);
     }