From b58ee9dbc63140b9aa8ba50d5f34b110e720ae94 Mon Sep 17 00:00:00 2001
From: wsw <wsw@winning.com.cn>
Date: Wed, 26 Jul 2023 18:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84--=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyz/playedu/api/aspectj/AdminLogAspect.java |  6 ++++++
 .../java/xyz/playedu/api/util/StringUtil.java   | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java b/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java
index 08f24d6..b4a6e5f 100644
--- a/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java
+++ b/src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java
@@ -102,6 +102,12 @@ public class AdminLogAspect {
             if (StringUtil.isNotEmpty(parameterMap)) {
                 String params = JSONUtil.toJsonStr(parameterMap);
                 adminLog.setParam(StringUtils.substring(params, 0, 2000));
+            }else {
+                Object[] args = joinPoint.getArgs();
+                if (StringUtil.isNotNull(args)) {
+                    String params = StringUtil.arrayToString(args);
+                    adminLog.setParam(StringUtils.substring(params, 0, 2000));
+                }
             }
             adminLog.setResult(JSONUtil.toJsonStr(jsonResult));
             adminLog.setIp(IpUtil.getIpAddress());
diff --git a/src/main/java/xyz/playedu/api/util/StringUtil.java b/src/main/java/xyz/playedu/api/util/StringUtil.java
index 7afa0e5..378ed04 100644
--- a/src/main/java/xyz/playedu/api/util/StringUtil.java
+++ b/src/main/java/xyz/playedu/api/util/StringUtil.java
@@ -15,6 +15,7 @@
  */
 package xyz.playedu.api.util;
 
+import cn.hutool.json.JSONUtil;
 import org.springframework.util.AntPathMatcher;
 
 import java.util.*;
@@ -527,4 +528,20 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils {
         sbuf.append(strPattern, handledPosition, strPattern.length());
         return sbuf.toString();
     }
+
+    public static String arrayToString(Object[] array) {
+        StringBuilder result = new StringBuilder();
+        if (array != null && array.length > 0) {
+            for (Object o : array) {
+                if (StringUtil.isNotNull(o)) {
+                    try {
+                        Object jsonObj = JSONUtil.toJsonStr(o);
+                        result.append(jsonObj.toString());
+                    }
+                    catch (Exception e) {}
+                }
+            }
+        }
+        return result.toString();
+    }
 }