Просмотр исходного кода

优化文件输入流可能为空的问题

RuoYi лет назад: 3
Родитель
Сommit
74045776d6

+ 0 - 1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -1,7 +1,6 @@
1
 package com.ruoyi.file.service;
1
 package com.ruoyi.file.service;
2
 
2
 
3
 import java.io.InputStream;
3
 import java.io.InputStream;
4
-
5
 import com.alibaba.nacos.common.utils.IoUtils;
4
 import com.alibaba.nacos.common.utils.IoUtils;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Value;
6
 import org.springframework.beans.factory.annotation.Value;

+ 2 - 1
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@@ -4,6 +4,7 @@ import java.io.InputStream;
4
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.stereotype.Service;
5
 import org.springframework.stereotype.Service;
6
 import org.springframework.web.multipart.MultipartFile;
6
 import org.springframework.web.multipart.MultipartFile;
7
+import com.alibaba.nacos.common.utils.IoUtils;
7
 import com.ruoyi.file.config.MinioConfig;
8
 import com.ruoyi.file.config.MinioConfig;
8
 import com.ruoyi.file.utils.FileUploadUtils;
9
 import com.ruoyi.file.utils.FileUploadUtils;
9
 import io.minio.MinioClient;
10
 import io.minio.MinioClient;
@@ -42,7 +43,7 @@ public class MinioSysFileServiceImpl implements ISysFileService
42
                 .contentType(file.getContentType())
43
                 .contentType(file.getContentType())
43
                 .build();
44
                 .build();
44
         client.putObject(args);
45
         client.putObject(args);
45
-        inputStream.close();
46
+        IoUtils.closeQuietly(inputStream);
46
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
47
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
47
     }
48
     }
48
 }
49
 }