From d751dca20042118cdf8303fe4dfbc47658bd0c13 Mon Sep 17 00:00:00 2001 From: zhouyl <583641232@qq.com> Date: Thu, 13 Jun 2024 14:20:47 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=AF=B9=E4=BA=8E=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84API=E6=8E=A5=E5=8F=A3=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=EF=BC=88=E5=A6=82REST=E3=80=81SOAP=E3=80=81XML-RPC=E7=AD=89?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=B7=A5=E5=85=B7=E5=8F=AF?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=AF=B9=E5=BA=94=E7=9A=84=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B7=A5=E5=85=B7=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tp-admin/src/main/resources/application.yml | 2 +- .../controller/FuncCarApiController.java | 35 ++++++------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/tp-admin/src/main/resources/application.yml b/tp-admin/src/main/resources/application.yml index 6135913..68a1678 100644 --- a/tp-admin/src/main/resources/application.yml +++ b/tp-admin/src/main/resources/application.yml @@ -6,7 +6,7 @@ testplatform: version: ${test-platform-service.version} # 版权年份 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: /app/testP/uploadPath + profile: /app/testp/uploadPath copyrightYear: 2024 # 缓存懒加载 cacheLazy: false diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java b/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java index 4ce43b7..fdfb2f2 100644 --- a/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java +++ b/tp-functional/src/main/java/com/inscloudtech/functional/controller/FuncCarApiController.java @@ -1,7 +1,6 @@ package com.inscloudtech.functional.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.inscloudtech.common.annotation.Log; import com.inscloudtech.common.annotation.RepeatSubmit; import com.inscloudtech.common.config.ProjectConfig; import com.inscloudtech.common.core.controller.BaseController; @@ -9,7 +8,6 @@ import com.inscloudtech.common.core.domain.PageQuery; import com.inscloudtech.common.core.domain.R; import com.inscloudtech.common.core.page.TableDataInfo; import com.inscloudtech.common.core.validate.AddGroup; -import com.inscloudtech.common.enums.BusinessType; import com.inscloudtech.common.utils.StringUtils; import com.inscloudtech.common.utils.file.FileUtils; import com.inscloudtech.functional.domain.FuncCarApi; @@ -39,6 +37,8 @@ public class FuncCarApiController extends BaseController { private final ProjectConfig projectConfig; + private final static String JMETER_FILE_NAME = "apache-jmeter.zip"; + /** * 查询API接口在不同操作系统、不同浏览器、不同设备以及不同网络环境下的兼容性测试结果列表 */ @@ -64,23 +64,7 @@ public class FuncCarApiController extends BaseController { */ @GetMapping("/jmDownload") public void jmDownload(HttpServletResponse response, HttpServletRequest request) { - String fileName = "apache-jmeter-5.6.3.zip"; - try { - if (!FileUtils.checkAllowDownload(fileName)) { - throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); - } - String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = projectConfig.getDownloadPath() + fileName; - - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - FileUtils.setAttachmentResponseHeader(response, realFileName); - FileUtils.writeBytes(filePath, response.getOutputStream()); -// if (delete) { -// FileUtils.deleteFile(filePath); -// } - } catch (Exception e) { - e.printStackTrace(); - } + doDownLoad(JMETER_FILE_NAME,response); } /** @@ -98,13 +82,16 @@ public class FuncCarApiController extends BaseController { */ @GetMapping("/protocolToolDownload") public void protocolToolDownload(HttpServletResponse response, HttpServletRequest request) { - String fileName = "apache-jmeter-5.6.3.zip"; + doDownLoad(JMETER_FILE_NAME,response); + } + + void doDownLoad(String filename,HttpServletResponse response){ try { - if (!FileUtils.checkAllowDownload(fileName)) { - throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); + if (!FileUtils.checkAllowDownload(filename)) { + throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", filename)); } - String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = projectConfig.getDownloadPath() + fileName; + String realFileName = System.currentTimeMillis() + filename.substring(filename.indexOf("_") + 1); + String filePath = projectConfig.getDownloadPath() + filename; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName);