升级依赖,修复七牛配置保存主键冲突问题
This commit is contained in:
parent
b5cdaee8f0
commit
7bd3d774b5
@ -9,7 +9,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<properties>
|
<properties>
|
||||||
<hutool.version>5.8.19</hutool.version>
|
<hutool.version>5.8.20</hutool.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<artifactId>eladmin-common</artifactId>
|
<artifactId>eladmin-common</artifactId>
|
||||||
|
@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
@ -101,6 +102,10 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
|
|||||||
List<Object> argList = new ArrayList<>();
|
List<Object> argList = new ArrayList<>();
|
||||||
Parameter[] parameters = method.getParameters();
|
Parameter[] parameters = method.getParameters();
|
||||||
for (int i = 0; i < parameters.length; i++) {
|
for (int i = 0; i < parameters.length; i++) {
|
||||||
|
// 过滤掉不能序列化的类型: MultiPartFile
|
||||||
|
if (args[i] instanceof MultipartFile) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
//将RequestBody注解修饰的参数作为请求参数
|
//将RequestBody注解修饰的参数作为请求参数
|
||||||
RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
|
RequestBody requestBody = parameters[i].getAnnotation(RequestBody.class);
|
||||||
if (requestBody != null) {
|
if (requestBody != null) {
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<name>核心模块</name>
|
<name>核心模块</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<jjwt.version>0.11.2</jjwt.version>
|
<jjwt.version>0.11.5</jjwt.version>
|
||||||
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
|
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
|
||||||
<jna.version>5.8.0</jna.version>
|
<jna.version>5.8.0</jna.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<mail.version>1.4.7</mail.version>
|
<mail.version>1.4.7</mail.version>
|
||||||
<qiniu.version>7.9.3</qiniu.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>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -78,7 +78,6 @@ public class QiniuController {
|
|||||||
return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
|
return new ResponseEntity<>(qiniuContentService.queryAll(criteria, page),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Log("上传文件")
|
|
||||||
@ApiOperation("上传文件")
|
@ApiOperation("上传文件")
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){
|
public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){
|
||||||
|
@ -61,6 +61,6 @@ public class QiNiuConfigServiceImpl extends ServiceImpl<QiniuConfigMapper, Qiniu
|
|||||||
public void updateType(String type) {
|
public void updateType(String type) {
|
||||||
QiniuConfig qiniuConfig = getById(1L);
|
QiniuConfig qiniuConfig = getById(1L);
|
||||||
qiniuConfig.setType(type);
|
qiniuConfig.setType(type);
|
||||||
save(qiniuConfig);
|
saveOrUpdate(qiniuConfig);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user