From db7058851c9b58a188ca97ab8d7260c955f1ebda Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 24 Apr 2021 15:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.3=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E7=9A=84=E7=BB=84=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/file/modular/factory/FileInfoFactory.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java index 03cc40ec9..f782dff23 100644 --- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java +++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/factory/FileInfoFactory.java @@ -79,11 +79,17 @@ public class FileInfoFactory { // 生成文件的最终名称 String finalFileName = fileId + FILE_POSTFIX_SEPARATOR + fileSuffix; + // 桶名 + String fileBucket = DEFAULT_BUCKET_NAME; + // 存储文件 byte[] bytes; try { bytes = file.getBytes(); - fileOperatorApi.storageFile(DEFAULT_BUCKET_NAME, finalFileName, bytes); + if (StrUtil.isNotEmpty(sysFileInfoRequest.getFileBucket())) { + fileBucket = sysFileInfoRequest.getFileBucket(); + } + fileOperatorApi.storageFile(fileBucket, finalFileName, bytes); } catch (IOException e) { throw new FileException(FileExceptionEnum.ERROR_FILE, e.getMessage()); } @@ -96,9 +102,8 @@ public class FileInfoFactory { // 封装存储文件信息(上传替换公共信息) SysFileInfo sysFileInfo = new SysFileInfo(); - sysFileInfo.setFileId(fileId); sysFileInfo.setFileLocation(FileLocationEnum.LOCAL.getCode()); - sysFileInfo.setFileBucket(DEFAULT_BUCKET_NAME); + sysFileInfo.setFileBucket(fileBucket); sysFileInfo.setFileObjectName(finalFileName); sysFileInfo.setFileOriginName(originalFilename); sysFileInfo.setFileSuffix(fileSuffix);