From 8d7964797451c6712fdad96a7124a91f1febe75a Mon Sep 17 00:00:00 2001
From: Wisp X <1591788658@qq.com>
Date: Mon, 21 Mar 2022 09:54:01 +0800
Subject: [PATCH] =?UTF-8?q?s3=20=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=20end?=
 =?UTF-8?q?point?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Enums/Strategy/S3Option.php               |  3 +++
 app/Http/Requests/Admin/StrategyRequest.php   |  4 +++-
 app/Services/ImageService.php                 |  1 +
 resources/views/admin/strategy/add.blade.php  | 12 ++++++++----
 resources/views/admin/strategy/edit.blade.php | 12 ++++++++----
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/Enums/Strategy/S3Option.php b/app/Enums/Strategy/S3Option.php
index 75cf1e82..d1e3f9ec 100644
--- a/app/Enums/Strategy/S3Option.php
+++ b/app/Enums/Strategy/S3Option.php
@@ -13,6 +13,9 @@ final class S3Option
     /** @var string SecretAccessKey */
     const SecretAccessKey = 'secret_access_key';
 
+    /** @var string Endpoint */
+    const Endpoint = 'endpoint';
+
     /** @var string 区域 */
     const Region = 'region';
 
diff --git a/app/Http/Requests/Admin/StrategyRequest.php b/app/Http/Requests/Admin/StrategyRequest.php
index 097e3d17..1f887279 100644
--- a/app/Http/Requests/Admin/StrategyRequest.php
+++ b/app/Http/Requests/Admin/StrategyRequest.php
@@ -73,6 +73,7 @@ class StrategyRequest extends FormRequest
             StrategyKey::S3 => [
                 'configs.access_key_id' => 'required',
                 'configs.secret_access_key' => 'required',
+                'configs.endpoint' => '',
                 'configs.region' => '',
                 'configs.bucket' => 'required',
             ],
@@ -126,7 +127,7 @@ class StrategyRequest extends FormRequest
             StrategyKey::Minio => [
                 'configs.access_key' => 'required',
                 'configs.secret_key' => 'required',
-                'configs.endpoint' => 'required',
+                'configs.endpoint' => '',
                 'configs.region' => '',
                 'configs.bucket' => 'required',
             ],
@@ -149,6 +150,7 @@ class StrategyRequest extends FormRequest
             StrategyKey::S3 => [
                 'configs.access_key_id' => 'AccessKeyId',
                 'configs.secret_access_key' => 'SecretAccessKey',
+                'configs.endpoint' => '连接地址',
                 'configs.region' => '区域',
                 'configs.bucket' => '储存桶名称',
             ],
diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php
index 71011104..d56e8491 100644
--- a/app/Services/ImageService.php
+++ b/app/Services/ImageService.php
@@ -251,6 +251,7 @@ class ImageService
                         'key'    => $configs->get(S3Option::AccessKeyId),
                         'secret' => $configs->get(S3Option::SecretAccessKey)
                     ],
+                    'endpoint' => $configs->get(S3Option::Endpoint),
                     'region' => $configs->get(S3Option::Region),
                     'version' => '2006-03-01',
                 ]),
diff --git a/resources/views/admin/strategy/add.blade.php b/resources/views/admin/strategy/add.blade.php
index fbc71e57..38755a5e 100644
--- a/resources/views/admin/strategy/add.blade.php
+++ b/resources/views/admin/strategy/add.blade.php
@@ -68,6 +68,10 @@
                                 <label for="configs[secret_access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>SecretAccessKey</label>
                                 <x-input type="password" name="configs[secret_access_key]" id="configs[secret_access_key]" placeholder="请输入 SecretAccessKey" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700">连接地址</label>
+                                <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[region]" class="block text-sm font-medium text-gray-700">区域(region)</label>
                                 <x-input type="text" name="configs[region]" id="configs[region]" placeholder="请输入区域，例如：us-east-1" />
@@ -274,10 +278,6 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
-                            <div class="col-span-3 sm:col-span-2 mb-4">
-                                <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>连接地址</label>
-                                <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" />
-                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                 <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" />
@@ -286,6 +286,10 @@
                                 <label for="configs[secret_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>SecretKey</label>
                                 <x-input type="password" name="configs[secret_key]" id="configs[secret_key]" placeholder="请输入 SecretKey" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700">连接地址</label>
+                                <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[region]" class="block text-sm font-medium text-gray-700">区域(region)</label>
                                 <x-input type="text" name="configs[region]" id="configs[region]" placeholder="请输入区域，例如：us-east-1" />
diff --git a/resources/views/admin/strategy/edit.blade.php b/resources/views/admin/strategy/edit.blade.php
index 90f4be9b..434210c4 100644
--- a/resources/views/admin/strategy/edit.blade.php
+++ b/resources/views/admin/strategy/edit.blade.php
@@ -74,6 +74,10 @@
                                 <label for="configs[secret_access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>SecretAccessKey</label>
                                 <x-input type="password" name="configs[secret_access_key]" id="configs[secret_access_key]" placeholder="请输入 SecretAccessKey" value="{{ $strategy->configs->get('secret_access_key') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700">连接地址</label>
+                                <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" value="{{ $strategy->configs->get('endpoint') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[region]" class="block text-sm font-medium text-gray-700">区域(region)</label>
                                 <x-input type="text" name="configs[region]" id="configs[region]" placeholder="请输入区域，例如：us-east-1" value="{{ $strategy->configs->get('region') }}" />
@@ -296,10 +300,6 @@
                                     <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                     <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                                 </div>
-                                <div class="col-span-3 sm:col-span-2 mb-4">
-                                    <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>连接地址</label>
-                                    <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" value="{{ $strategy->configs->get('endpoint') }}" />
-                                </div>
                                 <div class="col-span-3 sm:col-span-2 mb-4">
                                     <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                     <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" value="{{ $strategy->configs->get('access_key') }}" />
@@ -308,6 +308,10 @@
                                     <label for="configs[secret_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>SecretKey</label>
                                     <x-input type="password" name="configs[secret_key]" id="configs[secret_key]" placeholder="请输入 SecretKey" value="{{ $strategy->configs->get('secret_key') }}" />
                                 </div>
+                                <div class="col-span-3 sm:col-span-2 mb-4">
+                                    <label for="configs[endpoint]" class="block text-sm font-medium text-gray-700">连接地址</label>
+                                    <x-input type="url" name="configs[endpoint]" id="configs[endpoint]" placeholder="请输入连接地址" value="{{ $strategy->configs->get('endpoint') }}" />
+                                </div>
                                 <div class="col-span-3 sm:col-span-2 mb-4">
                                     <label for="configs[region]" class="block text-sm font-medium text-gray-700">区域(region)</label>
                                     <x-input type="text" name="configs[region]" id="configs[region]" placeholder="请输入区域，例如：us-east-1" value="{{ $strategy->configs->get('region') }}" />