diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml
index a6c7c0588..0014f6ca3 100644
--- a/mallinkBApi/pom.xml
+++ b/mallinkBApi/pom.xml
@@ -22,6 +22,11 @@
mybatis-multi-tenancy
1.0
+
+ commons-fileupload
+ commons-fileupload
+ 1.3.3
+
diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java
index 8ab96db8a..50460e994 100644
--- a/mallinkBApi/src/main/java/com/iformall/BApplication.java
+++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java
@@ -5,6 +5,7 @@ import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
import org.springframework.context.annotation.Bean;
import tk.mybatis.spring.annotation.MapperScan;
@@ -12,7 +13,7 @@ import tk.mybatis.spring.annotation.MapperScan;
* @author chenkx
* @date 2017-12-26
*/
-@SpringBootApplication
+@SpringBootApplication(exclude = {MultipartAutoConfiguration.class})
@MapperScan(basePackages = {"com.iformall.mapper"})
@EnableEncryptableProperties
@EnableRocketMQ
diff --git a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java
index 819f804b8..abe073f80 100644
--- a/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java
+++ b/mallinkBApi/src/main/java/com/iformall/config/WebMvcConfig.java
@@ -17,6 +17,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.servlet.config.annotation.*;
import java.math.BigDecimal;
@@ -111,4 +113,14 @@ public class WebMvcConfig implements WebMvcConfigurer {
registrationBean.setName("koalaSignFilter");
return registrationBean;
}
+
+ @Bean(name = "multipartResolver")
+ public MultipartResolver multipartResolver() {
+ CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+ resolver.setDefaultEncoding("UTF-8");
+ resolver.setResolveLazily(true); // resolveLazily属性启用是为了推迟文件解析,以在在UploadAction中捕获文件大小异常
+ // resolver.setMaxInMemorySize(40960);
+ resolver.setMaxUploadSize(2*1024*1024);// 上传文件大小 5M 5*1024*1024
+ return resolver;
+ }
}
\ No newline at end of file
diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java
index bc58b1d06..075586365 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java
+++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java
@@ -31,7 +31,7 @@ import java.net.URL;
import java.util.*;
@RestController
-@RequestMapping(value = "upload")
+@RequestMapping(value = "/api/upload")
@Api(description = "文件上传接口")
public class UploadController extends BaseController {
@@ -45,7 +45,7 @@ public class UploadController extends BaseController {
private ResultData awsUpload(MultipartFile multiReq, ObjectMetadata metadata, String fileName) {
ResultData data = new ResultData();
try {
- if(s3 == null) {
+ if (s3 == null) {
s3 = AmazonS3ClientBuilder.standard()
.withRegion(awsProperty.getClientRegion())
.withCredentials(new AWSCredentialsProvider() {
@@ -143,10 +143,10 @@ public class UploadController extends BaseController {
public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) {
logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload");
- if(files.length > 0){
+ if (files.length > 0) {
ResultData data = new ResultData();
- List