From 7aa085d19f73e18c81ec73320bf7d4f26e362104 Mon Sep 17 00:00:00 2001 From: Wisp X Date: Mon, 17 Jan 2022 13:49:20 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=8E=9F=E5=9B=BE=E4=BF=9D?= =?UTF-8?q?=E6=8A=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Enums/Strategy/KodoOption.php | 2 +- app/Enums/Strategy/LocalOption.php | 4 ++-- app/Models/Image.php | 9 ++++----- app/Models/Strategy.php | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/Enums/Strategy/KodoOption.php b/app/Enums/Strategy/KodoOption.php index d1338ff3..50ac0e03 100644 --- a/app/Enums/Strategy/KodoOption.php +++ b/app/Enums/Strategy/KodoOption.php @@ -17,5 +17,5 @@ final class KodoOption const Bucket = 'bucket'; /** @var string 是否启用获取原始 url 功能 */ - const IsEnableOriginUrl = 'is_enable_origin_url'; + const IsEnableOriginalProtection = 'is_enable_origin_url'; } diff --git a/app/Enums/Strategy/LocalOption.php b/app/Enums/Strategy/LocalOption.php index 1dd5a320..6c37436b 100644 --- a/app/Enums/Strategy/LocalOption.php +++ b/app/Enums/Strategy/LocalOption.php @@ -10,6 +10,6 @@ final class LocalOption /** @var string 根目录 */ const Root = 'root'; - /** @var string 是否启用获取原始 url 功能 */ - const IsEnableOriginUrl = 'is_enable_origin_url'; + /** @var string 是否启用原图保护功能 */ + const IsEnableOriginalProtection = 'is_enable_original_protection'; } diff --git a/app/Models/Image.php b/app/Models/Image.php index 0f0dd5a8..a4971c2e 100644 --- a/app/Models/Image.php +++ b/app/Models/Image.php @@ -119,12 +119,11 @@ class Image extends Model if (!$this->strategy) { return Storage::disk('uploads')->url($this->pathname); } - // 是否启用了获取图片直链功能 - if ($this->strategy->configs->get(LocalOption::IsEnableOriginUrl)) { - return rtrim($this->strategy->configs->get(LocalOption::Domain), '/').'/'.$this->pathname; - } else { - // 原图保护 + // 是否启用原图保护功能 + if ($this->strategy->configs->get(LocalOption::IsEnableOriginalProtection)) { return asset("{$this->key}.{$this->extension}"); + } else { + return rtrim($this->strategy->configs->get(LocalOption::Domain), '/').'/'.$this->pathname; } }); } diff --git a/app/Models/Strategy.php b/app/Models/Strategy.php index c85c17a3..dee26fcf 100644 --- a/app/Models/Strategy.php +++ b/app/Models/Strategy.php @@ -51,7 +51,7 @@ class Strategy extends Model static::creating(function (self $strategy) { $strategy->configs = collect([ LocalOption::Domain => env('APP_URL'), - LocalOption::IsEnableOriginUrl => true, + LocalOption::IsEnableOriginalProtection => true, ]); }); }