diff --git a/epdc-cloud-admin/src/main/resources/application.yml b/epdc-cloud-admin/src/main/resources/application.yml index d0d7329..9b5a3bc 100644 --- a/epdc-cloud-admin/src/main/resources/application.yml +++ b/epdc-cloud-admin/src/main/resources/application.yml @@ -34,6 +34,12 @@ spring: sampler: # 将采样比例设置为 1.0,也就是全部都需要。默认是 0.1 probability: 1.0 + servlet: + multipart: + enabled: true + file-size-threshold: 0 + max-file-size: 20MB + max-request-size: 50MB management: endpoints: diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 60b469f..9596cd2 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01 +Subproject commit 9596cd2ada0a9e7de4bfdc86d85791d71040965b diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/common/base/BaseVimCurdServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/common/base/BaseVimCurdServiceImpl.java index 0e5fa77..dfdd099 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/common/base/BaseVimCurdServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/common/base/BaseVimCurdServiceImpl.java @@ -19,7 +19,7 @@ public abstract class BaseVimCurdServiceImpl, T, D> exte @Override - public IPage getPage(Map params) { + protected IPage getPage(Map params) { //分页参数 long curPage = 1; long limit = 10; diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java index e6264be..b6fb0ad 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.*; @@ -34,9 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; @@ -196,26 +193,6 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl