From 67b810b06fff947e79fb8d1b79362132828edfe5 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 22 Apr 2020 05:53:38 +0800
Subject: [PATCH] delete user module

---
 catch/{user => permissions}/Auth.php                |  6 ++----
 catch/{user => permissions}/AuthTokenMiddleware.php |  2 +-
 catch/{user => permissions}/controller/User.php     |  2 +-
 .../database/migrations/20191128114204_users.php    |  0
 .../database/seeds/UsersSeed.php                    |  0
 catch/{user => permissions}/model/Users.php         |  7 ++-----
 .../model/search}/UserSearch.php                    |  2 +-
 .../{user => permissions}/request/CreateRequest.php |  3 +--
 .../{user => permissions}/request/UpdateRequest.php |  3 +--
 catch/permissions/route.php                         |  8 ++++++++
 catch/user/module.json                              | 13 -------------
 catch/user/route.php                                |  8 --------
 12 files changed, 17 insertions(+), 37 deletions(-)
 rename catch/{user => permissions}/Auth.php (95%)
 rename catch/{user => permissions}/AuthTokenMiddleware.php (96%)
 rename catch/{user => permissions}/controller/User.php (99%)
 rename catch/{user => permissions}/database/migrations/20191128114204_users.php (100%)
 rename catch/{user => permissions}/database/seeds/UsersSeed.php (100%)
 rename catch/{user => permissions}/model/Users.php (91%)
 rename catch/{user/model => permissions/model/search}/UserSearch.php (92%)
 rename catch/{user => permissions}/request/CreateRequest.php (84%)
 rename catch/{user => permissions}/request/UpdateRequest.php (83%)
 delete mode 100644 catch/user/module.json
 delete mode 100644 catch/user/route.php

diff --git a/catch/user/Auth.php b/catch/permissions/Auth.php
similarity index 95%
rename from catch/user/Auth.php
rename to catch/permissions/Auth.php
index 0a9740a..02bad03 100644
--- a/catch/user/Auth.php
+++ b/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;
 
diff --git a/catch/user/AuthTokenMiddleware.php b/catch/permissions/AuthTokenMiddleware.php
similarity index 96%
rename from catch/user/AuthTokenMiddleware.php
rename to catch/permissions/AuthTokenMiddleware.php
index 4109410..16ad861 100644
--- a/catch/user/AuthTokenMiddleware.php
+++ b/catch/permissions/AuthTokenMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user;
+namespace catchAdmin\permissions;
 
 use catcher\Code;
 use catcher\exceptions\FailedException;
diff --git a/catch/user/controller/User.php b/catch/permissions/controller/User.php
similarity index 99%
rename from catch/user/controller/User.php
rename to catch/permissions/controller/User.php
index 8c7e422..3070c10 100644
--- a/catch/user/controller/User.php
+++ b/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;
diff --git a/catch/user/database/migrations/20191128114204_users.php b/catch/permissions/database/migrations/20191128114204_users.php
similarity index 100%
rename from catch/user/database/migrations/20191128114204_users.php
rename to catch/permissions/database/migrations/20191128114204_users.php
diff --git a/catch/user/database/seeds/UsersSeed.php b/catch/permissions/database/seeds/UsersSeed.php
similarity index 100%
rename from catch/user/database/seeds/UsersSeed.php
rename to catch/permissions/database/seeds/UsersSeed.php
diff --git a/catch/user/model/Users.php b/catch/permissions/model/Users.php
similarity index 91%
rename from catch/user/model/Users.php
rename to catch/permissions/model/Users.php
index b84cfe2..fe05e42 100644
--- a/catch/user/model/Users.php
+++ b/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
diff --git a/catch/user/model/UserSearch.php b/catch/permissions/model/search/UserSearch.php
similarity index 92%
rename from catch/user/model/UserSearch.php
rename to catch/permissions/model/search/UserSearch.php
index 32254ee..fc1cc05 100644
--- a/catch/user/model/UserSearch.php
+++ b/catch/permissions/model/search/UserSearch.php
@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\user\model;
+namespace catchAdmin\permissions\model\search;
 
 trait UserSearch
 {
diff --git a/catch/user/request/CreateRequest.php b/catch/permissions/request/CreateRequest.php
similarity index 84%
rename from catch/user/request/CreateRequest.php
rename to catch/permissions/request/CreateRequest.php
index 5382fbc..7e56e57 100644
--- a/catch/user/request/CreateRequest.php
+++ b/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,
         ];
     }
diff --git a/catch/user/request/UpdateRequest.php b/catch/permissions/request/UpdateRequest.php
similarity index 83%
rename from catch/user/request/UpdateRequest.php
rename to catch/permissions/request/UpdateRequest.php
index b82758b..79ac79f 100644
--- a/catch/user/request/UpdateRequest.php
+++ b/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,
         ];
     }
diff --git a/catch/permissions/route.php b/catch/permissions/route.php
index 5d14b76..457325a 100644
--- a/catch/permissions/route.php
+++ b/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');
\ No newline at end of file
diff --git a/catch/user/module.json b/catch/user/module.json
deleted file mode 100644
index 75a263b..0000000
--- a/catch/user/module.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "用户管理",
-  "alias": "user",
-  "description": "",
-  "keywords": [],
-  "order": 2,
-  "services": [
-    "catchAdmin\\user\\UserService"
-  ],
-  "aliases": {},
-  "files": [],
-  "requires": []
-}
\ No newline at end of file
diff --git a/catch/user/route.php b/catch/user/route.php
deleted file mode 100644
index 4616e88..0000000
--- a/catch/user/route.php
+++ /dev/null
@@ -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');