From 3786f3671dadd8e8738a41fad1f65fd78428dd38 Mon Sep 17 00:00:00 2001
From: maochd <maochd@aliyun.com>
Date: Tue, 18 Apr 2023 13:55:07 +0800
Subject: [PATCH] 解决文件输入流为可能为空的问题
---
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 202fdab..39709f8 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
@@ -1,16 +1,19 @@
package com.ruoyi.file.service;
-import org.apache.commons.io.FilenameUtils;
+import java.io.InputStream;
+
+import com.alibaba.nacos.common.utils.IoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import com.github.tobato.fastdfs.domain.fdfs.StorePath;
import com.github.tobato.fastdfs.service.FastFileStorageClient;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
/**
- * FastDFS文件存储
- *
+ * FastDFS 文件存储
+ *
* @author ruoyi
*/
@Service
@@ -27,17 +30,18 @@
/**
* FastDfs文件上传接口
- *
+ *
* @param file 上传的文件
- * @param baseDir 相对应用的基目录
* @return 访问地址
* @throws Exception
*/
@Override
- public String uploadFile(MultipartFile file, String baseDir) throws Exception
+ public String uploadFile(MultipartFile file) throws Exception
{
- StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
- FilenameUtils.getExtension(file.getOriginalFilename()), null);
+ InputStream inputStream = file.getInputStream();
+ StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(),
+ FileTypeUtils.getExtension(file), null);
+ IoUtils.closeQuietly(inputStream);
return domain + "/" + storePath.getFullPath();
}
}
--
Gitblit v1.9.3