修复Log注解GET请求记录不到参数问题

@@ -127,7 +127,7 @@ public class AjaxResult extends HashMap<String, Object>
     /**
     /**
      * 返回错误消息
      * 返回错误消息
      * 
      * 
-     * @return
+     * @return 错误消息
      */
      */
     public static AjaxResult error()
     public static AjaxResult error()
     {
     {
@@ -138,7 +138,7 @@ public class AjaxResult extends HashMap<String, Object>
      * 返回错误消息
      * 返回错误消息
      * 
      * 
      * @param msg 返回内容
      * @param msg 返回内容
-     * @return 警告消息
+     * @return 错误消息
      */
      */
     public static AjaxResult error(String msg)
     public static AjaxResult error(String msg)
     {
     {
@@ -150,7 +150,7 @@ public class AjaxResult extends HashMap<String, Object>
      * 
      * 
      * @param msg 返回内容
      * @param msg 返回内容
      * @param data 数据对象
      * @param data 数据对象
-     * @return 警告消息
+     * @return 错误消息
      */
      */
     public static AjaxResult error(String msg, Object data)
     public static AjaxResult error(String msg, Object data)
     {
     {
@@ -162,7 +162,7 @@ public class AjaxResult extends HashMap<String, Object>
      * 
      * 
      * @param code 状态码
      * @param code 状态码
      * @param msg 返回内容
      * @param msg 返回内容
-     * @return 警告消息
+     * @return 错误消息
      */
      */
     public static AjaxResult error(int code, String msg)
     public static AjaxResult error(int code, String msg)
     {
     {

@@ -4,6 +4,10 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 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.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
@@ -69,6 +73,34 @@ public class ServletUtils
     }
     }
 
 
     /**
     /**
+     * 获得所有请求参数
+     *
+     * @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
      * 获取request
      */
      */
     public static HttpServletRequest getRequest()
     public static HttpServletRequest getRequest()

@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -103,7 +102,6 @@ public class LogAspect
         catch (Exception exp)
         catch (Exception exp)
         {
         {
             // 记录本地异常日志
             // 记录本地异常日志
-            log.error("==前置通知异常==");
             log.error("异常信息:{}", exp.getMessage());
             log.error("异常信息:{}", exp.getMessage());
             exp.printStackTrace();
             exp.printStackTrace();
         }
         }
@@ -153,8 +151,8 @@ public class LogAspect
         }
         }
         else
         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));
         }
         }
     }
     }