From dce91a03ef54f29a79f557ecbe0251cd607be158 Mon Sep 17 00:00:00 2001
From: CQG <UniGood@163.com>
Date: Fri, 17 Feb 2023 14:19:16 +0800
Subject: [PATCH] 文件上传服务获取InputStream未关闭，导致删除临时文件删除失败
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java | 10 +++++++---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 12 ++++++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
index 471b40b..631048c 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
@@ -8,9 +8,11 @@
import com.github.tobato.fastdfs.service.FastFileStorageClient;
import com.ruoyi.common.core.utils.file.FileTypeUtils;
+import java.io.InputStream;
+
/**
* FastDFS 文件存储
- *
+ *
* @author ruoyi
*/
@Service
@@ -27,7 +29,7 @@
/**
* FastDfs文件上传接口
- *
+ *
* @param file 上传的文件
* @return 访问地址
* @throws Exception
@@ -35,8 +37,10 @@
@Override
public String uploadFile(MultipartFile file) throws Exception
{
- StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
+ InputStream inputStream = file.getInputStream();
+ StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(),
FileTypeUtils.getExtension(file), null);
+ inputStream.close();
return domain + "/" + storePath.getFullPath();
}
}
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 3dd2fc6..daf8b42 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
@@ -8,9 +8,11 @@
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
+import java.io.InputStream;
+
/**
* Minio 文件存储
- *
+ *
* @author ruoyi
*/
@Service
@@ -23,8 +25,8 @@
private MinioClient client;
/**
- * 本地文件上传接口
- *
+ * Minio文件上传接口
+ *
* @param file 上传的文件
* @return 访问地址
* @throws Exception
@@ -33,13 +35,15 @@
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(file.getInputStream(), file.getSize(), -1)
+ .stream(inputStream, file.getSize(), -1)
.contentType(file.getContentType())
.build();
client.putObject(args);
+ inputStream.close();
return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
}
}
--
Gitblit v1.9.3