From 3191976a754302c1e13fc590eea9e2fab46dddad Mon Sep 17 00:00:00 2001 From: Jing Li Date: Mon, 25 Mar 2024 17:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/AdminController.php | 2 +- app/Admin/Middleware/CheckPermission.php | 1 + app/Models/AdminUser.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/AdminController.php b/app/Admin/Controllers/AdminController.php index 40cf9b8..f4e10aa 100644 --- a/app/Admin/Controllers/AdminController.php +++ b/app/Admin/Controllers/AdminController.php @@ -19,7 +19,7 @@ abstract class AdminController extends Controller $params['_editable'] = implode(',', $editable); } - return $this->getUpdatePath() . '?' . http_build_query($params); + return $this->getUpdatePath().'?'.http_build_query($params); } public function update(Request $request) diff --git a/app/Admin/Middleware/CheckPermission.php b/app/Admin/Middleware/CheckPermission.php index 88f5191..0c864e9 100644 --- a/app/Admin/Middleware/CheckPermission.php +++ b/app/Admin/Middleware/CheckPermission.php @@ -89,6 +89,7 @@ class CheckPermission ->when(Admin::permission(), fn (Collection $collection, Permission $permission) => $collection->merge($permission->authExcept)->merge($permission->permissionExcept)) ->map(function ($path) { $path = trim((string) config('admin.route.prefix'), '/').'/'.trim((string) $path, '/'); + return ltrim($path, '/'); }) ); diff --git a/app/Models/AdminUser.php b/app/Models/AdminUser.php index 841bc08..070d811 100644 --- a/app/Models/AdminUser.php +++ b/app/Models/AdminUser.php @@ -54,7 +54,7 @@ class AdminUser extends Model } $parent = $allPermissions->get($parent->parent_id); - }; + } } unset($allPermissions, $rolePermissions);