From 7bd3d774b5ea86f1d33462f7efb17808b5fe6dbb Mon Sep 17 00:00:00 2001
From: Zheng Jie <201507802@qq.com>
Date: Thu, 6 Jul 2023 22:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=83=E7=89=9B=E9=85=8D=E7=BD=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=B8=BB=E9=94=AE=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/eladmin/eladmin-common/pom.xml b/eladmin/eladmin-common/pom.xml
index 1a7ee93..b73d09a 100644
--- a/eladmin/eladmin-common/pom.xml
+++ b/eladmin/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/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
index 79e96a4..7d3f0f5 100644
--- a/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
+++ b/eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java
@@ -32,6 +32,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;
@@ -101,6 +102,10 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         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/eladmin-system/pom.xml b/eladmin/eladmin-system/pom.xml
index 218c62d..935fc8b 100644
--- a/eladmin/eladmin-system/pom.xml
+++ b/eladmin/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/eladmin-tools/pom.xml b/eladmin/eladmin-tools/pom.xml
index 0dd3de1..b1380f1 100644
--- a/eladmin/eladmin-tools/pom.xml
+++ b/eladmin/eladmin-tools/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <mail.version>1.4.7</mail.version>
         <qiniu.version>7.9.3</qiniu.version>
-        <alipay.version>4.22.57.ALL</alipay.version>
+        <alipay.version>4.38.4.ALL</alipay.version>
     </properties>
 
     <dependencies>
diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
index 73ee0d0..2601aab 100644
--- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
+++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java
@@ -78,7 +78,6 @@ public class QiniuController {
         return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
     }
 
-    @Log("上传文件")
     @ApiOperation("上传文件")
     @PostMapping
     public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){
diff --git a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuConfigServiceImpl.java b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuConfigServiceImpl.java
index fff7703..01c52b2 100644
--- a/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuConfigServiceImpl.java
+++ b/eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuConfigServiceImpl.java
@@ -61,6 +61,6 @@ public class QiNiuConfigServiceImpl extends ServiceImpl<QiniuConfigMapper, Qiniu
     public void updateType(String type) {
         QiniuConfig qiniuConfig = getById(1L);
         qiniuConfig.setType(type);
-        save(qiniuConfig);
+        saveOrUpdate(qiniuConfig);
     }
 }