From eb1c950fe950e278beceeb534d85f7e6776357e2 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Wed, 15 Mar 2023 18:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...Properties.java => MinIossProperties.java} |  4 +++-
 .../com/njcn/minioss/util/MinIoUtils.java     | 24 +++++++++----------
 src/main/resources/META-INF/spring.factories  |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename src/main/java/com/njcn/minioss/config/{MinIoProperties.java => MinIossProperties.java} (88%)

diff --git a/src/main/java/com/njcn/minioss/config/MinIoProperties.java b/src/main/java/com/njcn/minioss/config/MinIossProperties.java
similarity index 88%
rename from src/main/java/com/njcn/minioss/config/MinIoProperties.java
rename to src/main/java/com/njcn/minioss/config/MinIossProperties.java
index d189102..2eb1f38 100644
--- a/src/main/java/com/njcn/minioss/config/MinIoProperties.java
+++ b/src/main/java/com/njcn/minioss/config/MinIossProperties.java
@@ -4,6 +4,7 @@ import io.minio.MinioClient;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,8 +13,9 @@ import org.springframework.stereotype.Component;
  * @date 2022年10月16日 18:37
  */
 @Data
+@Configuration
 @ConfigurationProperties(prefix = "min.io")
-public class MinIoProperties {
+public class MinIossProperties {
 
     /**
      * Minio 服务端ip
diff --git a/src/main/java/com/njcn/minioss/util/MinIoUtils.java b/src/main/java/com/njcn/minioss/util/MinIoUtils.java
index 51631a1..59e6611 100644
--- a/src/main/java/com/njcn/minioss/util/MinIoUtils.java
+++ b/src/main/java/com/njcn/minioss/util/MinIoUtils.java
@@ -1,7 +1,7 @@
 package com.njcn.minioss.util;
 
 import com.njcn.minioss.bo.MinIoUploadResDTO;
-import com.njcn.minioss.config.MinIoProperties;
+import com.njcn.minioss.config.MinIossProperties;
 import io.minio.*;
 import io.minio.http.Method;
 import io.minio.messages.Bucket;
@@ -9,8 +9,10 @@ import io.minio.messages.DeleteError;
 import io.minio.messages.DeleteObject;
 import io.minio.messages.Item;
 import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -19,8 +21,7 @@ import java.io.InputStream;
 import java.util.*;
 
 
-@Configuration
-@EnableConfigurationProperties({MinIoProperties.class})
+@Component
 public class MinIoUtils {
 
     @Resource
@@ -339,6 +340,7 @@ public class MinIoUtils {
 
     /**
      * 文件流上传
+     *
      * @param inputStream 文件流
      * @param bucketName  桶名
      * @param directory   image/
@@ -363,19 +365,15 @@ public class MinIoUtils {
 
 
     /**
-     * @param response
      * @return java.lang.String
+     * @return InputStream 文件流
      * @Description 下载文件
      */
-//    public void download(HttpServletResponse response, String bucketName, String minFileName) throws Exception {
-//        InputStream fileInputStream = instance.getObject(GetObjectArgs.builder()
-//                .bucket(bucketName)
-//                .object(minFileName).build());
-//        response.setHeader("Content-Disposition", "attachment;filename=" + minFileName);
-//        response.setContentType("application/force-download");
-//        response.setCharacterEncoding("UTF-8");
-//        IOUtils.copy(fileInputStream, response.getOutputStream());
-//    }
+    public InputStream downloadStream(String bucketName, String minFileName) throws Exception {
+        return instance.getObject(GetObjectArgs.builder()
+                .bucket(bucketName)
+                .object(minFileName).build());
+    }
 
 
     /**
diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories
index 2e2535f..7669aac 100644
--- a/src/main/resources/META-INF/spring.factories
+++ b/src/main/resources/META-INF/spring.factories
@@ -1,5 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- com.njcn.minioss.config.MinIoProperties,\
+ com.njcn.minioss.config.MinIossProperties,\
  com.njcn.minioss.util.MinIoUtils