diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml index 94dba82..d235aa6 100644 --- a/api/src/main/resources/logback.xml +++ b/api/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/netty-pad/src/main/resources/logback.xml b/netty-pad/src/main/resources/logback.xml index 5db9344..6e2cbdd 100644 --- a/netty-pad/src/main/resources/logback.xml +++ b/netty-pad/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/oms/oms-h5/src/views/member/health/add.vue b/oms/oms-h5/src/views/member/health/add.vue index db9b274..2f685d9 100644 --- a/oms/oms-h5/src/views/member/health/add.vue +++ b/oms/oms-h5/src/views/member/health/add.vue @@ -106,11 +106,11 @@ export default { alert('已存在健康报告!') }, beforeAvatarUpload(file) { - // const isLt2M = file.size / 1024 / 1024 < 2 - // if (!isLt2M) { - // this.$message.error('上传头像图片大小不能超过 2MB!') - // } - // return isLt2M + const isLt40M = file.size / 1024 / 1024 < 40 + if (!isLt40M) { + this.$message.error('上传报告不能超过40MB!') + } + return isLt40M }, // 处理头像上传成功 handleAvatarSuccess(res) { diff --git a/oms/src/main/java/com/sv/oms/controller/UploadController.java b/oms/src/main/java/com/sv/oms/controller/UploadController.java index 4da018d..87edc2a 100644 --- a/oms/src/main/java/com/sv/oms/controller/UploadController.java +++ b/oms/src/main/java/com/sv/oms/controller/UploadController.java @@ -55,9 +55,7 @@ public class UploadController extends OmsController { * @return */ @RequestMapping(value = "/uploadFile") - public ResponseDTO uploadFile(HttpServletRequest request) throws IOException { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - MultipartFile multipartFile = multipartRequest.getFile("file"); + public ResponseDTO uploadFile(@RequestParam("file") MultipartFile multipartFile) throws IOException { String healthUrl = ossClientUtil.uploadHealth(multipartFile); return ResponseDTO.ok().addAttribute("docPath",healthUrl); } diff --git a/oms/src/main/resources/logback.xml b/oms/src/main/resources/logback.xml index bb526b5..12bfc1a 100644 --- a/oms/src/main/resources/logback.xml +++ b/oms/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - +