From c6dc41f16fabb1165bb83751f06d0e658089c25f Mon Sep 17 00:00:00 2001
From: xsx <xsx344646090@vip.qq.com>
Date: Sat, 18 Mar 2023 20:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/wiki/xsx/core/log/LogProcessor.java  |  4 ++--
 .../wiki/xsx/core/support/LogHandler.java     | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/wiki/xsx/core/log/LogProcessor.java b/src/main/java/wiki/xsx/core/log/LogProcessor.java
index d94c314..6c0dd9b 100644
--- a/src/main/java/wiki/xsx/core/log/LogProcessor.java
+++ b/src/main/java/wiki/xsx/core/log/LogProcessor.java
@@ -268,14 +268,14 @@ public class LogProcessor {
                 LogContext.getContext().getBean(callback).callback(
                         annotation,
                         methodInfo,
-                        LogHandler.getParamMap(methodInfo.getParamNames(), joinPoint.getArgs()),
+                        LogHandler.getNotParseParamMap(methodInfo.getParamNames(), joinPoint.getArgs(), null),
                         result
                 );
             }else {
                 LogContext.getContext().getBean(this.slf4jProperties.getCallback(annotation)).callback(
                         annotation,
                         methodInfo,
-                        LogHandler.getParamMap(methodInfo.getParamNames(), joinPoint.getArgs()),
+                        LogHandler.getNotParseParamMap(methodInfo.getParamNames(), joinPoint.getArgs(), null),
                         result
                 );
             }
diff --git a/src/main/java/wiki/xsx/core/support/LogHandler.java b/src/main/java/wiki/xsx/core/support/LogHandler.java
index 688fd7a..4b282ed 100644
--- a/src/main/java/wiki/xsx/core/support/LogHandler.java
+++ b/src/main/java/wiki/xsx/core/support/LogHandler.java
@@ -29,12 +29,12 @@ public class LogHandler {
             String[] filterParamNames
     ) {
         return createInfoBuilder(busName, methodInfo).append("接收参数：【").append(
-                    getParamMap(
+                getParamMap(
                         methodInfo.getParamNames(),
                         params,
                         filterParamNames
-                    )
-                ).append("】").toString();
+                )
+        ).append("】").toString();
     }
 
     /**
@@ -65,12 +65,12 @@ public class LogHandler {
             Object result
     ) {
         return createInfoBuilder(busName, methodInfo).append("接收参数：【").append(
-                getParamMap(
-                        methodInfo.getParamNames(),
-                        params,
-                        filterParamNames
-                )
-        ).append("】，").append("返回结果：【")
+                        getParamMap(
+                                methodInfo.getParamNames(),
+                                params,
+                                filterParamNames
+                        )
+                ).append("】，").append("返回结果：【")
                 .append(
                         result instanceof Throwable?
                                 "执行异常("+((Throwable) result).getLocalizedMessage()+")":
@@ -143,7 +143,7 @@ public class LogHandler {
             Map<String, Object> newMap = new LinkedHashMap<>(paramMap.size());
             Set<Map.Entry<String, Object>> entries = paramMap.entrySet();
             for (Map.Entry<String, Object> entry : entries) {
-                newMap.put(entry.getKey(), parseParam(entry.getKey()));
+                newMap.put(entry.getKey(), parseParam(entry.getValue()));
             }
             paramMap = newMap;
         }
-- 
Gitee