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 @@ +
+ + +
@@ -274,10 +278,6 @@
-
- - -
@@ -286,6 +286,10 @@
+
+ + +
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 @@
+
+ + +
@@ -296,10 +300,6 @@
-
- - -
@@ -308,6 +308,10 @@
+
+ + +