From 0f3578c9bec7916ef171a58536c604f3b6a8f801 Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Thu, 6 Jul 2023 22:19:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8fastjson=E8=BF=9B=E8=A1=8CJ?=
 =?UTF-8?q?son=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eladmin-common/pom.xml                                       | 2 +-
 .../java/me/zhengjie/service/impl/SysLogServiceImpl.java     | 5 +++++
 eladmin-system/pom.xml                                       | 2 +-
 .../src/main/java/me/zhengjie/rest/QiniuController.java      | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
index 180764d6..23d1024e 100644
--- a/eladmin-common/pom.xml
+++ b/eladmin-common/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <hutool.version>5.8.19</hutool.version>
+        <hutool.version>5.8.20</hutool.version>
     </properties>
 
     <artifactId>eladmin-common</artifactId>
diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java b/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
index ae92e82b..95ea4a09 100644
--- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
+++ b/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -112,6 +113,10 @@ public class SysLogServiceImpl implements SysLogService {
         List<Object> argList = new ArrayList<>();
         Parameter[] parameters = method.getParameters();
         for (int i = 0; i < parameters.length; i++) {
+            // 过滤掉不能序列化的类型: MultiPartFile
+            if (args[i] instanceof MultipartFile) {
+                continue;
+            }
             //将RequestBody注解修饰的参数作为请求参数
             RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
             if (requestBody != null) {
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 8f9b969c..9119bc12 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -13,7 +13,7 @@
     <name>核心模块</name>
 
     <properties>
-        <jjwt.version>0.11.2</jjwt.version>
+        <jjwt.version>0.11.5</jjwt.version>
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.8.0</jna.version>
     </properties>
diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
index f414579c..2988c726 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
@@ -76,7 +76,6 @@ public class QiniuController {
         return new ResponseEntity<>(qiNiuService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
-    @Log("上传文件")
     @ApiOperation("上传文件")
     @PostMapping
     public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){