delete user module

catch/permissions/Auth.php

@@ -1,11 +1,9 @@
 <?php
-namespace catchAdmin\user;
+namespace catchAdmin\Auth;
 
 use catchAdmin\permissions\model\Permissions;
-use catchAdmin\permissions\model\Roles;
-use catchAdmin\user\model\Users;
+use catchAdmin\permission\model\Users;
 use catcher\exceptions\LoginFailedException;
-use catcher\Tree;
 use thans\jwt\facade\JWTAuth;
 use think\facade\Session;
 

catch/permissions/AuthTokenMiddleware.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user;
+namespace catchAdmin\permissions;
 
 use catcher\Code;
 use catcher\exceptions\FailedException;

catch/permissions/controller/User.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user\controller;
+namespace catchAdmin\permissions\controller;
 
 use catcher\base\CatchRequest as Request;
 use catchAdmin\permissions\model\Permissions;

catch/permissions/model/Users.php

@@ -1,10 +1,7 @@
 <?php
-namespace catchAdmin\user\model;
+namespace catchAdmin\permissions\model;
 
-use catchAdmin\permissions\model\Department;
-use catchAdmin\permissions\model\HasJobsTrait;
-use catchAdmin\permissions\model\HasRolesTrait;
-use catchAdmin\permissions\model\Permissions;
+use catchAdmin\permissions\model\search\UserSearch;
 use catcher\base\CatchModel;
 
 class Users extends CatchModel

catch/permissions/model/search/UserSearch.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user\model;
+namespace catchAdmin\permissions\model\search;
 
 trait UserSearch
 {

catch/permissions/request/CreateRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user\request;
+namespace catchAdmin\permission\request;
 
 use catchAdmin\user\model\Users;
 use catcher\base\CatchRequest;
@@ -13,7 +13,6 @@ class CreateRequest extends CatchRequest
         return [
             'username|用户名' => 'require|max:20',
             'password|密码' => 'require|min:5|max:12',
-            'passwordConfirm|密码' => 'confirm:password',
             'email|邮箱'    => 'require|email|unique:'.Users::class,
         ];
     }

catch/permissions/request/UpdateRequest.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user\request;
+namespace catchAdmin\permission\request;
 
 use catchAdmin\user\model\Users;
 use catcher\base\CatchRequest;
@@ -12,7 +12,6 @@ class UpdateRequest extends CatchRequest
         return [
             'username|用户名' => 'require|max:20',
             'password|密码' => 'sometimes|min:5|max:12',
-            'passwordConfirm|密码' => 'sometimes|confirm:password',
             'email|邮箱'    => 'require|email|unique:'.Users::class,
         ];
     }

catch/permissions/route.php

@@ -11,3 +11,11 @@ $router->resource('departments', '\catchAdmin\permissions\controller\Department'
 $router->resource('jobs', '\catchAdmin\permissions\controller\Job');
 
 $router->get('jobs/all', '\catchAdmin\permissions\controller\Job@getAll');
+
+// 用户
+$router->resource('users', '\catchAdmin\user\controller\User');
+// 切换状态
+$router->put('users/switch/status/<id>', '\catchAdmin\user\controller\User@switchStatus');
+$router->put('users/recover/<id>', '\catchAdmin\user\controller\User@recover');
+$router->get('users/get/roles', '\catchAdmin\user\controller\User@getRoles');
+$router->get('user/info', '\catchAdmin\user\controller\User@info');

catch/user/module.json

@@ -1,13 +0,0 @@
-{
-  "name": "用户管理",
-  "alias": "user",
-  "description": "",
-  "keywords": [],
-  "order": 2,
-  "services": [
-    "catchAdmin\\user\\UserService"
-  ],
-  "aliases": {},
-  "files": [],
-  "requires": []
-}

catch/user/route.php

@@ -1,8 +0,0 @@
-<?php
-
-$router->resource('users', '\catchAdmin\user\controller\User');
-// 切换状态
-$router->put('users/switch/status/<id>', '\catchAdmin\user\controller\User@switchStatus');
-$router->put('users/recover/<id>', '\catchAdmin\user\controller\User@recover');
-$router->get('users/get/roles', '\catchAdmin\user\controller\User@getRoles');
-$router->get('user/info', '\catchAdmin\user\controller\User@info');