fix(control): 获取用户相关信息

Author: lisgroup

laravel/app/Http/Controllers/Api/RoleController.php

@@ -20,7 +20,7 @@ class RoleController extends Controller
 
     public function __construct(Request $request)
     {
-        // $this->middleware(['auth', 'isAdmin']); // isAdmin 中间件让具备指定权限的用户才能访问该资源
+        // $this->middleware(['auth:api', 'role']); // role 中间件让具备指定权限的用户才能访问该资源
 
         $perPage = intval($request->input('perPage'));
         $this->perPage = $perPage ?? 11;

laravel/app/Http/Controllers/Api/UserController.php

@@ -84,13 +84,14 @@ public function store(StoreUserRequest $request)
      * Display the specified resource.
      * 展示某个详情数据
      *
-     * @param User $User
+     * @param User $user
      *
      * @return \Illuminate\Http\Response
      */
-    public function show(User $User)
+    public function show(User $user)
     {
-        return $this->out(200, $User);
+        $roles = Role::all();
+        return $this->out(200, ['roles' => $roles, 'checkedRoles' => array_column($user->roles->toArray(), 'id'), 'user' => $user]);
     }
 
     /**

laravel/app/User.php

@@ -113,7 +113,7 @@ function hasPermission($permissions, $option = [])
     {
         $option = array_merge(['valid_all' => false,], $option);
         if (!is_array($permissions)) $permissions = [$permissions];
-        $gates = cacheUserRolesAndPermissions(\Auth::id());
+        $gates = cacheUserRolesAndPermissions(\Auth::id(), true);
 
         foreach ($permissions as $permission) {
             if (in_array($permission, $gates['permissions'])) {