From 6f648b2e2f162be3d8257f9b5ecfcbf9e4da682d Mon Sep 17 00:00:00 2001 From: Wisp X Date: Thu, 27 Jan 2022 17:11:36 +0800 Subject: [PATCH] :sparkles: Introducing new features. --- app/Http/Requests/Admin/StrategyRequest.php | 11 ----------- app/Models/Strategy.php | 13 ------------- resources/views/admin/strategy/add.blade.php | 3 --- resources/views/admin/strategy/edit.blade.php | 3 --- 4 files changed, 30 deletions(-) diff --git a/app/Http/Requests/Admin/StrategyRequest.php b/app/Http/Requests/Admin/StrategyRequest.php index f1ad7ef6..e8691b7f 100644 --- a/app/Http/Requests/Admin/StrategyRequest.php +++ b/app/Http/Requests/Admin/StrategyRequest.php @@ -21,8 +21,6 @@ class StrategyRequest extends FormRequest 'key' => 'required|integer', 'configs.root' => 'max:1000', 'configs.domain' => 'required|url', - - 'configs.symlink' => 'required_if:key,1', ]; } @@ -34,15 +32,6 @@ class StrategyRequest extends FormRequest 'key' => '策略', 'configs.root' => '储存路径', 'configs.domain' => '访问域名', - - 'configs.symlink' => '符号链接' - ]; - } - - public function messages() - { - return [ - 'configs.symlink.required_if' => '请输入符号链接', ]; } } diff --git a/app/Models/Strategy.php b/app/Models/Strategy.php index ffe9a38d..db2c5337 100644 --- a/app/Models/Strategy.php +++ b/app/Models/Strategy.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Filesystem\Filesystem; /** * @property int $id @@ -59,19 +58,7 @@ class Strategy extends Model static::saving(function (self $strategy) { $strategy->configs['root'] = $strategy->configs->get('root', ''); $strategy->configs['domain'] = rtrim($strategy->configs->get('domain', env('APP_URL')), '/'); - // TODO 本地储存,创建/修改符号链接 - /*if ($strategy->key == StrategyKey::Local && $strategy->configs['root']) { - $link = ($strategy->getOriginal('configs')['symlink'] ?? ''); - if ($link && $link !== $strategy->configs['symlink']) { - // 删除已存在的符号链接 - @unlink($link); - } - $link = public_path($strategy->configs['symlink']); - if (! realpath($link)) { - (new Filesystem())->link($strategy->configs['root'], $link); - } - }*/ }); } diff --git a/resources/views/admin/strategy/add.blade.php b/resources/views/admin/strategy/add.blade.php index d57637e9..f5f5a8e8 100644 --- a/resources/views/admin/strategy/add.blade.php +++ b/resources/views/admin/strategy/add.blade.php @@ -49,9 +49,6 @@
- - 注意:本地储存访问域名必须有一个后缀,例如 https://www.lsky.pro/uploads/20220104/1.jpg 中的 uploads 就是后缀,系统会根据这个后缀生成符号链接。 符号链接相对 public 目录,不能与其他策略重复。 -
diff --git a/resources/views/admin/strategy/edit.blade.php b/resources/views/admin/strategy/edit.blade.php index 8ae2bb3f..6d08b508 100644 --- a/resources/views/admin/strategy/edit.blade.php +++ b/resources/views/admin/strategy/edit.blade.php @@ -49,9 +49,6 @@
- - 注意:本地储存访问域名必须有一个后缀,例如 https://www.lsky.pro/uploads/20220104/1.jpg 中的 uploads 就是后缀,系统会根据这个后缀生成符号链接。 符号链接相对 public 目录,不能与其他策略重复。 -