From 6a84483b156032b47dc6eba4be4972aaf01b4cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E9=9D=99=E7=9A=84=E9=98=BF=E8=B1=AA?=
 <46225881+li-guohao@users.noreply.github.com>
Date: Sun, 25 Jul 2021 14:01:31 +0800
Subject: [PATCH] fix: add region for operate minio attachment  (halo-dev#1439)
 (#1440)

Co-authored-by: li-guohao <liguohao_cn@qq.com>
---
 .../java/run/halo/app/handler/file/MinioFileHandler.java   | 6 ++++++
 .../run/halo/app/model/properties/MinioProperties.java     | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/handler/file/MinioFileHandler.java b/src/main/java/run/halo/app/handler/file/MinioFileHandler.java
index 70c313977..43483d8a7 100644
--- a/src/main/java/run/halo/app/handler/file/MinioFileHandler.java
+++ b/src/main/java/run/halo/app/handler/file/MinioFileHandler.java
@@ -50,12 +50,15 @@ public class MinioFileHandler implements FileHandler {
             optionService.getByPropertyOfNonNull(MinioProperties.BUCKET_NAME).toString();
         String source =
             optionService.getByPropertyOrDefault(MinioProperties.SOURCE, String.class, "");
+        String region =
+            optionService.getByPropertyOfNonNull(MinioProperties.REGION).toString();
 
         endpoint = StringUtils.appendIfMissing(endpoint, HaloConst.URL_SEPARATOR);
 
         MinioClient minioClient = MinioClient.builder()
             .endpoint(endpoint)
             .credentials(accessKey, accessSecret)
+            .region(region)
             .build();
 
         try {
@@ -110,10 +113,13 @@ public class MinioFileHandler implements FileHandler {
             optionService.getByPropertyOfNonNull(MinioProperties.ACCESS_SECRET).toString();
         String bucketName =
             optionService.getByPropertyOfNonNull(MinioProperties.BUCKET_NAME).toString();
+        String region =
+            optionService.getByPropertyOfNonNull(MinioProperties.REGION).toString();
 
         MinioClient minioClient = MinioClient.builder()
             .endpoint(endPoint)
             .credentials(accessKey, accessSecret)
+            .region(region)
             .build();
 
         try {
diff --git a/src/main/java/run/halo/app/model/properties/MinioProperties.java b/src/main/java/run/halo/app/model/properties/MinioProperties.java
index ed61988a2..ec6c4e6b3 100644
--- a/src/main/java/run/halo/app/model/properties/MinioProperties.java
+++ b/src/main/java/run/halo/app/model/properties/MinioProperties.java
@@ -31,7 +31,12 @@ public enum MinioProperties implements PropertyEnum {
     /**
      * Minio source
      */
-    SOURCE("minio_source", String.class, "");
+    SOURCE("minio_source", String.class, ""),
+
+    /**
+     * Minio regoin
+     */
+    REGION("minio_region", String.class, "");
 
     private final String value;