Skip to content

Commit 0f3578c

Browse files
committed
升级依赖,统一使用fastjson进行Json操作
1 parent 8cb9650 commit 0f3578c

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

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-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.springframework.transaction.annotation.Transactional;
3737
import org.springframework.web.bind.annotation.RequestBody;
3838
import org.springframework.web.bind.annotation.RequestParam;
39+
import org.springframework.web.multipart.MultipartFile;
3940
import javax.servlet.http.HttpServletResponse;
4041
import java.io.IOException;
4142
import java.lang.reflect.Method;
@@ -112,6 +113,10 @@ private String getParameter(Method method, Object[] args) {
112113
List<Object> argList = new ArrayList<>();
113114
Parameter[] parameters = method.getParameters();
114115
for (int i = 0; i < parameters.length; i++) {
116+
// 过滤掉不能序列化的类型: MultiPartFile
117+
if (args[i] instanceof MultipartFile) {
118+
continue;
119+
}
115120
//将RequestBody注解修饰的参数作为请求参数
116121
RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
117122
if (requestBody != null) {

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-tools/src/main/java/me/zhengjie/rest/QiniuController.java

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

79-
@Log("上传文件")
8079
@ApiOperation("上传文件")
8180
@PostMapping
8281
public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){

0 commit comments

Comments
 (0)