From 6630058508944fef9e5141944bda965d08a94cbe Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Sat, 3 Apr 2021 10:35:53 +0800 Subject: [PATCH] =?UTF-8?q?delete:=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- catch/permissions/controller/Permission.php | 28 +------------ catch/permissions/controller/Role.php | 34 ---------------- catch/permissions/controller/User.php | 45 --------------------- catch/permissions/route.php | 6 --- catch/permissions/tables/Department.php | 4 +- catch/permissions/tables/Job.php | 4 +- catch/permissions/tables/Permission.php | 4 +- catch/permissions/tables/Role.php | 2 +- catch/permissions/tables/User.php | 9 +++-- 9 files changed, 14 insertions(+), 122 deletions(-) diff --git a/catch/permissions/controller/Permission.php b/catch/permissions/controller/Permission.php index 2052952..a42eac2 100644 --- a/catch/permissions/controller/Permission.php +++ b/catch/permissions/controller/Permission.php @@ -176,33 +176,7 @@ class Permission extends CatchController */ public function show($id) { - $this->permissions->show($id); - - return CatchResponse::success(); - } - - /** - * - * @time 2020年06月05日 - * @param $id - * @param ParseClass $parseClass - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @return Json - */ - public function getMethods($id, ParseClass $parseClass) - { - $permission = Permissions::where('id', $id)->find(); - $module = $permission->module; - $controller = explode('@', $permission->permission_mark)[0]; - - try { - $methods = $parseClass->setModule('catch')->setRule($module, $controller)->onlySelfMethods(); - return CatchResponse::success($methods); - }catch (\Exception $e) { - return CatchResponse::success([]); - } + return CatchResponse::success($this->permissions->show($id)); } } diff --git a/catch/permissions/controller/Role.php b/catch/permissions/controller/Role.php index 4692234..b211706 100644 --- a/catch/permissions/controller/Role.php +++ b/catch/permissions/controller/Role.php @@ -1,7 +1,6 @@ param('parent_id')) { - $this->role->findBy($request->param('parent_id')) - ->getPermissions() - ->each(function ($permission) use (&$parentRoleHasPermissionIds){ - $parentRoleHasPermissionIds[] = $permission->pivot->permission_id; - }); - } - - $permissionIds = []; - if ($request->param('role_id')) { - $this->role->findBy($request->param('role_id')) - ->getPermissions() - ->each(function ($permission) use (&$roleHasPermissions){ - $permissionIds[] = $permission->pivot->permission_id; - }); - } - - return CatchResponse::success([ - 'permissions' => Permissions::whereIn('id', $parentRoleHasPermissionIds)->select()->toTree(), - 'hasPermissions' => $permissionIds, - ]); - } } diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php index 9e82b4d..76b47bb 100644 --- a/catch/permissions/controller/User.php +++ b/catch/permissions/controller/User.php @@ -171,51 +171,6 @@ class User extends CatchController return CatchResponse::success([], '操作成功'); } - /** - * - * @time 2019年12月07日 - * @param $id - * @return \think\response\Json - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\db\exception\DataNotFoundException - */ - public function recover($id): \think\response\Json - { - $trashedUser = $this->user->findBy($id, ['*'], true); - - if ($this->user->where('email', $trashedUser->email)->find()) { - return CatchResponse::fail(sprintf('该恢复用户的邮箱 [%s] 已被占用', $trashedUser->email)); - } - - return CatchResponse::success($this->user->recover($id)); - } - - /** - * - * @time 2019年12月11日 - * @param Request $request - * @param Roles $roles - * @return \think\response\Json - */ - public function getRoles(Request $request, Roles $roles): \think\response\Json - { - $roles = Tree::done($roles->getList()); - - $roleIds = []; - if ($request->param('uid')) { - $userHasRoles = $this->user->findBy($request->param('uid'))->getRoles(); - foreach ($userHasRoles as $role) { - $roleIds[] = $role->pivot->role_id; - } - } - - return CatchResponse::success([ - 'roles' => $roles, - 'hasRoles' => $roleIds, - ]); - } - /** * 导出 * diff --git a/catch/permissions/route.php b/catch/permissions/route.php index 7f482a3..16d7b41 100644 --- a/catch/permissions/route.php +++ b/catch/permissions/route.php @@ -5,13 +5,9 @@ $router->group(function () use ($router){ // 角色 $router->resource('roles', '\catchAdmin\permissions\controller\Role'); - // 角色列表 - $router->get('/role/get/permissions', '\catchAdmin\permissions\controller\Role@getPermissions'); // 权限 $router->resource('permissions', '\catchAdmin\permissions\controller\Permission'); $router->put('permissions/show/', '\catchAdmin\permissions\controller\Permission@show'); - $router->get('controller/methods/', '\catchAdmin\permissions\controller\Permission@getMethods'); - // 部门 $router->resource('departments', '\catchAdmin\permissions\controller\Department'); // 所有职位 @@ -22,9 +18,7 @@ $router->group(function () use ($router){ $router->resource('users', '\catchAdmin\permissions\controller\User'); // 切换状态 $router->put('users/switch/status/', '\catchAdmin\permissions\controller\User@switchStatus'); - $router->put('users/recover/', '\catchAdmin\permissions\controller\User@recover'); $router->put('user/profile', '\catchAdmin\permissions\controller\User@profile'); - $router->get('users/get/roles', '\catchAdmin\permissions\controller\User@getRoles'); $router->get('user/info', '\catchAdmin\permissions\controller\User@info'); $router->get('user/export', '\catchAdmin\permissions\controller\User@export'); })->middleware('auth'); \ No newline at end of file diff --git a/catch/permissions/tables/Department.php b/catch/permissions/tables/Department.php index b50692c..e851882 100644 --- a/catch/permissions/tables/Department.php +++ b/catch/permissions/tables/Department.php @@ -25,8 +25,8 @@ class Department extends CatchTable HeaderItem::label('状态')->prop('status')->withSwitchComponent(), HeaderItem::label('创建时间')->prop('created_at'), HeaderItem::label('操作')->width(260)->actions([ - Actions::update(''), - Actions::delete(''), + Actions::update(), + Actions::delete(), ]) ])->withApiRoute('departments')->withActions([ Actions::create() diff --git a/catch/permissions/tables/Job.php b/catch/permissions/tables/Job.php index 0706c99..72d3d7e 100644 --- a/catch/permissions/tables/Job.php +++ b/catch/permissions/tables/Job.php @@ -20,8 +20,8 @@ class Job extends CatchTable HeaderItem::label('状态')->prop('status')->withSwitchComponent(), HeaderItem::label('创建时间')->prop('created_at'), HeaderItem::label('操作')->width(250)->actions([ - Actions::update(''), - Actions::delete('') + Actions::update(), + Actions::delete() ]) ]) ->withActions([ diff --git a/catch/permissions/tables/Permission.php b/catch/permissions/tables/Permission.php index d09c8b8..1f752e8 100644 --- a/catch/permissions/tables/Permission.php +++ b/catch/permissions/tables/Permission.php @@ -20,8 +20,8 @@ class Permission extends CatchTable HeaderItem::label('状态')->prop('hidden')->component('status'), HeaderItem::label('创建时间')->prop('created_at'), HeaderItem::label('操作')->width(250)->actions([ - Actions::update(''), - Actions::delete('') + Actions::update(), + Actions::delete() ]) ]) ->withActions([ diff --git a/catch/permissions/tables/Role.php b/catch/permissions/tables/Role.php index b14208b..3af7915 100644 --- a/catch/permissions/tables/Role.php +++ b/catch/permissions/tables/Role.php @@ -20,7 +20,7 @@ class Role extends CatchTable HeaderItem::label('角色描述')->prop('description'), HeaderItem::label('创建时间')->prop('created_at'), HeaderItem::label('操作')->width(250)->actions([ - Actions::update(''), Actions::delete('') + Actions::update(), Actions::delete() ]) ]) ->withSearch([ diff --git a/catch/permissions/tables/User.php b/catch/permissions/tables/User.php index 4f0dd4b..dc43a52 100644 --- a/catch/permissions/tables/User.php +++ b/catch/permissions/tables/User.php @@ -20,8 +20,8 @@ class User extends CatchTable HeaderItem::label('邮箱')->prop('email'), HeaderItem::label('状态')->prop('status')->component('status', 'status'), HeaderItem::label('创建时间')->prop('created_at'), - HeaderItem::label('操作')->width(150)->actions([ - Actions::update(''), Actions::delete('') + HeaderItem::label('操作')->width(200)->actions([ + Actions::update(), Actions::delete() ]) ]) ->withSearch([ @@ -31,8 +31,11 @@ class User extends CatchTable ]) ->withApiRoute('users') ->withActions([ - Actions::create() + Actions::create(), + Actions::export(), + Actions::import() ]) + ->withExportRoute('user/export') ->withFilterParams([ 'username' => '', 'email' => '',