From 05e45b743f5fa280e1b4b6c28b8caf0638e286ff Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Mon, 15 Jan 2024 09:23:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E7=94=9F=E6=88=90=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/oss/core/OssClient.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java index 5194d695..16aa36db 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java @@ -242,16 +242,13 @@ public class OssClient { * @throws OssException 如果下载失败,抛出自定义异常 */ public Path fileDownload(String path) { - // 从路径中移除 URL 前缀 - String url = removeBaseUrl(path); - - // 构建临时文件路径 文件名必须是唯一不存在的,路径必须是存在的 - Path tempFilePath = Paths.get(extractFileName(url)); + // 构建临时文件 + Path tempFilePath = FileUtils.createTempFile().toPath(); // 使用 S3TransferManager 下载文件 FileDownload downloadFile = transferManager.downloadFile( x -> x.getObjectRequest( y -> y.bucket(properties.getBucketName()) - .key(url) + .key(removeBaseUrl(path)) .build()) .addTransferListener(LoggingTransferListener.create()) .destination(tempFilePath) @@ -451,16 +448,6 @@ public class OssClient { return path.replace(getUrl() + StringUtils.SLASH, ""); } - /** - * 从文件路径中提取文件名 - * - * @param path 文件路径 - * @return 提取的文件名或默认文件名 - */ - public String extractFileName(String path) { - return FileUtils.getTmpDir() + StringUtils.SLASH + Paths.get(path).getFileName().toString(); - } - /** * 服务商 */