diff --git a/src/main/java/com/dd/admin/business/api/ApiController.java b/src/main/java/com/dd/admin/business/api/ApiController.java index 15be39f..533c618 100644 --- a/src/main/java/com/dd/admin/business/api/ApiController.java +++ b/src/main/java/com/dd/admin/business/api/ApiController.java @@ -44,11 +44,6 @@ public class ApiController { @GetMapping("/api/notes") @OperLog(operModule = "获取所有笔记",operType = OperType.QUERY,operDesc = "获取所有笔记") public ResultBean> page(NoteDto noteDto) { - try { - Thread.sleep(300); - } catch (InterruptedException e) { - e.printStackTrace(); - } IPage pageInfo = noteService.selectNotePage(noteDto); return ResultBean.success(pageInfo); } diff --git a/src/main/java/com/dd/admin/common/config/CorsConfig.java b/src/main/java/com/dd/admin/common/config/CorsConfig.java index d0e261c..1f1387c 100644 --- a/src/main/java/com/dd/admin/common/config/CorsConfig.java +++ b/src/main/java/com/dd/admin/common/config/CorsConfig.java @@ -60,6 +60,7 @@ public class CorsConfig implements WebMvcConfigurer { + // @Bean // public MappingJackson2HttpMessageConverter getMappingJackson2HttpMessageConverter() { // MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); diff --git a/src/main/java/com/dd/admin/common/config/FileUploadConfig.java b/src/main/java/com/dd/admin/common/config/FileUploadConfig.java new file mode 100644 index 0000000..4918609 --- /dev/null +++ b/src/main/java/com/dd/admin/common/config/FileUploadConfig.java @@ -0,0 +1,21 @@ +package com.dd.admin.common.config; + +import org.springframework.boot.web.servlet.MultipartConfigFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.unit.DataSize; + +import javax.servlet.MultipartConfigElement; + +@Configuration +public class FileUploadConfig { + @Bean + public MultipartConfigElement multipartConfigElement() { + MultipartConfigFactory factory = new MultipartConfigFactory(); + // 单个数据大小 + factory.setMaxFileSize(DataSize.parse("20480KB")); // KB,MB 20480KB=20M + // 总上传数据大小 + factory.setMaxRequestSize(DataSize.parse("102400KB")); //102400KB=100M + return factory.createMultipartConfig(); + } +} diff --git a/src/main/resources/application-online.yml b/src/main/resources/application-online.yml index a13c316..e07ffa4 100644 --- a/src/main/resources/application-online.yml +++ b/src/main/resources/application-online.yml @@ -2,8 +2,8 @@ spring: servlet: multipart: enabled: true #默认支持文件上传 - max-file-size: 50MB #不做限制 - max-request-size: 50MB #不做限制 + max-file-size: -1 #不做限制 + max-request-size: 1 #不做限制 datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -54,3 +54,8 @@ mybatis-plus: server: port: 8080 +# tomcat: +# max-swallow-size: -1 +# max-http-form-post-size: 52428800 +# servlet: +# max-http-post-size: 52428800