From 765fee4deb1eaf56e504748301ec89d46c19a2d7 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 13 Oct 2025 09:11:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/minio/utils/MinioUtil.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/minio/utils/MinioUtil.java b/ard-work/src/main/java/com/ard/work/component/minio/utils/MinioUtil.java
index 6377ddd..35744eb 100644
--- a/ard-work/src/main/java/com/ard/work/component/minio/utils/MinioUtil.java
+++ b/ard-work/src/main/java/com/ard/work/component/minio/utils/MinioUtil.java
@@ -76,16 +76,24 @@
* 上传文件
*
* @param bucketName 桶名称
- * @param fileName
+ * @param fileName 文件名
* @throws IOException
*/
public static String uploadFile(String bucketName, String fileName, MultipartFile multipartFile) throws IOException {
String url = "";
MinioClient minioClient = SpringUtils.getBean(MinioClient.class);
try (InputStream inputStream = multipartFile.getInputStream()) {
- minioClient.putObject(PutObjectArgs.builder().bucket(bucketName).object(fileName).stream(inputStream,
- multipartFile.getSize(), -1).contentType(multipartFile.getContentType()).build());
- url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder().bucket(bucketName).object(fileName).method(Method.GET).build());
+ minioClient.putObject(PutObjectArgs.builder().
+ bucket(bucketName).
+ object(fileName).
+ stream(inputStream,multipartFile.getSize(), -1).
+ contentType(multipartFile.getContentType()).
+ build());
+ url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder().
+ bucket(bucketName).
+ object(fileName).
+ method(Method.GET).
+ build());
url = url.substring(0, url.indexOf('?'));
return ServletUtils.urlDecode(url);
} catch (Exception e) {
--
Gitblit v1.9.3