From 09837906ed542bb6f9cb636fe6421632bfd5edc7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 十一月 2022 10:39:05 +0800
Subject: [PATCH] 修复Log注解GET请求记录不到参数问题

---
 src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java |    8 ++++----
 src/main/java/com/ruoyi/common/utils/ServletUtils.java       |   32 ++++++++++++++++++++++++++++++++
 src/main/java/com/ruoyi/framework/aspectj/LogAspect.java     |    5 ++---
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
index 1cbf72f..292b8da 100644
--- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -4,6 +4,10 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -69,6 +73,34 @@
     }
 
     /**
+     * 鑾峰緱鎵�鏈夎姹傚弬鏁�
+     *
+     * @param request 璇锋眰瀵硅薄{@link ServletRequest}
+     * @return Map
+     */
+    public static Map<String, String[]> getParams(ServletRequest request)
+    {
+        final Map<String, String[]> map = request.getParameterMap();
+        return Collections.unmodifiableMap(map);
+    }
+
+    /**
+     * 鑾峰緱鎵�鏈夎姹傚弬鏁�
+     *
+     * @param request 璇锋眰瀵硅薄{@link ServletRequest}
+     * @return Map
+     */
+    public static Map<String, String> getParamMap(ServletRequest request)
+    {
+        Map<String, String> params = new HashMap<>();
+        for (Map.Entry<String, String[]> entry : getParams(request).entrySet())
+        {
+            params.put(entry.getKey(), StringUtils.join(entry.getValue(), ","));
+        }
+        return params;
+    }
+
+    /**
      * 鑾峰彇request
      */
     public static HttpServletRequest getRequest()
diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index f28997e..c4d6eb8 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -13,7 +13,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.enums.HttpMethod;
 import com.ruoyi.common.filter.PropertyPreExcludeFilter;
@@ -152,8 +151,8 @@
         }
         else
         {
-            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
+            Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter()), 0, 2000));
         }
     }
 
diff --git a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java b/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
index e223663..c9f14ea 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
@@ -128,7 +128,7 @@
     /**
      * 杩斿洖閿欒娑堟伅
      * 
-     * @return
+     * @return 閿欒娑堟伅
      */
     public static AjaxResult error()
     {
@@ -139,7 +139,7 @@
      * 杩斿洖閿欒娑堟伅
      * 
      * @param msg 杩斿洖鍐呭
-     * @return 璀﹀憡娑堟伅
+     * @return 閿欒娑堟伅
      */
     public static AjaxResult error(String msg)
     {
@@ -151,7 +151,7 @@
      * 
      * @param msg 杩斿洖鍐呭
      * @param data 鏁版嵁瀵硅薄
-     * @return 璀﹀憡娑堟伅
+     * @return 閿欒娑堟伅
      */
     public static AjaxResult error(String msg, Object data)
     {
@@ -163,7 +163,7 @@
      * 
      * @param code 鐘舵�佺爜
      * @param msg 杩斿洖鍐呭
-     * @return 璀﹀憡娑堟伅
+     * @return 閿欒娑堟伅
      */
     public static AjaxResult error(int code, String msg)
     {

--
Gitblit v1.9.3