From 163567897ec7ff12db853cf6b935310255d931a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 29 Oct 2024 14:21:48 +0800
Subject: [PATCH] 'commit'

---
 .../resource/Test/TestUploadToMinio.java      |  8 +----
 .../com/dsideal/resource/Util/MinioUtils.java | 34 ++++++++++---------
 dsRes/src/main/resources/application_dev.yaml |  1 +
 dsRes/src/main/resources/application_pro.yaml |  1 +
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java b/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java
index c644b9d7..6ecdae62 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Test/TestUploadToMinio.java
@@ -9,13 +9,7 @@ public class TestUploadToMinio {
     public static Prop PropKit;
 
     public static void main(String[] args) {
-        //加载配置文件
-        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
-        PropKit = new YamlProp(configFile);
-        String endPoint = PropKit.get("minio.endpoint");
-        String accessKey = PropKit.get("minio.accessKey");
-        String secretKey = PropKit.get("minio.secretKey");
-        
+
 
     }
 }
diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/MinioUtils.java b/dsRes/src/main/java/com/dsideal/resource/Util/MinioUtils.java
index 5d2d492a..b0c4d230 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Util/MinioUtils.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Util/MinioUtils.java
@@ -1,8 +1,9 @@
 package com.dsideal.resource.Util;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.resource.Plugin.YamlProp;
 import com.jfinal.kit.PathKit;
-import com.jfinal.kit.PropKit;
+import com.jfinal.kit.Prop;
 import io.minio.MinioClient;
 import io.minio.SetBucketPolicyArgs;
 import io.minio.UploadObjectArgs;
@@ -12,27 +13,23 @@ import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 
+import static com.dsideal.resource.ResApplication.getEnvPrefix;
+
 public class MinioUtils {
     /**
      * 功能：获取Minio操作实例
      *
      * @return
      */
+    public static Prop PropKit;
     public static MinioClient getMinioClient() {
-//        //配置文件
-//        String configFile = "application_dev.properties";
-//        String myEnvVar = System.getenv("WORKING_ENV");
-//        if (myEnvVar != null) {
-//            configFile = configFile.replace("_dev", "_pro");
-//            System.out.println("环境变量 WORKING_ENV 的值是: " + myEnvVar);
-//        } else {
-//            System.out.println("环境变量 WORKING_ENV 未设置。");
-//        }
-//        PropKit.use(configFile);
-
-        String minio_endpoint = PropKit.get("minio_endpoint");
-        String minio_accesskey = PropKit.get("minio_accesskey");
-        String minio_secretkey = PropKit.get("minio_secretkey");
+        //加载配置文件
+        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
+        PropKit = new YamlProp(configFile);
+        String minio_endpoint = PropKit.get("minio.endpoint");
+        String minio_accesskey = PropKit.get("minio.accessKey");
+        String minio_secretkey = PropKit.get("minio.secretKey");
+        String bucketName = PropKit.get("minio.bucketName");
         return MinioClient.builder()
                 .endpoint(minio_endpoint)
                 .credentials(minio_accesskey, minio_secretkey)
@@ -65,10 +62,15 @@ public class MinioUtils {
     }
 
     public static void main(String[] args) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        //加载配置文件
+        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
+        PropKit = new YamlProp(configFile);
+        String bucketName = PropKit.get("minio.bucketName");
+
         String policy = FileUtil.readUtf8String(PathKit.getRootClassPath() + "/SetMinioDownload.json");
         MinioClient client = getMinioClient();
         SetBucketPolicyArgs setBucketPolicyArgs = SetBucketPolicyArgs.builder()
-                .bucket(PropKit.get("minio_bucketName"))
+                .bucket(bucketName)
                 .config(policy)
                 .build();
         client.setBucketPolicy(setBucketPolicyArgs);
diff --git a/dsRes/src/main/resources/application_dev.yaml b/dsRes/src/main/resources/application_dev.yaml
index 4b981a2a..378c57c7 100644
--- a/dsRes/src/main/resources/application_dev.yaml
+++ b/dsRes/src/main/resources/application_dev.yaml
@@ -22,6 +22,7 @@ minio:
   endpoint: http://10.10.14.210:9000
   accessKey: AOxWewe7pywwEc1NQeP6
   secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
+  bucketName: dsideal
 # ==============================================================
 
 excel:
diff --git a/dsRes/src/main/resources/application_pro.yaml b/dsRes/src/main/resources/application_pro.yaml
index 7ddb050d..bdd205a9 100644
--- a/dsRes/src/main/resources/application_pro.yaml
+++ b/dsRes/src/main/resources/application_pro.yaml
@@ -22,6 +22,7 @@ minio:
   endpoint: http://10.10.14.210:9000
   accessKey: AOxWewe7pywwEc1NQeP6
   secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
+  bucketName: dsideal
 # ==============================================================
 
 excel: