From a9650b67807721e5ee37df896bc6142cfa121c61 Mon Sep 17 00:00:00 2001
From: Wisp X <1591788658@qq.com>
Date: Tue, 15 Mar 2022 08:03:55 +0800
Subject: [PATCH] =?UTF-8?q?Minio=20=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Enums/Strategy/MinioOption.php | 3 +++
app/Http/Requests/Admin/StrategyRequest.php | 1 +
app/Services/ImageService.php | 2 +-
resources/views/admin/strategy/add.blade.php | 4 ++++
resources/views/admin/strategy/edit.blade.php | 4 ++++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/Enums/Strategy/MinioOption.php b/app/Enums/Strategy/MinioOption.php
index a84cd70a..ef508f51 100644
--- a/app/Enums/Strategy/MinioOption.php
+++ b/app/Enums/Strategy/MinioOption.php
@@ -16,6 +16,9 @@ final class MinioOption
/** @var string Endpoint */
const Endpoint = 'endpoint';
+ /** @var string 区域 */
+ const Region = 'region';
+
/** @var string Bucket */
const Bucket = 'bucket';
}
diff --git a/app/Http/Requests/Admin/StrategyRequest.php b/app/Http/Requests/Admin/StrategyRequest.php
index d0f74177..cf96507d 100644
--- a/app/Http/Requests/Admin/StrategyRequest.php
+++ b/app/Http/Requests/Admin/StrategyRequest.php
@@ -127,6 +127,7 @@ class StrategyRequest extends FormRequest
'configs.access_key' => 'required',
'configs.secret_key' => 'required',
'configs.endpoint' => 'required',
+ 'configs.region' => '',
'configs.bucket' => 'required',
],
});
diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php
index b06e4e4f..13724ee9 100644
--- a/app/Services/ImageService.php
+++ b/app/Services/ImageService.php
@@ -319,7 +319,7 @@ class ImageService
'secret' => $configs->get(MinioOption::SecretKey)
],
'endpoint' => $configs->get(MinioOption::Endpoint),
- 'region' => '',
+ 'region' => $configs->get(MinioOption::Region),
'version' => '2006-03-01',
]),
bucket: $configs->get(MinioOption::Bucket),
diff --git a/resources/views/admin/strategy/add.blade.php b/resources/views/admin/strategy/add.blade.php
index 97fb6e34..fbc71e57 100644
--- a/resources/views/admin/strategy/add.blade.php
+++ b/resources/views/admin/strategy/add.blade.php
@@ -286,6 +286,10 @@
+
+
+
+
diff --git a/resources/views/admin/strategy/edit.blade.php b/resources/views/admin/strategy/edit.blade.php
index 8e3a9f76..a424d329 100644
--- a/resources/views/admin/strategy/edit.blade.php
+++ b/resources/views/admin/strategy/edit.blade.php
@@ -308,6 +308,10 @@
+
+
+
+