Skip to content

Commit 7bd3d77

Browse files
committed
升级依赖,修复七牛配置保存主键冲突问题
1 parent b5cdaee commit 7bd3d77

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

eladmin/eladmin-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<properties>
12-
<hutool.version>5.8.19</hutool.version>
12+
<hutool.version>5.8.20</hutool.version>
1313
</properties>
1414

1515
<artifactId>eladmin-common</artifactId>

eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.transaction.annotation.Transactional;
3333
import org.springframework.web.bind.annotation.RequestBody;
3434
import org.springframework.web.bind.annotation.RequestParam;
35+
import org.springframework.web.multipart.MultipartFile;
3536
import javax.servlet.http.HttpServletResponse;
3637
import java.io.IOException;
3738
import java.lang.reflect.Method;
@@ -101,6 +102,10 @@ private String getParameter(Method method, Object[] args) {
101102
List<Object> argList = new ArrayList<>();
102103
Parameter[] parameters = method.getParameters();
103104
for (int i = 0; i < parameters.length; i++) {
105+
// 过滤掉不能序列化的类型: MultiPartFile
106+
if (args[i] instanceof MultipartFile) {
107+
continue;
108+
}
104109
//将RequestBody注解修饰的参数作为请求参数
105110
RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
106111
if (requestBody != null) {

eladmin/eladmin-system/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<name>核心模块</name>
1414

1515
<properties>
16-
<jjwt.version>0.11.2</jjwt.version>
16+
<jjwt.version>0.11.5</jjwt.version>
1717
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
1818
<jna.version>5.8.0</jna.version>
1919
</properties>

eladmin/eladmin-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<mail.version>1.4.7</mail.version>
1717
<qiniu.version>7.9.3</qiniu.version>
18-
<alipay.version>4.22.57.ALL</alipay.version>
18+
<alipay.version>4.38.4.ALL</alipay.version>
1919
</properties>
2020

2121
<dependencies>

eladmin/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public ResponseEntity<PageResult<QiniuContent>> queryQiNiu(QiniuQueryCriteria cr
7878
return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
7979
}
8080

81-
@Log("上传文件")
8281
@ApiOperation("上传文件")
8382
@PostMapping
8483
public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuConfigServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ public void saveConfig(QiniuConfig qiniuConfig) {
6161
public void updateType(String type) {
6262
QiniuConfig qiniuConfig = getById(1L);
6363
qiniuConfig.setType(type);
64-
save(qiniuConfig);
64+
saveOrUpdate(qiniuConfig);
6565
}
6666
}

0 commit comments

Comments
 (0)