From a9054c7567a58fb910dc220fe55d2decace326b6 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 4 Dec 2024 14:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AF=B9=E8=B1=A1=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E6=97=B6=EF=BC=8C=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=9C=A8=E7=BA=BF=E9=A2=84=E8=A7=88=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/file/web/FileUploadController.java | 8 ++++---- .../com/jeesite/modules/file/web/UserfilesController.java | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java b/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java index 5de6bb09..521ca261 100644 --- a/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java +++ b/modules/core/src/main/java/com/jeesite/modules/file/web/FileUploadController.java @@ -35,7 +35,7 @@ public class FileUploadController extends BaseController { @Autowired private FileUploadService fileUploadService; - + /** * 上传文件参数 */ @@ -53,7 +53,7 @@ public class FileUploadController extends BaseController { model.put("imageMaxHeight", Global.getConfigToInteger("file.imageMaxHeight", "768")); return model; } - + /** * 上传文件 */ @@ -62,14 +62,14 @@ public class FileUploadController extends BaseController { public Map uploadFile(FileUploadParams params) { return fileUploadService.uploadFile(new FileUpload(), params); } - + /** * 下载文件 */ @RequestMapping(value = "/download/{fileUploadId}") public String downloadFile(@PathVariable("fileUploadId") String fileUploadId, String preview, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { FileUpload fileUpload = fileUploadService.getFile(new FileUpload(fileUploadId)); - return fileUploadService.downloadFile(fileUpload, preview, request, response); + return fileUploadService.downloadFile(fileUpload, preview, "file", request, response); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java b/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java index a460c2fc..6d99dde0 100644 --- a/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java +++ b/modules/core/src/main/java/com/jeesite/modules/file/web/UserfilesController.java @@ -33,7 +33,7 @@ import java.io.IOException; public class UserfilesController extends BaseController { @RequestMapping(value="/userfiles/**") - public String fileStreamDown(HttpServletRequest request, HttpServletResponse response) + public String fileStreamDown(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // 获取相对文件地址 @@ -49,7 +49,8 @@ public class UserfilesController extends BaseController { String uid = request.getParameter("uid"); if (StringUtils.isNotBlank(url) && StringUtils.isNotBlank(uid)){ fileUrl = url; //EncodeUtils.decodeUrl(url); 不用解码，否则腾讯云存储的时候预览不能显示 - fileUri = Global.getCtxPath() + Global.getAdminPath() + "/file/download/" + uid; + String type = StringUtils.defaultIfBlank(request.getParameter("type"), "file"); + fileUri = Global.getCtxPath() + Global.getAdminPath() + "/" + type + "/download/" + uid; filePath = fileName; } else if (StringUtils.isNotBlank(fileName)){ fileUri += "?fileName=" + EncodeUtils.encodeUrl(fileName);