Parcourir la source

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

RuoYi il y a 2 ans
Parent
commit
74045776d6

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

@@ -1,7 +1,6 @@
 package com.ruoyi.file.service;
 package com.ruoyi.file.service;
 
 
 import java.io.InputStream;
 import java.io.InputStream;
-
 import com.alibaba.nacos.common.utils.IoUtils;
 import com.alibaba.nacos.common.utils.IoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.nacos.common.utils.IoUtils;
 import com.ruoyi.file.config.MinioConfig;
 import com.ruoyi.file.config.MinioConfig;
 import com.ruoyi.file.utils.FileUploadUtils;
 import com.ruoyi.file.utils.FileUploadUtils;
 import io.minio.MinioClient;
 import io.minio.MinioClient;
@@ -42,7 +43,7 @@ public class MinioSysFileServiceImpl implements ISysFileService
                 .contentType(file.getContentType())
                 .contentType(file.getContentType())
                 .build();
                 .build();
         client.putObject(args);
         client.putObject(args);
-        inputStream.close();
+        IoUtils.closeQuietly(inputStream);
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
     }
     }
 }
 }