From c4dae1ea1aba157b3e7c9602820af9a7e6b9dd14 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 10 May 2023 09:31:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6=E6=B5=81=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/service/impl/DevFileServiceImpl.java | 8 ++++++- .../service/impl/GenBasicServiceImpl.java | 24 +++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java index cf949ba4..e4feaa5b 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java @@ -99,7 +99,13 @@ public class DevFileServiceImpl extends ServiceImpl impl @Override public void download(DevFileIdParam devFileIdParam, HttpServletResponse response) throws IOException { - DevFile devFile = this.queryEntity(devFileIdParam.getId()); + DevFile devFile; + try { + devFile = this.queryEntity(devFileIdParam.getId()); + } catch (Exception e) { + CommonResponseUtil.renderError(response, e.getMessage()); + return; + } if(!devFile.getEngine().equals(DevFileEngineTypeEnum.LOCAL.getValue())) { CommonResponseUtil.renderError(response, "非本地文件不支持此方式下载，id值为：" + devFile.getId()); return; diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java index 6a4bb502..fb306374 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java +++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java @@ -344,17 +344,21 @@ public class GenBasicServiceImpl extends ServiceImpl i @Transactional(rollbackFor = Exception.class) @Override public void execGenZip(GenBasicIdParam genBasicIdParam, HttpServletResponse response) throws IOException { - File tempFolder = this.genTempFolder(genBasicIdParam, response, true); - if(tempFolder == null) { - CommonResponseUtil.renderError(response, "代码生成基础不存在，id值为：" + genBasicIdParam.getId()); - return; + try { + File tempFolder = this.genTempFolder(genBasicIdParam, response, true); + if(tempFolder == null) { + CommonResponseUtil.renderError(response, "代码生成基础不存在，id值为：" + genBasicIdParam.getId()); + return; + } + // 压缩 + File zip = ZipUtil.zip(tempFolder); + // 压缩完毕删除临时目录 + FileUtil.del(tempFolder); + // 下载 + CommonDownloadUtil.download(zip, response); + } catch (Exception e) { + CommonResponseUtil.renderError(response, e.getMessage()); } - // 压缩 - File zip = ZipUtil.zip(tempFolder); - // 压缩完毕删除临时目录 - FileUtil.del(tempFolder); - // 下载 - CommonDownloadUtil.download(zip, response); } @Transactional(rollbackFor = Exception.class)