From 92c6d218554b028a8085514eeb18f1dfcd41af58 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 05 Dec 2024 14:27:54 +0800
Subject: [PATCH] 优化文件异常输入流未关闭的问题
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
index daf8b42..eade4c8 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java
@@ -1,14 +1,14 @@
package com.ruoyi.file.service;
+import java.io.InputStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.nacos.common.utils.IoUtils;
import com.ruoyi.file.config.MinioConfig;
import com.ruoyi.file.utils.FileUploadUtils;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
-
-import java.io.InputStream;
/**
* Minio 文件存储
@@ -34,16 +34,27 @@
@Override
public String uploadFile(MultipartFile file) throws Exception
{
- String fileName = FileUploadUtils.extractFilename(file);
- InputStream inputStream = file.getInputStream();
- PutObjectArgs args = PutObjectArgs.builder()
- .bucket(minioConfig.getBucketName())
- .object(fileName)
- .stream(inputStream, file.getSize(), -1)
- .contentType(file.getContentType())
- .build();
- client.putObject(args);
- inputStream.close();
- return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
+ InputStream inputStream = null;
+ try
+ {
+ String fileName = FileUploadUtils.extractFilename(file);
+ inputStream = file.getInputStream();
+ PutObjectArgs args = PutObjectArgs.builder()
+ .bucket(minioConfig.getBucketName())
+ .object(fileName)
+ .stream(inputStream, file.getSize(), -1)
+ .contentType(file.getContentType())
+ .build();
+ client.putObject(args);
+ return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Minio Failed to upload file", e);
+ }
+ finally
+ {
+ IoUtils.closeQuietly(inputStream);
+ }
}
}
--
Gitblit v1.9.3