From a557c1c1ab5ec7ed5703b5fdf011449d9eb0bcac Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 20 Oct 2023 15:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AdminPermissionController.php | 1 +
 app/Http/Controllers/AuthController.php            | 9 ++++++++-
 app/Http/Controllers/UserController.php            | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AdminPermissionController.php b/app/Http/Controllers/AdminPermissionController.php
index 7437348..c265e0a 100644
--- a/app/Http/Controllers/AdminPermissionController.php
+++ b/app/Http/Controllers/AdminPermissionController.php
@@ -27,6 +27,7 @@ class AdminPermissionController extends Controller
             $res[] = [
                 'id' => $permission->id,
                 'label' => $permission->name,
+                'slug'  => $permission->slug,
                 'children' => $this->formatPermissionsTreeToArray($permission->children ?? []),
             ];
         }
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 48e5f8b..12b8cc0 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AdminUser;
+use App\Models\AdminPermission;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 
@@ -34,6 +35,12 @@ class AuthController extends Controller
     {
         $token = $user->createToken($name)->plainTextToken;
 
-        return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds()]);
+        $permissionsQuery = AdminPermission::query();
+        if($user->id != 1){
+            $permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
+        }
+        $permissions = $permissionsQuery->pluck('slug')->toArray();
+
+        return $this->json(['token' => $token, 'info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9adb5a0..87ba37d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -5,14 +5,21 @@ namespace App\Http\Controllers;
 use App\Http\Requestes\RestPasswordRequest;
 use App\Services\OperationLogService;
 use App\Enums\OperationType;
+use App\Models\AdminPermission;
 
 class UserController extends Controller
 {
     public function info()
     {
         $user = auth('api')->user();
+        
+        $permissionsQuery = AdminPermission::query();
+        if($user->id != 1){
+            $permissions = $permissionsQuery->whereIn('id', $user->permissionIds());
+        }
+        $permissions = $permissionsQuery->pluck('slug')->toArray();
 
-        return $this->json(['info' => $user, 'permissions' => $user->permissionIds()]);
+        return $this->json(['info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
     }
 
     public function resetPwd(RestPasswordRequest $request)