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()