From 8953a06b08ae26d5fbb412ae5eae7063172e7954 Mon Sep 17 00:00:00 2001
From: WangYa <45547249+secondarycoder@users.noreply.github.com>
Date: Wed, 18 Aug 2021 21:47:43 +0800
Subject: [PATCH] Fix access to MinIO server with TLS (#1458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: minIO的Region修改为非必要配置项
---
 .../java/run/halo/app/handler/file/MinioFileHandler.java    | 6 ++++--
 .../java/run/halo/app/model/properties/MinioProperties.java | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 43483d8a7..389f9b92a 100644
--- a/src/main/java/run/halo/app/handler/file/MinioFileHandler.java
+++ b/src/main/java/run/halo/app/handler/file/MinioFileHandler.java
@@ -51,7 +51,7 @@ public class MinioFileHandler implements FileHandler {
         String source =
             optionService.getByPropertyOrDefault(MinioProperties.SOURCE, String.class, "");
         String region =
-            optionService.getByPropertyOfNonNull(MinioProperties.REGION).toString();
+            optionService.getByPropertyOrDefault(MinioProperties.REGION, String.class, "us-east-1");
 
         endpoint = StringUtils.appendIfMissing(endpoint, HaloConst.URL_SEPARATOR);
 
@@ -78,6 +78,7 @@ public class MinioFileHandler implements FileHandler {
                 .stream(file.getInputStream(), file.getSize(), -1)
                 .object(upFilePath)
                 .build();
+            minioClient.ignoreCertCheck();
             minioClient.putObject(putObjectArgs);
 
             UploadResult uploadResult = new UploadResult();
@@ -114,7 +115,7 @@ public class MinioFileHandler implements FileHandler {
         String bucketName =
             optionService.getByPropertyOfNonNull(MinioProperties.BUCKET_NAME).toString();
         String region =
-            optionService.getByPropertyOfNonNull(MinioProperties.REGION).toString();
+            optionService.getByPropertyOrDefault(MinioProperties.REGION, String.class, "us-east-1");
 
         MinioClient minioClient = MinioClient.builder()
             .endpoint(endPoint)
@@ -123,6 +124,7 @@ public class MinioFileHandler implements FileHandler {
             .build();
 
         try {
+            minioClient.ignoreCertCheck();
             minioClient.removeObject(RemoveObjectArgs.builder()
                 .bucket(bucketName)
                 .object(key)
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 ec6c4e6b3..6af036594 100644
--- a/src/main/java/run/halo/app/model/properties/MinioProperties.java
+++ b/src/main/java/run/halo/app/model/properties/MinioProperties.java
@@ -36,7 +36,7 @@ public enum MinioProperties implements PropertyEnum {
     /**
      * Minio regoin
      */
-    REGION("minio_region", String.class, "");
+    REGION("minio_region", String.class, "us-east-1");
 
     private final String value;