From 114b6c4b42fc8063f026b17e471e515e2930873d Mon Sep 17 00:00:00 2001 From: Wisp X Date: Fri, 21 Jan 2022 23:38:02 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/GroupController.php | 5 +++-- routes/image.php | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 6a3a7360..947eb288 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Enums\ConfigKey; +use App\Enums\GroupConfigKey; use App\Http\Controllers\Controller; use App\Http\Requests\Admin\GroupRequest; use App\Models\Group; @@ -16,8 +17,8 @@ class GroupController extends Controller public function __construct() { \Illuminate\Support\Facades\View::share([ - 'default' => config('convention.app.'.ConfigKey::GroupConfigs), - 'extensions' => ['jpeg', 'jpg', 'png', 'gif', 'tif', 'bmp', 'ico', 'psd', 'webp'], + 'default' => collect(config('convention.app.'.ConfigKey::GroupConfigs)), + 'extensions' => config('convention.app.'.ConfigKey::GroupConfigs)[GroupConfigKey::AcceptedFileSuffixes], 'positions' => [ 'top-left' => '左上角', 'top' => '上中', diff --git a/routes/image.php b/routes/image.php index eb822688..0e1002a9 100644 --- a/routes/image.php +++ b/routes/image.php @@ -3,10 +3,9 @@ use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Route; use App\Enums\GroupConfigKey; -use App\Utils; use App\Enums\ConfigKey; -$extensions = Utils::config(ConfigKey::GroupConfigs)->get(GroupConfigKey::AcceptedFileSuffixes); +$extensions = config('convention.app.'.ConfigKey::GroupConfigs)[GroupConfigKey::AcceptedFileSuffixes]; Route::middleware('cache.headers:public;max_age=2628000;etag')->group(function () use ($extensions) { Route::any('{key}.{extension}', [ Controller::class, 'output',