diff --git a/app/Http/Controllers/Role/RolesController.php b/app/Http/Controllers/Role/RolesController.php index 93ecc3d..2f861c2 100644 --- a/app/Http/Controllers/Role/RolesController.php +++ b/app/Http/Controllers/Role/RolesController.php @@ -24,7 +24,15 @@ class RolesController extends Controller public function index() { - $roles = Role::query()->get(); + $roles = Role::query()->with('permissions')->get()->toArray(); + $routes = include(resource_path('lang/zh-CN/permission.php')); + foreach ($roles as &$role) { + $permissions = []; + foreach ($role['permissions'] as $item) { + $permissions[] = $routes[$item['name']]['name']; + } + $role['permissions'] = $permissions; + } return RolesResource::collection($roles); } diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php index b8f8ae4..0973abd 100644 --- a/app/Http/Middleware/CheckPermissions.php +++ b/app/Http/Middleware/CheckPermissions.php @@ -31,7 +31,7 @@ class CheckPermissions $res = [ 'httpCode' => 403, 'errorCode' => 403403, - 'errorMessage' => '您没有使用此功能的权限', + 'errorMessage' => '您没有使用此功能的权限' . $currentRouteName, ]; return response($res, 403); } diff --git a/app/Models/Shop.php b/app/Models/Shop.php index bd806c3..cee46e5 100644 --- a/app/Models/Shop.php +++ b/app/Models/Shop.php @@ -16,6 +16,8 @@ class Shop extends Model 'pop_auth_token_create_response', ]; + protected $guarded = []; + public function getStatusAttribute($value) { $map = [ diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php index 7493111..7ac3875 100644 --- a/resources/lang/zh-CN/permission.php +++ b/resources/lang/zh-CN/permission.php @@ -149,27 +149,27 @@ return [ 'name' => '用户管理', 'parent_id' => 0, ], - 'user.index' => [ + 'users.index' => [ 'id' => 60, 'name' => '列表', 'parent_id' => 6, ], - 'user.store' => [ + 'users.store' => [ 'id' => 61, 'name' => '新增', 'parent_id' => 6, ], - 'user.show' => [ + 'users.show' => [ 'id' => 62, 'name' => '查看', 'parent_id' => 6, ], - 'user.update' => [ + 'users.update' => [ 'id' => 63, 'name' => '更新', 'parent_id' => 6, ], - 'user.destroy' => [ + 'users.destroy' => [ 'id' => 64, 'name' => '删除', 'parent_id' => 6, @@ -185,27 +185,27 @@ return [ 'name' => '角色管理', 'parent_id' => 7, ], - 'role.index' => [ + 'roles.index' => [ 'id' => 80, 'name' => '列表', 'parent_id' => 8, ], - 'role.store' => [ + 'roles.store' => [ 'id' => 81, 'name' => '新增', 'parent_id' => 8, ], - 'role.show' => [ + 'roles.show' => [ 'id' => 82, 'name' => '查看', 'parent_id' => 8, ], - 'role.update' => [ + 'roles.update' => [ 'id' => 83, 'name' => '更新', 'parent_id' => 8, ], - 'role.permission' => [ + 'roles.permission' => [ 'id' => 84, 'name' => '设置权限', 'parent_id' => 8,