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/FastDfsSysFileServiceImpl.java | 20 +++++++++++++++-----
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java | 33 ++++++++++++++++++++++-----------
2 files changed, 37 insertions(+), 16 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 989edb7..da0dc60 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
@@ -37,10 +37,20 @@
@Override
public String uploadFile(MultipartFile file) throws Exception
{
- InputStream inputStream = file.getInputStream();
- StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(),
- FileTypeUtils.getExtension(file), null);
- IoUtils.closeQuietly(inputStream);
- return domain + "/" + storePath.getFullPath();
+ InputStream inputStream = null;
+ try
+ {
+ inputStream = file.getInputStream();
+ StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), FileTypeUtils.getExtension(file), null);
+ return domain + "/" + storePath.getFullPath();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("FastDfs Failed to upload file", e);
+ }
+ finally
+ {
+ IoUtils.closeQuietly(inputStream);
+ }
}
}
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 4a0b6c4..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
@@ -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);
- IoUtils.closeQuietly(inputStream);
- 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