From 552ab024008c620ad6398e12da2d28b31e6fe0fa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 10 Aug 2022 17:35:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 3 ++- jero-web/src/views/parameter/parameterexport/index.vue | 2 +- .../projectManagement/components/ParameterCollectionEchart.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 8886cdf38..b714d81cd 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -84,8 +84,9 @@ - + {{ d.label }} From 3a3d846e939ece4f082ed0c3f5aa7a14533f3e22 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 17:41:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E8=BF=87100m=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/JeroBootExceptionHandler.java | 10 ++-- .../oss/service/impl/OSSFileServiceImpl.java | 54 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java index 9408df97a..42b84225e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java @@ -85,11 +85,11 @@ public class JeroBootExceptionHandler { /** * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException */ - @ExceptionHandler(MaxUploadSizeExceededException.class) - public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { - log.error(e.getMessage(), e); - return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); - } +// @ExceptionHandler(MaxUploadSizeExceededException.class) +// public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { +// log.error(e.getMessage(), e); +// return Result.error("文件大小超出100MB限制, 请压缩或降低文件质量! "); +// } @ExceptionHandler(DataIntegrityViolationException.class) public Result handleDataIntegrityViolationException(DataIntegrityViolationException e) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index df73c3ae6..a14d95991 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -72,15 +72,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocal(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); try { @@ -191,15 +191,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalOfCos(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; @@ -296,15 +296,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl public OSSFile uploadLocalForSplit(MultipartFile mf, String bizPath, String state, String cut) { //处理文件大小,大于100M抛出异常 - long fileSize = mf.getSize() / 1024 / 1024; - String originalFilename = mf.getOriginalFilename(); - if (fileSize >= 100) { - if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); - } else { - throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); - } - } +// long fileSize = mf.getSize() / 1024 / 1024; +// String originalFilename = mf.getOriginalFilename(); +// if (fileSize >= 100) { +// if (cut.equals(CutEnum.CN.getValue())) { +// throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); +// } else { +// throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); +// } +// } OSSFile oSSFile = new OSSFile(); String ctxPath = uploadCospath; From c0c5b905f23e9d82f2d8c6a88cec97c1485ba709 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 17:42:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=B3=A8=E5=85=A5%=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/extRepo/controller/ExtRepoDataController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 8b3d7e4b0..9349c0bb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -74,11 +74,13 @@ public class ExtRepoDataController extends JeroController Date: Wed, 10 Aug 2022 17:53:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/extRepo/controller/ExtRepoDataController.java | 2 +- .../modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 9349c0bb8..8d06ee3b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -187,7 +187,7 @@ public class ExtRepoDataController extends JeroController