delete:删除冗余

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));
     }
 }
 

catch/permissions/controller/Role.php

@@ -1,7 +1,6 @@
 <?php
 namespace catchAdmin\permissions\controller;
 
-use catchAdmin\permissions\model\Permissions;
 use catchAdmin\permissions\model\Roles;
 use catcher\base\CatchRequest as Request;
 use catcher\base\CatchController;
@@ -156,37 +155,4 @@ class Role extends CatchController
 
         return CatchResponse::success();
     }
-
-    /**
-     *
-     * @time 2019年12月11日
-     * @param Request $request
-     * @param \catchAdmin\permissions\model\Permissions $permission
-     * @return Json
-     */
-    public function getPermissions(Request $request, \catchAdmin\permissions\model\Permissions $permission): Json
-    {
-        $parentRoleHasPermissionIds = [];
-        if ($request->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,
-        ]);
-    }
 }

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,
-        ]);
-    }
-
     /**
      * 导出
      *