对接文件系统

liujun001
1 parent 6fcf15c1
Showing 3 changed files with 45 additions and 32 deletions
Bsth-admin/src/main/java/com/ruoyi/config/MinioConfig.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/resource/LinggangSignInResourceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/UploadUtil.java
 package com.ruoyi.config;
+import io.minio.*;
 import io.minio.errors.*;
+import io.minio.http.Method;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Value;
-import io.minio.MinioClient;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.util.UriUtils;
@@ -15,8 +16,6 @@ import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import io.minio.PutObjectArgs;
-
 import javax.annotation.Resource;
 @Component
@@ -81,17 +80,43 @@ public class MinioConfig implements InitializingBean {
      */
     public Boolean upload(InputStream inputStream, String fileName, String contentType) {
         // 修饰过的文件名 非源文件名
-
+//
+//        try {
+//            PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(bucket).object(fileName)
+//                    .stream(inputStream, inputStream.available(), -1).contentType(contentType).build();
+//            //文件名称相同会覆盖
+//            minioClient.putObject(objectArgs);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return false;
+//        }
         try {
-            PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(bucket).object(fileName)
-                    .stream(inputStream, inputStream.available(), -1).contentType(contentType).build();
-            //文件名称相同会覆盖
-            minioClient.putObject(objectArgs);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
+            ObjectWriteResponse response= minioClient.putObject(PutObjectArgs.builder()
+                    .bucket(bucket) // 替换为你实际的存储桶名称
+                    .object(fileName)
+                    .stream(inputStream, inputStream.available(), -1)
+                    .contentType(contentType)
+                    .build());
+            return true;
+        } catch (ErrorResponseException e) {
+            throw new RuntimeException(e);
+        } catch (InsufficientDataException e) {
+            throw new RuntimeException(e);
+        } catch (InternalException e) {
+            throw new RuntimeException(e);
+        } catch (InvalidKeyException e) {
+            throw new RuntimeException(e);
+        } catch (InvalidResponseException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        } catch (ServerException e) {
+            throw new RuntimeException(e);
+        } catch (XmlParserException e) {
+            throw new RuntimeException(e);
         }
-        return true;
     }
@@ -135,13 +135,13 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
         entities = entities.stream().map(en -> {
             StringBuilder builder = new StringBuilder();
             builder.append("sign");
-            builder.append(File.separator);
+            builder.append("/");
             builder.append("images");
-            builder.append(File.separator);
+            builder.append("/");
             builder.append(en.getDevice());
-            builder.append(File.separator);
+            builder.append("/");
             builder.append(en.getSignId());
-            builder.append(File.separator);
+            builder.append("/");
             builder.append(UUID.randomUUID().toString().replace("-", ""));
             builder.append(".");
             builder.append(en.getPicType());
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.config.BsthSystemConfig;
+import com.ruoyi.config.MinioConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -28,6 +29,8 @@ public class UploadUtil {
     @Autowired
     private BsthSystemConfig bsthSystemConfig;
+    @Autowired
+    private MinioConfig minioConfig;
     /**
      * 上传图片接口
@@ -50,23 +53,8 @@ public class UploadUtil {
             content = FileUploadUtils.choosePrictureContent(content);
             byte[] bytes = Base64.decode(content);
             inputStream = new ByteArrayInputStream(bytes);
-            bufferedImage = ImageIO.read(inputStream);
-            if (bufferedImage.getWidth() < 0 || bufferedImage.getHeight() < 0) {
-                return ResponseResult.error("请上传正确的图片");
-            }
-
-            StringBuilder filePath = new StringBuilder();
-            filePath.append(bsthSystemConfig.getImageBasePath());
-            filePath.append(File.separator);
-            filePath.append(path);
-
-            File file = new File(filePath.toString());
-            if(!file.exists() || !file.isDirectory()){
-                FileUtils.forceMkdirParent(file);
-            }
-            ImageIO.write(bufferedImage, type, file);
-            bufferedImage.flush();
+            minioConfig.upload(inputStream,path,"application/png");
             return ResponseResult.success(Boolean.TRUE);
         } catch (Exception e) {