From fad4cbc9e8a89f66ddf2b8b04d9eb41b6013afa3 Mon Sep 17 00:00:00 2001 From: Boen_Shi Date: Thu, 30 Apr 2026 10:48:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9D=83=E9=99=90=E5=A4=87=E6=B3=A8=E4=B8=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E6=98=B5=E7=A7=B0=E5=92=8C=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/ServerResourceController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ServerResourceController.php b/app/Http/Controllers/Api/ServerResourceController.php index afa0959..96a7620 100644 --- a/app/Http/Controllers/Api/ServerResourceController.php +++ b/app/Http/Controllers/Api/ServerResourceController.php @@ -576,7 +576,11 @@ class ServerResourceController extends Controller public static function resourcePermissionDescription(ServerResource $resource): string { - return '服务器资源访问权限(资源ID: '.$resource->id.')'; + $resource->loadMissing('parent'); + $serverLabel = trim((string) ($resource->parent?->display_name ?: $resource->parent?->name ?: '未命名服务器')); + $resourceLabel = trim((string) ($resource->display_name ?: $resource->name ?: '未命名资源')); + + return sprintf('服务器资源访问权限(%s-%s,资源ID: %d)', $serverLabel, $resourceLabel, (int) $resource->id); } private function syncResourcePermission(ServerResource $resource): Permission @@ -614,7 +618,7 @@ class ServerResourceController extends Controller { Permission::query() ->where('guard_name', 'api') - ->where('description', '服务器资源访问权限(资源ID: '.$resourceId.')') + ->where('description', 'like', '%资源ID: '.$resourceId.'%') ->delete(); UserServerPermission::query()