pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整权限返回

dev
vine_liutk 2023-10-20 15:41:14 +08:00
parent 5fd786e6a6
commit a557c1c1ab
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/AdminPermissionController.php
View File

@ -27,6 +27,7 @@ class AdminPermissionController extends Controller
$res[] = [ $res[] = [
'id' => $permission->id, 'id' => $permission->id,
'label' => $permission->name, 'label' => $permission->name,
'slug' => $permission->slug,
'children' => $this->formatPermissionsTreeToArray($permission->children ?? []), 'children' => $this->formatPermissionsTreeToArray($permission->children ?? []),
]; ];
} }

9
app/Http/Controllers/AuthController.php
View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\AdminUser; use App\Models\AdminUser;
use App\Models\AdminPermission;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
@ -34,6 +35,12 @@ class AuthController extends Controller
{ {
$token = $user->createToken($name)->plainTextToken; $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]);
} }
} }

9
app/Http/Controllers/UserController.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Http\Requestes\RestPasswordRequest; use App\Http\Requestes\RestPasswordRequest;
use App\Services\OperationLogService; use App\Services\OperationLogService;
use App\Enums\OperationType; use App\Enums\OperationType;
use App\Models\AdminPermission;
class UserController extends Controller class UserController extends Controller
{ {
@ -12,7 +13,13 @@ class UserController extends Controller
{ {
$user = auth('api')->user(); $user = auth('api')->user();
return $this->json(['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(['info' => $user, 'permissions' => $user->permissionIds(), 'permissions_slug'=>$permissions]);
} }
public function resetPwd(RestPasswordRequest $request) public function resetPwd(RestPasswordRequest $request)