update:微信模块初始化未安装状态

:^O

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -0,0 +1,24 @@
+# 环境
+- 操作系统:
+- php 版本:
+- thinkphp 版本:
+- Mysql 版本:
+- web 服务器:
+
+# 问题
+- 问题描述:
+- 问题截图:
+
+# 结果
+- 实际结果:
+- 预期结果:
+
+# 分析
+- 所做的尝试:
+    -
+    -
+
+# 方案:
+- 解决方案:
+
+> 请在问题解决后关闭 issue

.github/issue_template.md

@@ -0,0 +1,25 @@
+# 环境
+- 操作系统:
+- php 版本:
+- thinkphp 版本:
+- Mysql 版本:
+- web 服务器:
+
+# 问题
+- 问题描述:
+
+- 问题截图:
+
+# 结果
+- 实际结果:
+- 预期结果:
+
+# 分析
+- 所做的尝试:
+    -
+    -
+
+# 方案:
+- 解决方案:
+
+> 请在问题解决后关闭 issue

.gitignore

@@ -1,6 +1,8 @@
 /.idea
 /.vscode
 /vendor
-/database
+/package
 *.log
 .env
+composer.lock
+

LICENSE.txt

@@ -1,32 +1,201 @@
+ Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
-All rights reserved。
-ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
 
-Apache Licence是著名的非盈利开源组织Apache采用的协议。
+   1. Definitions.
-该协议和BSD类似，鼓励代码共享和尊重原作者的著作权，
-允许代码修改，再作为开源或商业软件发布。需要满足
-的条件： 
-1． 需要给代码的用户一份Apache Licence ；
-2． 如果你修改了代码，需要在被修改的文件中说明；
-3． 在延伸的代码中（修改和有源代码衍生的代码中）需要
-带有原来代码中的协议，商标，专利声明和其他原来作者规
-定需要包含的说明；
-4． 如果再发布的产品中包含一个Notice文件，则在Notice文
-件中需要带有本协议内容。你可以在Notice中增加自己的
-许可，但不可以表现为对Apache Licence构成更改。 
-具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+      "License" shall mean the terms and conditions for use, reproduction,
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+      and distribution as defined by Sections 1 through 9 of this document.
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+      "Licensor" shall mean the copyright owner or entity authorized by
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+      the copyright owner that is granting the License.
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+      "Legal Entity" shall mean the union of the acting entity and all
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+      other entities that control, are controlled by, or are under common
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      control with that entity. For the purposes of this definition,
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+      "control" means (i) the power, direct or indirect, to cause the
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      direction or management of such entity, whether by contract or
-POSSIBILITY OF SUCH DAMAGE.
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,47 +1,160 @@
-## CatchAdmin
+<p align="center">
+    <img src="https://cdn.learnku.com/uploads/images/202005/17/18206/zSuf7Ce5kM.png!large">
+</p>
 
-## 5.1 版本的请使用 tag1.0 版本
+
-## 新版后台在开发中 请不要使用
+<p align="center"><code>CatchAdmin</code>是一款基于<a href="http://www.thinkphp.cn/" target="_blank">thinkphp framework</a>和
-### 环境要求
+<a href="https://github.com/PanJiaChen/vue-element-admin/">element admin</a>二次开发而成后台管理系统。因为 thinkphp 的简单高效，文档齐全。在看了很多 thinkphp 生态中的后台管理系统，发现没有一款合适的前后端分离系统。遂开发了 CatchAdmin。
+完全利用了 thinkphp6 的新版本特性 ServiceProvider，将管理系统模块之间的耦合降到了最低限度。每个模块之间都有独立的 controller，路由，模型，数据表`。在开发上尽可能将模块之间的影响降到最低，降低了开发上的难度。基于 CatchAdmin 可以开发 cms，CRM，OA 等
+等系统。也封装了很多实用的工具，提升开发体验。
+</p>
+
+<p align="center">
+<a href="http://doc.catchadmin.com/">文档</a> |
+<a href="http://vue.catchadmin.com">演示地址</a> |
+<a href="http://apidoc.catchadmin.com">接口文档</a> |
+<a href="https://gitee.com/jaguarjack/catchAdmin">项目源码</a> |
+<a href="https://www.kancloud.cn/akasishikelu/thinkphp6">看云分析</a> 
+<a href="#extensions">扩展</a>
+</p>
+
+<p align="center">
+    <a href="https://gitee.com/jaguarjack/catchAdmin" target="_blank">
+        <img src="https://svg.hamm.cn/gitee.svg?type=star&user=jaguarjack&project=catchAdmin"/>
+    </a >
+    <a href="https://gitee.com/jaguarjack/catchAdmin" target="_blank">
+        <img src="https://svg.hamm.cn/gitee.svg?type=fork&user=jaguarjack&project=catchAdmin"/>
+    </a >
+    <img src="https://svg.hamm.cn/badge.svg?key=Base&value=ThinkPHP6"/>
+    <img src="https://svg.hamm.cn/badge.svg?key=Data&value=MySQL5.5"/>
+    <img src="https://svg.hamm.cn/badge.svg?key=Runtime&value=PHP7.1"/>
+    <img src="https://svg.hamm.cn/badge.svg?key=License&value=Apache-2.0"/>
+</p >
+
+## 功能
+- [x] `用户管理` 后台用户管理
+- [x] `部门管理` 配置公司的部门结构，支持树形结构
+- [x] `岗位管理` 配置后台用户的职务
+- [x] `菜单管理` 配置系统菜单，按钮等等
+- [x] `角色管理` 配置用户担当的角色，分配权限
+- [x] `数据字典` 管理后台表结构
+- [x] `操作日志` 后台用户操作记录
+- [x] `登录日志` 后台系统用户的登录记录
+- [x] `代码生成` 生成 API 端的 CURD 操作
+- [x] `敏感词`  支持敏感词配置
+- [x] `附件管理` 可管理上传的文件
+- [ ] `微信管理`
+
+## 项目地址
+- [github 地址](https://github.com/yanwenwu/catch-admin)
+- [gitee 地址](https://gitee.com/jaguarjack/catchAdmin)
+- [前端 Vue 项目地址](https://github.com/yanwenwu/catch-admin-vue)
+- [文档地址](https://github.com/catch-admin/document)[个人精力实在有限,希望可以小伙伴们可以一起维护文档]
+## 预览
+<table>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucNXq.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucm6I.md.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucZpd.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wuce1A.md.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucnXt.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucKnP.md.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wuc3tg.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucM0f.md.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucQ78.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wuc1AS.md.png"></td>
+    </tr>
+     <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wuc8hQ.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucY1s.md.png"></td>
+    </tr>
+    <tr>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wucJpj.md.png"></td>
+        <td><img src="https://s1.ax1x.com/2020/09/07/wuctcn.md.png"></td>
+    </tr>
+</table>
+
+## 环境要求
 - php7.1+ (需以下扩展)
-    - mbstring
+    - [x] mbstring
-    - json
+    - [x] json
-    - openssl
+    - [x] openssl
-    - xml
+    - [x] xml
-    - pdo
+    - [x] pdo
 - nginx
 - mysql
 
-### install
+### 如何安装
-- curl -sS http://install.phpcomposer.com/installer | php
+> 安装之前请确保已安装 Composer
-- composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
-- composer update
-- php think catch:install 
 
-### Use
+#### 下载项目
-- 配置虚拟域名 OR 在根目录下执行 php think run
+- 通过 Git 下载(推荐)
-- yourUrl/login
+```shell
-- 默认用户名 admin@gmail.com 密码 admin
+git clone https://gitee.com/jaguarjack/catchAdmin && cd catchAdmin
 
-### Problem
+curl -sS https://install.phpcomposer.com/installer | php
-> SQLSTATE[42000]: Syntax error or access violation: 1067 Invalid default value for 'updated_at'
+
+composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
+
+composer install
 
-> 设置 sql_mode;
 ```
-show variables like 'sql_mode' ; 
+- composer 安装
-remove 'NO_ZERO_IN_DATE,NO_ZERO_DATE'
+```shell
+composer create-project jaguarjack/catchadmin:dev-master
 ```
-> SET GLOBAL sql_mode='STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
 
-### Talking
+#### 安装
-- 可以提 ISSUE，请按照 issue 模板提问
+下载完成之后通过命令来进行安装, 一键安装 🚀
-- 欢迎进入 Q 群，可以及时反馈一些问题。
+```shell
-- ![输入图片说明](https://images.gitee.com/uploads/images/2018/1219/110300_0257b6c0_810218.jpeg "微信图片_20181219105915.jpg")
+ php think catch:install 
-
+```
-仅供学习
 
 ## 体验地址
 
-[体验地址](http://catch.njphper.com/login)
+[体验地址](http://vue.catchadmin.com)
-- 账号: test@catch.com 
+- 账号: admin@gmail.com
-- 密码: 123456
+- 密码: admin
+
+[catchadmin 文档地址](http://doc.catchadmin.com)
+
+### 系列文章
+如果是刚开始使用 thinkphp6, 以下文章可能会对你有些许帮助，文章基于 RC3 版本。整体架构是不变的。
+- [Tp6 启动分析](https://www.kancloud.cn/akasishikelu/thinkphp6/1129385)
+- [Tp6 Request 解析](https://www.kancloud.cn/akasishikelu/thinkphp6/1134496)
+- [TP6 应用初始化](https://www.kancloud.cn/akasishikelu/thinkphp6/1130427)
+- [Tp6 中间件分析](https://www.kancloud.cn/akasishikelu/thinkphp6/1136616)
+- [Tp6 请求流程](https://www.kancloud.cn/akasishikelu/thinkphp6/1136608)
+
+### Donate
+如果你觉得项目对你有帮助，可以请作者喝杯咖啡☕️！鼓励下
+<img src="https://cdn.learnku.com/uploads/images/202008/11/18206/e6qAAM8Bod.jpg!large">
+
+### Talking
+- [论坛讨论](http://bbs.catchadmin.com)
+- 可以提 `ISSUE`，请按照 `issue` 模板提问
+- 加入 Q 群 `302266230` 讨论以及反馈一些问题。
+    - 加群需要付费，所以请使用能支持群费的客户端。(不喜勿喷，过滤一部分不看文档和 TP 框架文档并且衣来伸手饭来张口的用户)
+    - 不建议你付费入群，认真阅读文档可以解决所有问题
+    - 更愿意以 `ISSUE` 的方式提问
+    - 付费入群，群里的各位也是没有义务回答各种各样的基础问题。请 GOOGLE。
+
+### Thanks
+> 排名部分先后
+
+- [top-think/think](https://github.com/top-think/think)
+- [element-admin](https://panjiachen.gitee.io/vue-element-admin-site/zh/)
+- [thans/tp-jwt-auth](https://packagist.org/packages/thans/tp-jwt-auth)
+- [workerman/workerman](https://github.com/walkor/Workerman)
+- [jaguarjack/think-filesystem-cloud](https://github.com/yanwenwu/think-filesystem-cloud)
+- [overtrue/wechat](https://github.com/overtrue/wechat)
+- [jaguarjack/migration-generator](https://github.com/yanwenwu/migration-generator)
+- [phpoffice/phpspreadsheet](https://github.com/PHPOffice/PhpSpreadsheet)

app/BaseController.php

@@ -3,11 +3,8 @@ declare (strict_types = 1);
 
 namespace app;
 
-use catcher\CatchAdmin;
 use think\App;
 use think\exception\ValidateException;
-use think\facade\View;
-use think\helper\Str;
 use think\Validate;
 
 /**

app/ExceptionHandle.php

@@ -1,11 +1,6 @@
 <?php
 namespace app;
 
-use catcher\CatchResponse;
-use catcher\exceptions\CatchException;
-use catcher\exceptions\FailedException;
-use catcher\exceptions\LoginFailedException;
-use catcher\exceptions\PermissionForbiddenException;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\ModelNotFoundException;
 use think\exception\Handle;
@@ -56,10 +51,7 @@ class ExceptionHandle extends Handle
      */
     public function render($request, Throwable $e): Response
     {
-       // if ($e instanceof CatchException){
-        return CatchResponse::fail($e->getMessage(), $e->getCode());
-       // }
         // 其他错误交给系统处理
-        //return parent::render($request, $e);
+        return parent::render($request, $e);
     }
 }

app/Request.php

@@ -3,12 +3,51 @@ namespace app;
 
 // 应用请求对象类
 
-use catchAdmin\user\Auth;
+use catchAdmin\permissions\model\Users;
+use catcher\CatchAuth;
+use catcher\Code;
+use catcher\exceptions\FailedException;
+use catcher\exceptions\LoginFailedException;
+use thans\jwt\exception\TokenBlacklistException;
+use thans\jwt\exception\TokenExpiredException;
+use thans\jwt\exception\TokenInvalidException;
 
 class Request extends \think\Request
 {
-    public function user()
+    protected $auth;
+
+    /**
+     * login user
+     *
+     * @time 2020年01月09日
+     * @param null $guard
+     * @return mixed
+     */
+  public function user($guard = null)
   {
-        return Auth::user();
+    if (!$this->auth) {
+      $this->auth = new CatchAuth;
+    }
+
+    try {
+        $user = $this->auth->guard($guard ? : config('catch.auth.default.guard'))->user();
+
+        if ($user->status == Users::DISABLE) {
+            throw new LoginFailedException('该用户已被禁用', Code::USER_FORBIDDEN);
+        }
+    }  catch (\Exception $e) {
+        if ($e instanceof TokenExpiredException) {
+            throw new FailedException('token 过期', Code::LOGIN_EXPIRED);
+        }
+        if ($e instanceof TokenBlacklistException) {
+            throw new FailedException('token 被加入黑名单', Code::LOGIN_BLACKLIST);
+        }
+        if ($e instanceof TokenInvalidException) {
+            throw new FailedException('token 不合法', Code::LOST_LOGIN);
+        }
+        throw new FailedException('认证失败: '. $e->getMessage(), $e->getCode());
+    }
+
+    return $user;
   }
 }

app/middleware.php

@@ -6,5 +6,6 @@ return [
     // 多语言加载
     // \think\middleware\LoadLangPack::class,
     // Session初始化
-     \think\middleware\SessionInit::class
+   //  \think\middleware\SessionInit::class
+    \think\middleware\AllowCrossDomain::class,
 ];

app/service.php

@@ -1,5 +1,4 @@
 <?php
 return [
-   \jaguarjack\think\module\ThinkModuleService::class,
+   \catcher\CatchAdminService::class,
-    \catchAdmin\CatchAdminService::class,
 ];

catch/cms/CmsService.php

@@ -0,0 +1,13 @@
+<?php
+namespace catchAdmin\cms;
+
+use catcher\ModuleService;
+
+class CmsService extends ModuleService
+{
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+}

catch/cms/model/Hello.php

@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+namespace catchAdmin\cms\model;
+
+use catcher\base\CatchModel as Model;
+
+class Hello extends Model
+{
+    protected $name = 'hello';
+
+    protected $field = [
+        'id', // 
+		'good', // 
+		'creator_id', // 创建人ID
+		'created_at', // 创建时间
+		'updated_at', // 更新时间
+		'deleted_at', // 软删除
+    ];
+    
+  
+}

catch/cms/module.json

@@ -0,0 +1,15 @@
+{
+    "name": "内容管理",
+    "alias": "cms",
+    "description": "cms,博客,企业站点,内容管理",
+    "version": "1.0.0",
+    "keywords": [],
+    "order": 0,
+    "services": [
+        "\\catchAdmin\\cms\\CmsService"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": [],
+    "enable": true
+}

catch/cms/route.php

@@ -0,0 +1,14 @@
+<?php
+
+// you should user `$router`
+$router->group(function () use ($router){
+
+});
+
+
+
+//hello路由
+$router->resource('hello', '\catchAdmin\cms\controller\Hello')->middleware('auth');
+
+//hello路由
+$router->resource('hello', '\catchAdmin\cms\controller\Hello')->middleware('auth');

catch/login/LoginLogEvent.php

@@ -1,24 +1,23 @@
 <?php
 namespace catchAdmin\login;
 
-use catchAdmin\user\model\Users;
+use catchAdmin\permissions\model\Users;
+use catchAdmin\system\model\LoginLog;
 use think\facade\Db;
 
-class LoginLogListener
+class LoginLogEvent
 {
     public function handle($params)
     {
         $agent = request()->header('user-agent');
 
-        $username = Users::where('email', $params['email'])->value('username');
+        app(LoginLog::class)->storeBy([
-
+            'login_name' => $params['login_name'],
-        Db::name('login_log')->insert([
-            'login_name' => $username ? : $params['email'],
             'login_ip'   => request()->ip(),
             'browser'    => $this->getBrowser($agent),
             'os'         => $this->getOs($agent),
             'login_at'   => time(),
-            'status'     => $params['success'] ? 1 : 2,
+            'status'     => $params['success'],
         ]);
     }
 

catch/login/LoginService.php

@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\login;
+
+use catcher\ModuleService;
+use think\Service;
+
+class LoginService extends ModuleService
+{
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+
+    public function loadEvents()
+    {
+        return [
+            'loginLog' => [ LoginLogEvent::class ],
+        ];
+    }
+}

catch/login/controller/Index.php

@@ -0,0 +1,61 @@
+<?php
+namespace catchAdmin\login\controller;
+
+use catchAdmin\login\request\LoginRequest;
+use catchAdmin\permissions\model\Users;
+use catcher\base\CatchController;
+use catcher\CatchAuth;
+use catcher\CatchResponse;
+use catcher\Code;
+use catcher\exceptions\LoginFailedException;
+use thans\jwt\facade\JWTAuth;
+
+class Index extends CatchController
+{
+  /**
+   * 登陆
+   *
+   * @time 2019年11月28日
+   * @param LoginRequest $request
+   * @param CatchAuth $auth
+   * @return bool|string
+   */
+    public function login(LoginRequest $request, CatchAuth $auth)
+    {
+        try {
+            $params = $request->param();
+            $token = $auth->attempt($params);
+            return CatchResponse::success([
+                'token' => $token,
+            ], '登录成功');
+        } catch (\Exception $exception) {
+           return CatchResponse::fail('登录失败', $exception->getCode());
+        }
+    }
+
+  /**
+   * 登出
+   *
+   * @time 2019年11月28日
+   * @return \think\response\Json
+   */
+    public function logout(): \think\response\Json
+    {
+        return CatchResponse::success();
+    }
+
+    /**
+     * refresh token
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/5/18
+     * @return \think\response\Json
+     */
+    public function refreshToken()
+    {
+        return CatchResponse::success([
+            'token' => JWTAuth::refresh()
+        ]);
+    }
+}

catch/login/module.json

@@ -0,0 +1,15 @@
+{
+  "name": "登陆",
+  "alias": "login",
+  "description": "login 模块",
+  "version": "1.0.0",
+  "keywords": [],
+  "order": 1,
+  "services": [
+    "\\catchAdmin\\login\\LoginService"
+  ],
+  "aliases": {},
+  "files": [],
+  "requires": [],
+  "enable": true
+}

catch/login/request/LoginRequest.php

@@ -5,13 +5,15 @@ use catcher\base\CatchRequest;
 
 class LoginRequest extends CatchRequest
 {
+    protected $needCreatorId = false;
+
     protected function rules(): array
     {
         // TODO: Implement rules() method.
         return [
             'email|用户名'    => 'email',
             'password|密码'  => 'require',
-            'captcha|验证码' => 'require|captcha'
+           // 'captcha|验证码' => 'require|captcha'
         ];
     }
 
@@ -19,5 +21,6 @@ class LoginRequest extends CatchRequest
     {
         // TODO: Implement message() method.
         return [];
+
     }
 }

catch/login/route.php

@@ -0,0 +1,9 @@
+<?php
+$router->group(function () use ($router){
+    # 登入
+    $router->post('login', '\catchAdmin\login\controller\Index@login');
+    $router->post('logout', '\catchAdmin\login\controller\Index@logout');
+    $router->post('refresh/token', '\catchAdmin\login\controller\Index@refreshToken');
+});
+
+

catch/permissions/PermissionService.php

@@ -0,0 +1,54 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\permissions;
+
+use catchAdmin\permissions\event\OperateLogEvent;
+use catchAdmin\permissions\middleware\AuthTokenMiddleware;
+use catchAdmin\permissions\middleware\PermissionsMiddleware;
+use catchAdmin\permissions\middleware\RecordOperateMiddleware;
+use catcher\ModuleService;
+
+class PermissionService extends ModuleService
+{
+    public function register()
+    {
+        parent::register(); // TODO: Change the autogenerated stub
+
+        $this->registerMiddleWares();
+    }
+
+    public function loadEvents()
+    {
+        return [
+            'operateLog' => [ OperateLogEvent::class ],
+        ];
+    }
+
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+
+
+    protected function registerMiddleWares()
+    {
+        $middleware = $this->app->config->get('middleware');
+
+        $middleware['alias']['auth'] = [
+            AuthTokenMiddleware::class,
+            PermissionsMiddleware::class,
+            RecordOperateMiddleware::class
+        ];
+
+        $this->app->config->set($middleware, 'middleware');
+    }
+}

catch/permissions/controller/Department.php

@@ -0,0 +1,73 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+use catcher\base\CatchController;
+use catchAdmin\permissions\model\Department as DepartmentModel;
+use catcher\base\CatchRequest;
+use catcher\CatchResponse;
+use catcher\exceptions\FailedException;
+use catcher\Tree;
+
+class Department extends CatchController
+{
+    protected $department;
+
+    public function __construct(DepartmentModel $department)
+    {
+        $this->department = $department;
+    }
+
+  /**
+   * 列表
+   *
+   * @time 2020年01月09日
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   * @throws \think\db\exception\DbException
+   */
+    public function index(): \think\response\Json
+    {
+        return CatchResponse::success(Tree::done($this->department->getList()));
+    }
+
+  /**
+   * 保存
+   *
+   * @time 2020年01月09日
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   */
+    public function save(CatchRequest $request): \think\response\Json
+    {
+        return CatchResponse::success($this->department->storeBy($request->param()));
+    }
+
+  /**
+   * 更新
+   *
+   * @time 2020年01月09日
+   * @param $id
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   */
+    public function update($id, CatchRequest $request): \think\response\Json
+    {
+        return CatchResponse::success($this->department->updateBy($id, $request->param()));
+    }
+
+  /**
+   * 删除
+   *
+   * @time 2020年01月09日
+   * @param $id
+   * @return \think\response\Json
+   */
+    public function delete($id): \think\response\Json
+    {
+        if ($this->department->where('parent_id', $id)->find()) {
+            throw new FailedException('存在子部门，无法删除');
+        }
+
+        return CatchResponse::success($this->department->deleteBy($id));
+    }
+}

catch/permissions/controller/Job.php

@@ -0,0 +1,80 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+use catchAdmin\permissions\model\Job as JobModel;
+use catcher\base\CatchController;
+use catcher\base\CatchRequest;
+use catcher\CatchResponse;
+
+class Job extends CatchController
+{
+  protected $job;
+
+  public function __construct(JobModel $job)
+  {
+    $this->job = $job;
+  }
+
+  /**
+   * 列表
+   *
+   * @time 2020年01月09日
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   * @throws \think\db\exception\DbException
+   */
+  public function index(): \think\response\Json
+  {
+    return CatchResponse::paginate($this->job->getList());
+  }
+
+  /**
+   * 保存
+   *
+   * @time 2020年01月09日
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   */
+  public function save(CatchRequest $request): \think\response\Json
+  {
+    return CatchResponse::success($this->job->storeBy($request->post()));
+  }
+
+  /**
+   * 更新
+   *
+   * @time 2020年01月09日
+   * @param $id
+   * @param CatchRequest $request
+   * @return \think\response\Json
+   */
+  public function update($id, CatchRequest $request): \think\response\Json
+  {
+    return CatchResponse::success($this->job->updateBy($id, $request->post()));
+  }
+
+  /**
+   * 删除
+   *
+   * @time 2020年01月09日
+   * @param $id
+   * @return \think\response\Json
+   */
+  public function delete($id): \think\response\Json
+  {
+    return CatchResponse::success($this->job->deleteBy($id));
+  }
+
+/**
+ * 获取所有
+ *
+ * @return \think\response\Json
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
+ */
+  public function getAll()
+  {
+      return CatchResponse::success($this->job->field(['id', 'job_name'])->select());
+  }
+}

catch/permissions/controller/Permission.php

@@ -0,0 +1,208 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+
+use catcher\base\CatchRequest as Request;
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use catcher\exceptions\FailedException;
+use catcher\library\ParseClass;
+use catcher\Tree;
+use catchAdmin\permissions\model\Permissions;
+use think\helper\Str;
+use think\response\Json;
+
+class Permission extends CatchController
+{
+    protected $permissions;
+
+    public function __construct(Permissions $permissions)
+    {
+        $this->permissions = $permissions;
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param Request $request
+     * @return Json
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
+     */
+    public function index(Request $request): Json
+    {
+        // 获取菜单类型
+        $menuList = $this->permissions->getList(true);
+
+        // 获取按钮类型并且重新排列
+        $buttonList = [];
+        $this->permissions
+             ->whereIn('parent_id', array_unique($menuList->column('id')))
+             ->where('type', Permissions::BTN_TYPE)
+             ->select()->each(function ($item) use (&$buttonList){
+                 $buttonList[$item['parent_id']][] = $item->toArray();
+             });
+
+        // 子节点的 key
+        $children = $request->param('actionList') ?? 'children';
+        // 返回树结构
+        return CatchResponse::success(Tree::done($menuList->each(function (&$item) use ($buttonList, $children){
+            $item[$children] = $buttonList[$item['id']] ?? [];
+        })->toArray()));
+    }
+
+  /**
+   *
+   * @time 2019年12月11日
+   * @param Request $request
+   * @return Json
+   * @throws \think\db\exception\DbException
+   * @throws \think\db\exception\ModelNotFoundException
+   * @throws \think\db\exception\DataNotFoundException
+   */
+    public function save(Request $request): Json
+    {
+        $params = $request->param();
+
+        // 如果是子分类 自动写入父类模块
+        $parentId = $params['parent_id'] ?? 0;
+        // 按钮类型寻找上级
+        if ($params['type'] == Permissions::BTN_TYPE && $parentId) {
+            $permissionMark = $params['permission_mark'];
+            // 查找父级
+            $parentPermission = $this->permissions->findBy($parentId);
+            // 如果父级是顶级 parent_id = 0
+            if ($parentPermission->parent_id) {
+                if (Str::contains($parentPermission->permission_mark, '@')) {
+                    list($controller, $action) = explode('@', $parentPermission->permission_mark);
+                    $permissionMark = $controller . '@' . $permissionMark;
+                } else {
+                    $permissionMark = $parentPermission->permission_mark .'@'. $permissionMark;
+                }
+            }
+            $params['permission_mark'] = $permissionMark;
+            $params['module'] = $parentPermission->module;
+        }
+
+        return CatchResponse::success($this->permissions->storeBy($params));
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param $id
+     * @param Request $request
+     * @return Json
+     */
+    public function update($id, Request $request): Json
+    {
+        $permission = $this->permissions->findBy($id);
+
+        $params = $request->param();
+        // 按钮类型
+        if ($params['type'] == Permissions::BTN_TYPE && $permission->parent_id) {
+            $parentPermission = $this->permissions->findBy($permission->parent_id);
+
+            $permissionMark = $params['permission_mark'];
+            if ($parentPermission->parent_id) {
+                if (Str::contains($parentPermission->permission_mark, '@')) {
+                    list($controller, $action) = explode('@', $parentPermission->permission_mark);
+                    $permissionMark = $controller . '@' . $permissionMark;
+                } else {
+                    $permissionMark = $parentPermission->permission_mark .'@'. $permissionMark;
+                }
+            }
+
+            $params['permission_mark'] = $permissionMark;
+
+
+            $this->permissions->where('id',$id)->update(array_merge($params, [
+                'parent_id' => $permission->parent_id,
+                'level'     => $permission->level,
+                'updated_at' => time()
+            ]));
+
+            return CatchResponse::success();
+        }
+
+        $params = array_merge($request->param(), [
+            'parent_id' => $permission->parent_id,
+            'level'     => $permission->level
+        ]);
+
+        if ($permission->updateBy($id, $params)) {
+            if ($params['module'] ?? false) {
+                $this->permissions->updateBy($permission->id, [
+                    'module' => $params['module'],
+                ], 'parent_id');
+            }
+            return CatchResponse::success();
+        }
+
+       throw new FailedException('更新失败');
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param $id
+     * @throws FailedException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return Json
+     */
+    public function delete($id): Json
+    {
+        if ($this->permissions->where('parent_id', $id)->find()) {
+            throw new FailedException('存在子菜单，无法删除');
+        }
+
+        $this->permissions->findBy($id)->roles()->detach();
+
+        return CatchResponse::success($this->permissions->deleteBy($id));
+    }
+
+    /**
+     * 显示/隐藏
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/5/19
+     * @param $id
+     * @return Json
+     */
+    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([]);
+        }
+    }
+}
+
+

catch/permissions/controller/Role.php

@@ -0,0 +1,192 @@
+<?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;
+use catcher\CatchResponse;
+use catcher\exceptions\FailedException;
+use catcher\Tree;
+use think\response\Json;
+
+class Role extends CatchController
+{
+    protected $role;
+
+    public function __construct(\catchAdmin\permissions\model\Roles $role)
+    {
+        $this->role = $role;
+    }
+
+  /**
+   *
+   * @time 2019年12月09日
+   * @param Request $request
+   * @return string
+   */
+    public function index()
+    {
+      return CatchResponse::success(Tree::done($this->role->getList()));
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param Request $request
+     * @return Json
+     * @throws \think\db\exception\DbException
+     */
+    public function save(Request $request)
+    {
+        $params = $request->param();
+
+        if (Roles::where('identify', $params['identify'])->find()) {
+            throw new FailedException('角色标识 [' . $params['identify'] . ']已存在');
+        }
+
+        $this->role->storeBy($params);
+        $permissions = $params['permissions'];
+        if (!empty($permissions)) {
+            $this->role->attachPermissions(array_unique($permissions));
+        }
+        if (!empty($params['permissions'])) {
+            $this->role->attachDepartments($params['permissions']);
+        }
+        // 添加角色
+        return CatchResponse::success();
+    }
+
+    public function read($id)
+    {
+      $role = $this->role->findBy($id);
+      $role->permissions = $role->getPermissions();
+      $role->departments = $role->getDepartments();
+      return CatchResponse::success($role);
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param $id
+     * @param Request $request
+     * @return Json
+     * @throws \think\db\exception\DbException
+     */
+    public function update($id, Request $request): Json
+    {
+        if (Roles::where('identify', $request->param('identify'))->where('id', '<>', $id)->find()) {
+            throw new FailedException('角色标识 [' . $request->param('identify') . ']已存在');
+        }
+
+        $this->role->updateBy($id, $request->param());
+        $role = $this->role->findBy($id);
+
+        $hasPermissionIds = $role->getPermissions()->column('id');
+
+        $permissionIds = $request->param('permissions');
+
+        // 已存在权限 IDS
+        $existedPermissionIds = [];
+        foreach ($hasPermissionIds as $hasPermissionId) {
+            if (in_array($hasPermissionId, $permissionIds)) {
+                $existedPermissionIds[] = $hasPermissionId;
+            }
+        }
+
+        $attachIds = array_diff($permissionIds, $existedPermissionIds);
+        $detachIds = array_diff($hasPermissionIds, $existedPermissionIds);
+
+        if (!empty($detachIds)) {
+            $role->detachPermissions($detachIds);
+        }
+        if (!empty($attachIds)) {
+            $role->attachPermissions(array_unique($attachIds));
+        }
+        
+        // 更新department
+        $hasDepartmentIds = $role->getDepartments()->column('id');
+        $departmentIds = $request->param('departments',[]);
+
+        // 已存在部门 IDS
+        $existedDepartmentIds = [];
+        foreach ($hasDepartmentIds as $hasDepartmentId) {
+            if (in_array($hasDepartmentId, $departmentIds)) {
+                $existedDepartmentIds[] = $hasDepartmentId;
+            }
+        }
+
+        $attachDepartmentIds = array_diff($departmentIds, $existedDepartmentIds);
+        $detachDepartmentIds = array_diff($hasDepartmentIds, $existedDepartmentIds);
+
+        if (!empty($detachDepartmentIds)) {
+            $role->detachDepartments($detachDepartmentIds);
+        }
+        if (!empty($attachDepartmentIds)) {
+            $role->attachDepartments(array_unique($attachDepartmentIds));
+        }
+
+        return CatchResponse::success();
+    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param $id
+     * @throws FailedException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return Json
+     */
+    public function delete($id): Json
+    {
+        if ($this->role->where('parent_id', $id)->find()) {
+            throw new FailedException('存在子角色，无法删除');
+        }
+        $role = $this->role->findBy($id);
+        // 删除权限
+        $role->detachPermissions();
+        // 删除部门关联
+        $role->detachDepartments();
+        // 删除用户关联
+        $role->users()->detach();
+        // 删除
+        $this->role->deleteBy($id);
+
+        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')) {
+            $permissions = $this->role->findBy($request->param('parent_id'))->getPermissions();
+            foreach ($permissions as $_permission) {
+                $parentRoleHasPermissionIds[] = $_permission->pivot->permission_id;
+            }
+        }
+
+        $permissions = Tree::done(Permissions::whereIn('id', $parentRoleHasPermissionIds)->select()->toArray());
+
+        $permissionIds = [];
+        if ($request->param('role_id')) {
+            $roleHasPermissions = $this->role->findBy($request->param('role_id'))->getPermissions();
+            foreach ($roleHasPermissions as $_permission) {
+                $permissionIds[] = $_permission->pivot->permission_id;
+            }
+        }
+
+        return CatchResponse::success([
+            'permissions' => $permissions,
+            'hasPermissions' => $permissionIds,
+        ]);
+    }
+}

catch/permissions/controller/User.php

@@ -0,0 +1,246 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+use catchAdmin\permissions\excel\UserExport;
+use catcher\base\CatchRequest as Request;
+use catchAdmin\permissions\model\Permissions;
+use catchAdmin\permissions\model\Roles;
+use catchAdmin\permissions\model\Users;
+use catchAdmin\permissions\request\CreateRequest;
+use catchAdmin\permissions\request\UpdateRequest;
+use catcher\base\CatchController;
+use catcher\CatchAuth;
+use catcher\CatchCacheKeys;
+use catcher\CatchResponse;
+use catcher\library\excel\Excel;
+use catcher\Tree;
+use catcher\Utils;
+use think\facade\Cache;
+
+class User extends CatchController
+{
+    protected $user;
+
+    public function __construct(Users $user)
+    {
+       $this->user = $user;
+    }
+
+    /**
+     *
+     * @time 2020年04月24日
+     * @throws \think\db\exception\DbException
+     * @return \think\response\Json
+     */
+    public function index()
+    {
+        return CatchResponse::paginate($this->user->getList());
+    }
+
+  /**
+   * 获取用户信息
+   *
+   * @time 2020年01月07日
+   * @param CatchAuth $auth
+   * @throws \think\db\exception\DataNotFoundException
+   * @throws \think\db\exception\DbException
+   * @throws \think\db\exception\ModelNotFoundException
+   * @return \think\response\Json
+   */
+    public function info(CatchAuth $auth)
+    {
+        $user = $auth->user();
+
+        $roles = $user->getRoles()->column('identify');
+
+        $permissionIds = $user->getPermissionsBy($user->id);
+        // 缓存用户权限
+        Cache::set(CatchCacheKeys::USER_PERMISSIONS . $user->id, $permissionIds);
+
+        $user->permissions = Permissions::getCurrentUserPermissions($permissionIds);
+
+        $user->roles = $roles;
+
+        // 用户数据权限
+        // $user->data_range = Roles::getDepartmentUserIdsBy($roles);
+
+        return CatchResponse::success($user);
+    }
+
+    /**
+     *
+     * @time 2019年12月06日
+     * @throws \Exception
+     * @return string
+     */
+    public function create()
+    {}
+
+    /**
+     *
+     * @param CreateRequest $request
+     * @time 2019年12月06日
+     * @return \think\response\Json
+     */
+    public function save(CreateRequest $request)
+    {
+        $this->user->storeBy($request->param());
+
+        $this->user->attachRoles($request->param('roles'));
+
+        if ($request->param('jobs')) {
+            $this->user->attachJobs($request->param('jobs'));
+        }
+
+        return CatchResponse::success('', '添加成功');
+    }
+
+    /**
+     *
+     * @time 2019年12月04日
+     * @param $id
+     * @return \think\response\Json
+     */
+    public function read($id)
+    {
+        $user = $this->user->findBy($id);
+        $user->roles = $user->getRoles();
+        $user->jobs  = $user->getJobs();
+        return CatchResponse::success($user);
+    }
+
+    /**
+     * @param $id
+     * @return string
+     * @throws \Exception
+     */
+    public function edit($id){}
+    /**
+     *
+     * @time 2019年12月04日
+     * @param $id
+     * @param UpdateRequest $request
+     * @return \think\response\Json
+     */
+    public function update($id, UpdateRequest $request)
+    {
+        $this->user->updateBy($id, $request->param());
+
+        $user = $this->user->findBy($id);
+
+        $user->detachRoles();
+        $user->detachJobs();
+
+        if (!empty($request->param('roles'))) {
+            $user->attachRoles($request->param('roles'));
+        }
+        if (!empty($request->param('jobs'))) {
+            $user->attachJobs($request->param('jobs'));
+        }
+        return CatchResponse::success();
+    }
+
+    /**
+     *
+     * @time 2019年12月04日
+     * @param $id
+     * @return \think\response\Json
+     */
+    public function delete($id)
+    {
+        $ids = Utils::stringToArrayBy($id);
+
+        foreach ($ids as $_id) {
+          $user = $this->user->findBy($_id);
+          // 删除角色
+          $user->detachRoles();
+          // 删除岗位
+          $user->detachJobs();
+
+          $this->user->deleteBy($_id);
+        }
+
+        return CatchResponse::success();
+    }
+
+    /**
+     *
+     * @time 2019年12月07日
+     * @param $id
+     * @return \think\response\Json
+     */
+    public function switchStatus($id): \think\response\Json
+    {
+        $ids = Utils::stringToArrayBy($id);
+
+        foreach ($ids as $_id) {
+
+          $user = $this->user->findBy($_id);
+
+          $this->user->updateBy($_id, [
+            'status' => $user->status == Users::ENABLE ? Users::DISABLE : Users::ENABLE,
+          ]);
+        }
+
+        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,
+        ]);
+    }
+
+    /**
+     * 导出
+     *
+     * @time 2020年09月08日
+     * @param Excel $excel
+     * @param UserExport $userExport
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @return \think\response\Json
+     */
+    public function export(Excel $excel, UserExport $userExport)
+    {
+        return CatchResponse::success($excel->save($userExport, Utils::publicPath('export/users')));
+    }
+}

catch/permissions/database/migrations/20191128114204_users.php

@@ -32,8 +32,10 @@ class Users extends Migrator
         $table->addColumn('username', 'string',array('limit'  =>  15,'default'=>'','comment'=>'用户名'))
             ->addColumn('password', 'string',array('limit'  =>  255,'comment'=>'用户密码'))
             ->addColumn('email', 'string',array('limit'  =>  100, 'comment'=>'邮箱 登录'))
+            ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
+            ->addColumn('department_id', 'integer',['default' => 0, 'comment'=>'部门ID'])
             ->addColumn('status', 'boolean',array('limit'  =>  1,'default'=> 1,'comment'=>'用户状态 1 正常 2 禁用'))
-            ->addColumn('last_login_ip', 'string',array('limit'  =>  30,'default'=>0,'comment'=>'最后登录IP'))
+            ->addColumn('last_login_ip', 'string',array('limit' => 50,'default'=>0,'comment'=>'最后登录IP'))
             ->addColumn('last_login_time', 'integer',array('default'=>0,'comment'=>'最后登录时间', 'signed' => false))
             ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
             ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))

catch/permissions/database/migrations/20191208125722_roles.php

@@ -32,6 +32,8 @@ class Roles extends Migrator
         $table->addColumn('role_name', 'string',['limit'  =>  15,'default'=>'','comment'=>'角色名'])
             ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
             ->addColumn('description', 'string',['default'=> '','comment'=>'角色备注'])
+            ->addColumn('data_range', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 0,'comment'=>'1 全部数据 2 自定义数据 3 仅本人数据 4 部门数据 5 部门及以下数据'])
+            ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
             ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
             ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
             ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态，0未删除 >0 已删除', 'signed' => false))

catch/permissions/database/migrations/20191208125726_permissions.php

@@ -32,7 +32,9 @@ class Permissions extends Migrator
         $table->addColumn('permission_name', 'string',['limit'  =>  15,'default'=>'','comment'=>'菜单名称'])
             ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
             ->addColumn('route', 'string', ['default' => '', 'comment' => '路由', 'limit' => 50])
+            ->addColumn('icon', 'string', ['default' => '', 'comment' => '菜单图标', 'limit' => 50])
             ->addColumn('module', 'string', ['default' => '', 'comment' => '模块', 'limit' => 20])
+            ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
             ->addColumn('method', 'string', ['default' => 'get', 'comment' => '路由请求方法', 'limit' => 15])
             ->addColumn('permission_mark', 'string', ['null' => false, 'comment' => '权限标识', 'limit' => 50])
             ->addColumn('type', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 菜单 2 按钮'])

catch/permissions/database/migrations/20200108143438_department.php

@@ -0,0 +1,45 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Department extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+      $table  =  $this->table('departments',['engine'=>'Innodb', 'comment' => '部门表', 'signed' => false]);
+      $table->addColumn('department_name', 'string',['limit'  =>  15,'default'=>'','comment'=>'部门名称'])
+        ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
+        ->addColumn('principal', 'string', ['default' => '', 'comment' => '负责人', 'limit' => 20])
+        ->addColumn('mobile', 'string', ['default' => '', 'comment' => '联系电话', 'limit' => 20])
+        ->addColumn('email', 'string', ['default' => '', 'comment' => '联系又想', 'limit' => 100])
+        ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
+        ->addColumn('status', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 正常 2 停用'])
+        ->addColumn('sort', 'integer',['default'=> 0,'comment'=>'排序字段'])
+        ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
+        ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
+        ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态，null 未删除 timestamp 已删除', 'signed' => false))
+        ->create();
+    }
+}

catch/permissions/database/migrations/20200108143506_job.php

@@ -0,0 +1,43 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Job extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+      $table  =  $this->table('jobs',['engine'=>'Innodb', 'comment' => '岗位表', 'signed' => false]);
+      $table->addColumn('job_name', 'string',['limit'  =>  15,'default'=>'','comment'=>'岗位名称'])
+        ->addColumn('coding', 'string', ['default' => '', 'comment' => '编码', 'limit' => 50])
+        ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
+        ->addColumn('status', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 正常 2 停用'])
+        ->addColumn('sort', 'integer',['default'=> 0,'comment'=>'排序字段'])
+        ->addColumn('description', 'string', ['default' => '', 'comment' => '描述', 'limit' => 255])
+        ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
+        ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
+        ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态，null 未删除 timestamp 已删除', 'signed' => false))
+        ->create();
+    }
+}

catch/permissions/database/migrations/20200112003534_user_relate_job.php

@@ -0,0 +1,36 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class UserRelateJob extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table  =  $this->table('user_has_jobs',['engine'=>'Innodb', 'comment' => '用户角色表', 'signed' => false]);
+        $table->addColumn('uid', 'integer',['comment'=>'用户ID', 'signed' => false])
+            ->addColumn('job_id', 'integer', ['comment'=>'岗位ID', 'signed' => false])
+            ->create();
+    }
+}

catch/permissions/database/migrations/20200112031437_role_has_departments.php

@@ -0,0 +1,36 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class RoleHasDepartments extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table  =  $this->table('role_has_departments',['engine'=>'Innodb', 'comment' => '角色部门表', 'signed' => false]);
+        $table->addColumn('role_id', 'integer',['comment'=>'角色ID', 'signed' => false])
+            ->addColumn('department_id', 'integer', ['comment'=>'部门ID', 'signed' => false])
+            ->create();
+    }
+}

catch/permissions/database/migrations/20200409023815_change_permissions.php

@@ -0,0 +1,41 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class ChangePermissions extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('permissions')) {
+            $table = $this->table('permissions');
+
+            $table->addColumn('component', 'string', ['default' => '', 'comment' => '组件名称', 'limit' => '255', 'after' => 'permission_mark'])
+                ->addColumn('redirect', 'string', ['default' => '', 'comment' => '跳转地址', 'limit' => '255', 'after' => 'component'])
+                ->addColumn('hide_children_in_menu', 'integer', ['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '1 显示 2隐藏', 'after' => 'redirect'])
+                ->addColumn('keepalive', 'integer', ['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, 'default' => 1, 'comment' => '1 缓存 2 不存在 ', 'after' => 'hide_children_in_menu'])
+                ->update();
+        }
+    }
+}

catch/permissions/database/migrations/20200422080926_permissions_add_column.php

@@ -0,0 +1,38 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class PermissionsAddColumn extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('permissions')) {
+            $table = $this->table('permissions');
+
+            $table->addColumn('level', 'string', ['default' => '', 'comment' => '层级', 'limit' => '50', 'after' => 'parent_id'])
+                ->update();
+        }
+    }
+}

catch/permissions/database/migrations/20200519082617_add_permission_status_column.php

@@ -0,0 +1,42 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class AddPermissionStatusColumn extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('permissions')) {
+            $table = $this->table('permissions');
+
+            $table->addColumn('status', 'integer', [
+                            'limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,
+                            'default' => 1,
+                            'comment' => '1 显示 2 隐藏',
+                            'after' => 'type'])
+                            ->update();
+        }
+    }
+}

catch/permissions/database/migrations/20200830025329_update_roles.php

@@ -0,0 +1,42 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class UpdateRoles extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('roles')) {
+            $table = $this->table('roles');
+
+            $table->addColumn('identify', 'string', [
+                            'limit' => 20,
+                            'default' => 1,
+                            'comment' => '角色的标识，用英文表示，用于后台路由权限',
+                            'after' => 'role_name'])
+                            ->update();
+        }
+    }
+}

catch/permissions/database/migrations/20200830031139_update_permissions.php

@@ -0,0 +1,40 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class UpdatePermissions extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('permissions')) {
+            $table = $this->table('permissions');
+
+            $table->removeColumn('method')
+                  ->removeColumn('hide_children_in_menu')
+                  ->renameColumn('status', 'hidden')
+                  ->update();
+        }
+    }
+}

catch/permissions/database/seeds/DepartmentsSeed.php

@@ -0,0 +1,39 @@
+<?php
+
+use think\migration\Seeder;
+
+class DepartmentsSeed extends Seeder
+{
+    /**
+     * Run Method.
+     *
+     * Write your database seeder using this method.
+     *
+     * More information on writing seeders is available here:
+     * http://docs.phinx.org/en/latest/seeding.html
+     */
+    public function run()
+    {
+        $data = [
+            [
+            'id' => 1,
+            'department_name' => '总部',
+            'parent_id' => 0,
+            ],
+            [
+                'id' => 2,
+                'department_name' => '北京总部',
+                'parent_id' => 1,
+            ],
+            [
+                'id' => 3,
+                'department_name' => '南京总部',
+                'parent_id' => 1,
+            ],
+        ];
+
+        foreach ($data as $item) {
+            \catchAdmin\permissions\model\Department::create($item);
+        }
+    }
+}

catch/permissions/database/seeds/PermissionsMenusSeed.php

@@ -0,0 +1,820 @@
+<?php
+
+use think\migration\Seeder;
+
+class PermissionsMenusSeed extends Seeder
+{
+    /**
+     * Run Method.
+     *
+     * Write your database seeder using this method.
+     *
+     * More information on writing seeders is available here:
+     * http://docs.phinx.org/en/latest/seeding.html
+     */
+    public function run()
+    {
+        \catcher\Utils::importTreeData($this->getPermissions(), 'permissions', 'parent_id');
+    }
+
+    protected function getPermissions()
+    {
+       return array (
+  0 => 
+  array (
+    'id' => 1,
+    'permission_name' => '权限管理',
+    'parent_id' => 0,
+    'level' => '',
+    'route' => '/permissions',
+    'icon' => 'el-icon-cpu',
+    'module' => 'permissions',
+    'creator_id' => 1,
+    'permission_mark' => 'permission',
+    'component' => 'layout',
+    'redirect' => '/permissions/users',
+    'hidden' => 1,
+    'keepalive' => 1,
+    'type' => 1,
+    'sort' => 100,
+    'created_at' => 1587461455,
+    'updated_at' => 1599362429,
+    'deleted_at' => 0,
+    'children' => 
+    array (
+      0 => 
+      array (
+        'id' => 2,
+        'permission_name' => '用户管理',
+        'parent_id' => 1,
+        'level' => '1',
+        'route' => '/permissions/users',
+        'icon' => 'el-icon-user',
+        'module' => 'permissions',
+        'creator_id' => 1,
+        'permission_mark' => 'user',
+        'component' => 'users',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 10,
+        'created_at' => 1587461597,
+        'updated_at' => 1599362429,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 3,
+            'permission_name' => '列表',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461647,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 4,
+            'permission_name' => '创建',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@create',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461696,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 5,
+            'permission_name' => '保存',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461721,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 6,
+            'permission_name' => '查看',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@edit',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461742,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          4 => 
+          array (
+            'id' => 7,
+            'permission_name' => '更新',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461762,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          5 => 
+          array (
+            'id' => 8,
+            'permission_name' => '删除',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461841,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          6 => 
+          array (
+            'id' => 9,
+            'permission_name' => '禁用',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@switchStatus',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461876,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+          7 => 
+          array (
+            'id' => 10,
+            'permission_name' => '恢复',
+            'parent_id' => 2,
+            'level' => '1-2',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'user@recover',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461901,
+            'updated_at' => 1599030266,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      1 => 
+      array (
+        'id' => 11,
+        'permission_name' => '角色管理',
+        'parent_id' => 1,
+        'level' => '1',
+        'route' => '/permissions/roles',
+        'icon' => 'el-icon-s-custom',
+        'module' => 'permissions',
+        'creator_id' => 1,
+        'permission_mark' => 'role',
+        'component' => 'roles',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 9,
+        'created_at' => 1587461939,
+        'updated_at' => 1599362438,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 12,
+            'permission_name' => '列表',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587461984,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 13,
+            'permission_name' => '创建',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@create',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462007,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 14,
+            'permission_name' => '保存',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462021,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 15,
+            'permission_name' => '查看',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@edit',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462040,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          4 => 
+          array (
+            'id' => 16,
+            'permission_name' => '更新',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462058,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          5 => 
+          array (
+            'id' => 17,
+            'permission_name' => '删除',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462070,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+          6 => 
+          array (
+            'id' => 18,
+            'permission_name' => '权限获取',
+            'parent_id' => 11,
+            'level' => '1-11',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'role@getPermissions',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462094,
+            'updated_at' => 1599362438,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      2 => 
+      array (
+        'id' => 19,
+        'permission_name' => '菜单管理',
+        'parent_id' => 1,
+        'level' => '1',
+        'route' => '/permissions/rules',
+        'icon' => 'el-icon-collection-tag',
+        'module' => 'permissions',
+        'creator_id' => 1,
+        'permission_mark' => 'permission',
+        'component' => 'rules',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 8,
+        'created_at' => 1587462147,
+        'updated_at' => 1599362475,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 20,
+            'permission_name' => '列表',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462205,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 21,
+            'permission_name' => '创建',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@create',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462232,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 22,
+            'permission_name' => '保存',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462250,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 23,
+            'permission_name' => '禁用/启用',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@show',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462273,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          4 => 
+          array (
+            'id' => 24,
+            'permission_name' => '更新',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462284,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          5 => 
+          array (
+            'id' => 25,
+            'permission_name' => '删除',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462296,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+          6 => 
+          array (
+            'id' => 106,
+            'permission_name' => '权限方法',
+            'parent_id' => 19,
+            'level' => '1-19',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'permission@getMethods',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1599221913,
+            'updated_at' => 1599362475,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      3 => 
+      array (
+        'id' => 26,
+        'permission_name' => '部门管理',
+        'parent_id' => 1,
+        'level' => '1',
+        'route' => '/permissions/departments',
+        'icon' => 'el-icon-monitor',
+        'module' => 'permissions',
+        'creator_id' => 1,
+        'permission_mark' => 'departments',
+        'component' => 'departments',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 7,
+        'created_at' => 1587462488,
+        'updated_at' => 1599362429,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 27,
+            'permission_name' => '列表',
+            'parent_id' => 26,
+            'level' => '1-26',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'department@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462529,
+            'updated_at' => 1599030565,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 28,
+            'permission_name' => '保存',
+            'parent_id' => 26,
+            'level' => '1-26',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'department@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462548,
+            'updated_at' => 1599030565,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 29,
+            'permission_name' => '更新',
+            'parent_id' => 26,
+            'level' => '1-26',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'department@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462579,
+            'updated_at' => 1599030565,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 30,
+            'permission_name' => '删除',
+            'parent_id' => 26,
+            'level' => '1-26',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'department@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462592,
+            'updated_at' => 1599030565,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      4 => 
+      array (
+        'id' => 31,
+        'permission_name' => '岗位管理',
+        'parent_id' => 1,
+        'level' => '1',
+        'route' => '/permissions/jobs',
+        'icon' => 'el-icon-setting',
+        'module' => 'permissions',
+        'creator_id' => 1,
+        'permission_mark' => 'job',
+        'component' => 'jobs',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 1,
+        'created_at' => 1587462707,
+        'updated_at' => 1599362429,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 32,
+            'permission_name' => '列表',
+            'parent_id' => 31,
+            'level' => '1-31',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'job@indexs',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 2,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462757,
+            'updated_at' => 1598959522,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 33,
+            'permission_name' => '保存',
+            'parent_id' => 31,
+            'level' => '1-31',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'job@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 2,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462774,
+            'updated_at' => 1598959522,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 34,
+            'permission_name' => '更新',
+            'parent_id' => 31,
+            'level' => '1-31',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'job@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 2,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462785,
+            'updated_at' => 1598959522,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 35,
+            'permission_name' => '删除',
+            'parent_id' => 31,
+            'level' => '1-31',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'job@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 2,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462794,
+            'updated_at' => 1598959522,
+            'deleted_at' => 0,
+          ),
+          4 => 
+          array (
+            'id' => 36,
+            'permission_name' => '获取全部',
+            'parent_id' => 31,
+            'level' => '1-31',
+            'route' => '',
+            'icon' => '',
+            'module' => 'permissions',
+            'creator_id' => 1,
+            'permission_mark' => 'job@getAll',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 2,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587462818,
+            'updated_at' => 1598959522,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+    ),
+  ),
+);
+    }
+}

catch/permissions/database/seeds/RolesSeed.php

@@ -0,0 +1,38 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+use think\migration\Seeder;
+
+class RolesSeed extends Seeder
+{
+    /**
+     * Run Method.
+     *
+     * Write your database seeder using this method.
+     *
+     * More information on writing seeders is available here:
+     * http://docs.phinx.org/en/latest/seeding.html
+     */
+    public function run()
+    {
+        \catchAdmin\permissions\model\Roles::create([
+            'role_name' => '超级管理员',
+            'identify'  => 'admin',
+            'description' => 'super user',
+            'data_range' => 1,
+            'creator_id' => 1,
+        ]);
+
+        \think\facade\Db::name( 'user_has_roles')->insert([
+            'role_id' => 1,
+            'uid' => 1,
+        ]);
+    }
+}

catch/permissions/database/seeds/UsersSeed.php

@@ -14,10 +14,11 @@ class UsersSeed extends Seeder
      */
     public function run()
     {
-        return \catchAdmin\user\model\Users::create([
+        return \catchAdmin\permissions\model\Users::create([
             'username' => 'admin',
             'password' => 'admin',
             'email'    => 'admin@gmail.com',
+            'creator_id' => 1,
         ]);
     }
 }

catch/permissions/event/OperateLogEvent.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace catchAdmin\permissions\event;
+
+use catchAdmin\permissions\model\Permissions;
+use catchAdmin\system\model\OperateLog;
+use catcher\CatchAdmin;
+use think\facade\Db;
+
+class OperateLogEvent
+{
+    public function handle($params)
+    {
+        $permission = $params['permission'];
+
+        $parentPermission = Permissions::where('id', $permission->parent_id)->value('permission_name');
+
+        $requestParams = request()->param();
+
+        // 如果参数过长则不记录
+        if (!empty($requestParams)) {
+            if (strlen(\json_encode($requestParams)) > 1000) {
+                $requestParams = [];
+            }
+        }
+
+        app(OperateLog::class)->storeBy([
+            'creator_id' => $params['creator_id'],
+            'module'     => $parentPermission ? : '',
+            'method'     => request()->method(),
+            'operate'    => $permission->permission_name,
+            'route'      => $permission->permission_mark,
+            'params'     => !empty($requestParams) ? json_encode($requestParams, JSON_UNESCAPED_UNICODE) : '',
+            'created_at' => time(),
+            'ip'         => request()->ip(),
+        ]);
+    }
+}

catch/permissions/excel/UserExport.php

@@ -0,0 +1,78 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\permissions\excel;
+
+use catchAdmin\permissions\model\Users;
+use catcher\library\excel\ExcelContract;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+class UserExport implements ExcelContract
+{
+
+    /**
+     * 设置头部
+     *
+     * @time 2020年09月08日
+     * @return string[]
+     */
+    public function headers(): array
+    {
+        // TODO: Implement headers() method.
+        return [
+            'id', '用户名', '邮箱', '状态', '创建日期'
+        ];
+    }
+
+    /**
+     * 处理数据
+     *
+     * @time 2020年09月08日
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return \think\Collection
+     */
+    public function sheets()
+    {
+        // TODO: Implement sheets() method.
+        $users = Users::field(['id', 'username', 'email', 'status', 'created_at'])->select();
+
+        foreach ($users as &$user) {
+            $user->status = $user->status == Users::ENABLE ? '启用' : '停用';
+        }
+
+        return $users;
+    }
+
+    /**
+     * 设置开始行
+     *
+     * @time 2020年09月08日
+     * @return int
+     */
+    public function setRow()
+    {
+        return 2;
+    }
+
+    /**
+     * 设置标题
+     *
+     * @time 2020年09月08日
+     * @return array
+     */
+    public function setTitle()
+    {
+        return [
+            'A1:G1', '导出用户', Alignment::HORIZONTAL_CENTER
+        ];
+    }
+}

catch/permissions/middleware/AuthTokenMiddleware.php

@@ -0,0 +1,34 @@
+<?php
+namespace catchAdmin\permissions\middleware;
+
+use catcher\Code;
+use catcher\exceptions\FailedException;
+use thans\jwt\exception\TokenBlacklistException;
+use thans\jwt\exception\TokenExpiredException;
+use thans\jwt\exception\TokenInvalidException;
+use thans\jwt\facade\JWTAuth;
+use think\Middleware;
+
+class AuthTokenMiddleware extends Middleware
+{
+    public function handle($request, \Closure $next)
+    {
+       try {
+          JWTAuth::auth();
+       } catch (\Exception $e) {
+           if ($e instanceof TokenExpiredException) {
+               throw new FailedException('token 过期', Code::LOGIN_EXPIRED);
+           }
+           if ($e instanceof TokenBlacklistException) {
+               throw new FailedException('token 被加入黑名单', Code::LOGIN_BLACKLIST);
+           }
+           if ($e instanceof TokenInvalidException) {
+               throw new FailedException('token 不合法', Code::LOST_LOGIN);
+           }
+
+           throw new FailedException('登录用户不合法', Code::LOST_LOGIN);
+       }
+
+       return $next($request);
+    }
+}

catch/permissions/middleware/PermissionsMiddleware.php

@@ -0,0 +1,109 @@
+<?php
+namespace catchAdmin\permissions\middleware;
+
+use app\Request;
+use catchAdmin\permissions\model\Permissions;
+use catcher\CatchCacheKeys;
+use catcher\Code;
+use catcher\exceptions\PermissionForbiddenException;
+use think\facade\Cache;
+use catcher\Utils;
+
+class PermissionsMiddleware
+{
+    /**
+     *
+     * @time 2019年12月12日
+     * @param Request $request
+     * @param \Closure $next
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws PermissionForbiddenException
+     */
+    public function handle(Request $request, \Closure $next)
+    {
+        $rule = $request->rule()->getName();
+
+        if (!$rule) {
+            return $next($request);
+        }
+
+        // 模块忽略
+        [$module, $controller, $action] = Utils::parseRule($rule);
+        // toad
+        if (in_array($module, $this->ignoreModule())) {
+            return $next($request);
+        }
+        // 用户未登录
+        $user = $request->user();
+        if (!$user) {
+            throw new PermissionForbiddenException('Login is invalid', Code::LOST_LOGIN);
+        }
+        // 超级管理员
+        if ($request->user()->id === config('catch.permissions.super_admin_id')) {
+            return $next($request);
+        }
+        // Get 请求
+        if ($request->isGet() && config('catch.permissions.is_allow_get')) {
+            return $next($request);
+        }
+        // 判断权限
+        $permission = property_exists($request, 'permission') ? $request->permission :
+                        $this->getPermission($module, $controller, $action);
+
+        if (!$permission || !in_array($permission->id, Cache::get(CatchCacheKeys::USER_PERMISSIONS . $user->id))) {
+          throw new PermissionForbiddenException();
+        }
+
+        return $next($request);
+    }
+
+    /**
+     *
+     * @time 2019年12月14日
+     * @param $module
+     * @param $controllerName
+     * @param $action
+     * @param $request
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return array|bool|\think\Model|null
+     */
+    protected function getPermission($module, $controllerName, $action)
+    {
+        $permissionMark = sprintf('%s@%s', $controllerName, $action);
+
+        return Permissions::where('module', $module)->where('permission_mark', $permissionMark)->find();
+    }
+
+    /**
+     * 忽略模块
+     *
+     * @time 2020年04月16日
+     * @return array
+     */
+    protected function ignoreModule()
+    {
+        return ['login'];
+    }
+
+    /**
+     * 操作日志
+     *
+     * @time 2020年04月16日
+     * @param $creatorId
+     * @param $permission
+     * @return void
+     */
+    protected function operateEvent($creatorId, $permission)
+    {
+        // 操作日志
+        $permission && event('operateLog', [
+            'creator_id' => $creatorId,
+            'permission' => $permission,
+        ]);
+    }
+}

catch/permissions/middleware/RecordOperateMiddleware.php

@@ -0,0 +1,76 @@
+<?php
+namespace catchAdmin\permissions\middleware;
+
+use app\Request;
+use catchAdmin\permissions\model\Permissions;
+use catcher\CatchCacheKeys;
+use catcher\Code;
+use catcher\exceptions\PermissionForbiddenException;
+use think\facade\Cache;
+use catcher\Utils;
+
+class RecordOperateMiddleware
+{
+    /**
+     *
+     * @time 2019年12月12日
+     * @param Request $request
+     * @param \Closure $next
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws PermissionForbiddenException
+     */
+    public function handle(Request $request, \Closure $next)
+    {
+        $rule = $request->rule()->getName();
+
+        // 模块忽略
+        [$module, $controller, $action] = Utils::parseRule($rule);
+
+        $permission = $this->getPermission($module, $controller, $action);
+
+        $this->operateEvent($request->user()->id, $permission);
+
+        // 将权限带入
+        $request->permission  = $permission;
+        return $next($request);
+    }
+
+    /**
+     *
+     * @time 2019年12月14日
+     * @param $module
+     * @param $controllerName
+     * @param $action
+     * @param $request
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return array|bool|\think\Model|null
+     */
+    protected function getPermission($module, $controllerName, $action)
+    {
+        $permissionMark = sprintf('%s@%s', $controllerName, $action);
+
+        return Permissions::where('module', $module)->where('permission_mark', $permissionMark)->find();
+    }
+
+    /**
+     * 操作日志
+     *
+     * @time 2020年04月16日
+     * @param $creatorId
+     * @param $permission
+     * @return void
+     */
+    protected function operateEvent($creatorId, $permission)
+    {
+        // 操作日志
+        $permission && event('operateLog', [
+            'creator_id' => $creatorId,
+            'permission' => $permission,
+        ]);
+    }
+}

catch/permissions/model/DataRangScopeTrait.php

@@ -0,0 +1,92 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catcher\Utils;
+
+trait DataRangScopeTrait
+{
+    /**
+     * 数据范围查询
+     *
+     * @param $roles
+     * @return mixed
+     * @author JaguarJack <njphper@gmail.com>
+     * @date 2020/6/6
+     */
+    protected function dataRange($roles)
+    {
+        if (Utils::isSuperAdmin()) {
+            return $this;
+        }
+
+        $userIds =  $this->getDepartmentUserIdsBy($roles);
+
+        if (empty($userIds)) {
+            return $this;
+        }
+
+        return $this->whereIn($this->aliasField('creator_id'), $userIds);
+    }
+
+    /**
+     * 获取部门IDs
+     *
+     * @param $roles
+     * @return array
+     * @author JaguarJack <njphper@gmail.com>
+     * @date 2020/6/6
+     */
+    public function getDepartmentUserIdsBy($roles)
+    {
+        $userIds = [];
+
+        $isAll = false;
+
+        $user = request()->user();
+
+        foreach ($roles as $role) {
+            switch ($role->data_range) {
+                case Roles::ALL_DATA:
+                    $isAll = true;
+                    break;
+                case Roles::SELF_CHOOSE:
+                    $departmentIds = array_merge(array_column($role->getDepartments()->toArray(), 'id'));
+                    $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId($departmentIds));
+                    break;
+                case Roles::SELF_DATA:
+                    $userIds[] = $user->id;
+                    break;
+                case Roles::DEPARTMENT_DOWN_DATA:
+                    // 查一下下级部门
+                    $departmentIds = Department::where('parent_id', $user->department_id)->column('id');
+                    $departmentIds[] = $user->department_id;
+                    $userIds = array_merge([$user->id], $this->getUserIdsByDepartmentId($departmentIds));
+                    break;
+                case Roles::DEPARTMENT_DATA:
+                    $userIds = array_merge($userIds, $this->getUserIdsByDepartmentId([$user->department_id]));
+                    break;
+                default:
+                    break;
+            }
+
+            // 如果有全部数据 直接跳出
+            if ($isAll) {
+                break;
+            }
+        }
+
+        return $userIds;
+    }
+
+    /**
+     * 获取UserID
+     *
+     * @time 2020年07月04日
+     * @param $id
+     * @return array
+     */
+    protected function getUserIdsByDepartmentId(array $id)
+    {
+        return Users::whereIn('department_id', $id)->column('id');
+    }
+}

catch/permissions/model/Department.php

@@ -0,0 +1,42 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catchAdmin\permissions\model\search\DepartmentSearch;
+use catcher\base\CatchModel;
+
+class Department extends CatchModel
+{
+    use DepartmentSearch;
+
+    protected $name = 'departments';
+    
+    protected $field = [
+            'id', // 
+			'department_name', // 部门名称
+			'parent_id', // 父级ID
+			'principal', // 负责人
+			'mobile', // 联系电话
+			'email', // 联系又想
+			'creator_id', // 创建人ID
+			'status', // 1 正常 2 停用
+			'sort', // 排序字段
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除状态，null 未删除 timestamp 已删除
+    ];
+
+  /**
+   * 列表数据
+   *
+   * @time 2020年01月09日
+   * @param $params
+   * @return array
+   * @throws \think\db\exception\DbException
+   */
+    public function getList(): array
+    {
+        return $this->catchSearch()
+                    ->catchOrder()
+                    ->select()->toArray();
+    }
+}

catch/permissions/model/HasDepartmentsTrait.php

@@ -0,0 +1,57 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+trait HasDepartmentsTrait
+{
+    /**
+     *
+     * @time 2019年12月08日
+     * @return mixed
+     */
+    public function departments()
+    {
+        return $this->belongsToMany(Department::class, 'role_has_departments', 'department_id', 'role_id');
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @return mixed
+     */
+    public function getDepartments()
+    {
+        return $this->departments()->select();
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param array $departments
+     * @return mixed
+     */
+    public function attachDepartments(array $departments)
+    {
+        if (empty($departments)) {
+            return true;
+        }
+
+        sort($departments);
+
+        return $this->departments()->attach($departments);
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param array $departments
+     * @return mixed
+     */
+    public function detachDepartments(array $departments = [])
+    {
+        if (empty($departments)) {
+            return $this->departments()->detach();
+        }
+
+        return $this->departments()->detach($departments);
+    }
+}

catch/permissions/model/HasJobsTrait.php

@@ -0,0 +1,58 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+trait HasJobsTrait
+{
+    /**
+     *
+     * @time 2019年12月08日
+     * @return mixed
+     */
+    public function jobs()
+    {
+        return $this->belongsToMany(Job::class, 'user_has_jobs', 'job_id', 'uid');
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param array $fields
+     * @return mixed
+     */
+    public function getJobs()
+    {
+        return $this->jobs()->select();
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param array $jobs
+     * @return mixed
+     */
+    public function attachJobs(array $jobs)
+    {
+        if (empty($jobs)) {
+            return true;
+        }
+
+        sort($jobs);
+
+        return $this->jobs()->attach($jobs);
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param array $jobs
+     * @return mixed
+     */
+    public function detachJobs(array $jobs = [])
+    {
+        if (empty($jobs)) {
+            return $this->jobs()->detach();
+        }
+
+        return $this->jobs()->detach($jobs);
+    }
+}

catch/permissions/model/HasPermissionsTrait.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * @filename  HasPermissionsTrait.php
+ * @createdAt 2020/1/14
+ * @project  https://github.com/yanwenwu/catch-admin
+ * @document http://doc.catchadmin.com
+ * @author   JaguarJack <njphper@gmail.com>
+ * @copyright By CatchAdmin
+ * @license  https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt
+ */
+namespace catchAdmin\permissions\model;
+
+trait HasPermissionsTrait
+{
+  /**
+   *
+   * @time 2019年12月09日
+   * @return \think\model\relation\BelongsToMany
+   */
+  public function permissions(): \think\model\relation\BelongsToMany
+  {
+    return $this->belongsToMany(Permissions::class, 'role_has_permissions', 'permission_id', 'role_id');
+  }
+
+  /**
+   *
+   * @time 2019年12月08日
+   * @param array $condition
+   * @param array $field
+   * @return mixed
+   */
+  public function getPermissions($condition = [], $field = [])
+  {
+    return $this->permissions()
+      ->when(!empty($field), function ($query) use ($field){
+        $query->field($field);
+      })
+      ->when(!empty($condition), function ($query) use ($condition){
+        $query->where($condition);
+      })
+      ->select();
+  }
+
+  /**
+   *
+   * @time 2019年12月08日
+   * @param array $permissions
+   * @return mixed
+   * @throws \think\db\exception\DbException
+   */
+  public function attachPermissions(array $permissions)
+  {
+    if (empty($permissions)) {
+        return true;
+    }
+
+    sort($permissions);
+
+    return $this->permissions()->attach($permissions);
+  }
+
+  /**
+   *
+   * @time 2019年12月08日
+   * @param array $permissions
+   * @return mixed
+   */
+  public function detachPermissions(array $permissions = [])
+  {
+    if (empty($permissions)) {
+        return $this->permissions()->detach();
+    }
+
+    return $this->permissions()->detach($permissions);
+  }
+}

catch/permissions/model/HasRolesTrait.php

@@ -16,6 +16,7 @@ trait HasRolesTrait
   /**
    *
    * @time 2019年12月08日
+   * @param array $fields
    * @return mixed
    */
     public function getRoles()
@@ -29,7 +30,7 @@ trait HasRolesTrait
      * @param array $roles
      * @return mixed
      */
-    public function attach(array $roles)
+    public function attachRoles(array $roles)
     {
         if (empty($roles)) {
             return true;
@@ -46,7 +47,7 @@ trait HasRolesTrait
      * @param array $roles
      * @return mixed
      */
-    public function detach(array $roles = [])
+    public function detachRoles(array $roles = [])
     {
         if (empty($roles)) {
             return $this->roles()->detach();

catch/permissions/model/Job.php

@@ -0,0 +1,39 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catchAdmin\permissions\model\search\JobsSearch;
+use catcher\base\CatchModel;
+
+class Job extends CatchModel
+{
+    use JobsSearch;
+
+    protected $name = 'jobs';
+    
+    protected $field = [
+            'id', // 
+			'job_name', // 岗位名称
+			'coding', // 编码
+			'creator_id', // 创建人ID
+			'status', // 1 正常 2 停用
+			'sort', // 排序字段
+			'description', // 描述
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除状态，null 未删除 timestamp 已删除
+    ];
+
+  /**
+   * 列表
+   *
+   * @time 2020年01月09日
+   * @param $params
+   * @throws \think\db\exception\DbException
+   * @return \think\Paginator
+   */
+    public function getList()
+    {
+        return $this->catchSearch()
+                    ->paginate();
+    }
+}

catch/permissions/model/Permissions.php

@@ -0,0 +1,142 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catchAdmin\permissions\model\search\PermissionsSearch;
+use catcher\base\CatchModel;
+use think\Model;
+
+class Permissions extends CatchModel
+{
+    use PermissionsSearch;
+
+    protected $name = 'permissions';
+    
+    protected $field = [
+        'id', //
+        'permission_name', // 菜单名称
+        'parent_id', // 父级ID
+        'icon',
+        'component', // 组件
+        'redirect',
+        'keepalive',
+        'creator_id',
+        'hidden',
+        'module', // 模块
+        'route', // 路由
+        'permission_mark', // 权限标识
+        'type', // 1 菜单 2 按钮
+        'sort', // 排序字段
+        'created_at', // 创建时间
+        'updated_at', // 更新时间
+        'deleted_at', // 删除状态，null 未删除 timestamp 已删除
+    ];
+
+    public const MENU_TYPE = 1;
+    public const BTN_TYPE = 2;
+
+    public const GET = 'get';
+    public const POST = 'post';
+    public const PUT = 'put';
+    public const DELETE = 'delete';
+
+    public function getList($isMenu = false)
+    {
+        return $this->catchSearch()
+                    ->catchOrder()
+                    ->when($isMenu, function ($query){
+                        $query->where('type', self::MENU_TYPE);
+                    })
+                    ->select();
+    }
+
+    public function roles(): \think\model\relation\BelongsToMany
+    {
+        return $this->belongsToMany(Roles::class, 'role_has_permissions', 'role_id', 'permission_id');
+    }
+
+  /**
+   * 获取当前用户权限
+   *
+   * @time 2020年01月14日
+   * @param array $permissionIds
+   * @return \think\Collection
+   * @throws \think\db\exception\DbException
+   * @throws \think\db\exception\ModelNotFoundException
+   * @throws \think\db\exception\DataNotFoundException
+   */
+    public static function getCurrentUserPermissions(array $permissionIds): \think\Collection
+    {
+        return parent::whereIn('id', $permissionIds)
+                      ->field(['permission_name as title', 'id', 'parent_id',
+                          'route', 'icon', 'component', 'redirect', 'module',
+                          'keepalive as keepAlive', 'type', 'permission_mark', 'hidden'
+                      ])
+                      ->catchOrder()
+                      ->select();
+    }
+
+    /**
+     * 插入后回调 更新 level
+     *
+     * @time 2020年04月22日
+     * @param Model $model
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return array|bool|Model|void|null
+     */
+    public static function onAfterInsert(Model $model)
+    {
+        $model = self::where('id', $model->id)->find();
+
+        if ($model && $model->parent_id) {
+            $parent = self::where('id', $model->parent_id)->find();
+            $level = $parent->level ? $parent->level . '-' . $parent->id : $parent->id;
+            return $model->where('id', $model->id)->update([
+                'level' => $level
+            ]);
+        }
+
+        return true;
+    }
+
+
+    public function show($id)
+    {
+        $permission = $this->findBy($id);
+
+        // 不能使用改属性判断，模型有该属性，使用数组方式
+        // $permission->hidden
+        $hidden = $permission['hidden'] == Permissions::ENABLE ? Permissions::DISABLE : Permissions::ENABLE;
+
+        $nextLevelIds = $this->getNextLevel([$id]);
+
+        $nextLevelIds[] = $id;
+
+        return $this->whereIn('id', $nextLevelIds)->update([
+            'hidden' => $hidden,
+            'updated_at' => time(),
+        ]);
+    }
+
+    /**
+     * 获取 level ids
+     *
+     * @time 2020年09月06日
+     * @param array $id
+     * @param array $ids
+     * @return array
+     */
+    protected function getNextLevel(array $id, &$ids = [])
+    {
+       $_ids = $this->whereIn('parent_id', $id)
+             ->where('type', self::MENU_TYPE)
+             ->column('id');
+
+       if (count($_ids)) {
+           $ids = array_merge($_ids, $this->getNextLevel($_ids, $ids));
+       }
+
+       return $ids;
+    }
+}

catch/permissions/model/Roles.php

@@ -0,0 +1,53 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catchAdmin\permissions\model\search\RolesSearch;
+use catcher\base\CatchModel;
+
+class Roles extends CatchModel
+{
+    use HasDepartmentsTrait;
+    use HasPermissionsTrait;
+    use RolesSearch;
+
+    protected $name = 'roles';
+
+    public const ALL_DATA = 1; // 全部数据
+    public const SELF_CHOOSE = 2; // 自定义数据
+    public const SELF_DATA = 3; // 本人数据
+    public const DEPARTMENT_DATA = 4; // 部门数据
+    public const DEPARTMENT_DOWN_DATA = 5; // 部门及以下数据
+
+    protected $field = [
+            'id', // 
+			'role_name', // 角色名
+            'identify', // 身份标识
+			'parent_id', // 父级ID
+            'creator_id', // 创建者
+            'data_range', // 数据范围
+			'description', // 角色备注
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除状态，0未删除 >0 已删除
+			   
+    ];
+
+    public function getList()
+    {
+        return $this->catchSearch()
+                    ->order('id', 'desc')
+                    ->select()
+                    ->toArray();
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @return \think\model\relation\BelongsToMany
+     */
+    public function users(): \think\model\relation\BelongsToMany
+    {
+        return $this->belongsToMany(Users::class, 'user_has_roles', 'uid', 'role_id');
+    }
+
+}

catch/permissions/model/Users.php

@@ -1,12 +1,16 @@
 <?php
-namespace catchAdmin\user\model;
+namespace catchAdmin\permissions\model;
 
-use catchAdmin\permissions\model\HasRolesTrait;
+use catchAdmin\permissions\model\search\UserSearch;
 use catcher\base\CatchModel;
+use catcher\exceptions\FailedException;
+use catcher\Utils;
 
 class Users extends CatchModel
 {
     use HasRolesTrait;
+    use HasJobsTrait;
+    use UserSearch;
     
     protected $name = 'users';
 
@@ -15,6 +19,8 @@ class Users extends CatchModel
 			'username', // 用户名
 			'password', // 用户密码
 			'email', // 邮箱 登录
+            'creator_id', // 创建者ID
+            'department_id', // 部门ID
 			'status', // 用户状态 1 正常 2 禁用
 			'last_login_ip', // 最后登录IP
 			'last_login_time', // 最后登录时间
@@ -40,23 +46,16 @@ class Users extends CatchModel
      * 用户列表
      *
      * @time 2019年12月08日
-     * @param $search
      * @throws \think\db\exception\DbException
      * @return \think\Paginator
      */
-    public function getList($search): \think\Paginator
+    public function getList(): \think\Paginator
     {
-        return (($search['trash'] ?? false) ? static::onlyTrashed() : $this)
+        return $this->withoutField(['updated_at'], true)
-                    ->field(['id', 'username', 'email', 'status','last_login_time','last_login_ip', 'created_at', 'updated_at'])
+                    ->catchSearch()
-                    ->when($search['username'] ?? false, function ($query) use ($search){
+                    ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
-                        return $query->whereLike('username', $search['username']);
+                    ->order($this->aliasField('id'), 'desc')
-                    })
+                    ->paginate();
-                    ->when($search['email'] ?? false, function ($query) use ($search){
-                        return $query->whereLike('email', $search['email']);
-                    })
-                    ->when($search['status'] ?? false, function ($query) use ($search){
-                        return $query->where('status', $search['status']);
-                    })->paginate($search['limit'] ?? $this->limit);
     }
 
     /**
@@ -71,6 +70,11 @@ class Users extends CatchModel
      */
     public function getPermissionsBy($uid = 0): array
     {
+        // 获取超级管理配置 超级管理员全部权限
+        if ($uid == config('catch.permissions.super_admin_id')) {
+            return Permissions::select()->column('id');
+        }
+
         $roles = $uid ? $this->findBy($uid)->getRoles() : $this->getRoles();
 
         $permissionIds = [];
@@ -79,5 +83,28 @@ class Users extends CatchModel
         }
 
         return array_unique($permissionIds);
+    }
+	
+	 /**
+     * 后台根据权限标识判断用户是否拥有某个权限
+     * @param string $permission_mark
+     * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     *
+     * 用法  request()->user()->can('permission@create');
+     */
+    public function can($permission_mark)
+    {
+        // 超级管理员直接返回true
+        if (Utils::isSuperAdmin()){
+            return true;
+        }
+        // 查询当前用户的权限
+        return in_array(
+            Permissions::where('permission_mark',$permission_mark)->value('id') ? : 0,
+            $this->getPermissionsBy()
+        );
     }
 }

catch/permissions/model/search/DepartmentSearch.php

@@ -0,0 +1,15 @@
+<?php
+namespace catchAdmin\permissions\model\search;
+
+trait DepartmentSearch
+{
+    public function searchDepartmentNameAttr($query, $value, $data)
+    {
+        return $query->whereLike('department_name', $value);
+    }
+
+    public function searchStatusAttr($query, $value, $data)
+    {
+        return $query->where('status', $value);
+    }
+}

catch/permissions/model/search/JobsSearch.php

@@ -0,0 +1,20 @@
+<?php
+namespace catchAdmin\permissions\model\search;
+
+trait JobsSearch
+{
+  public function searchJobNameAttr($query, $value, $data)
+  {
+    return $query->whereLike('job_name', $value);
+  }
+
+  public function searchCodingAttr($query, $value, $data)
+  {
+    return $query->whereLike('coding', $value);
+  }
+
+  public function searchStatusAttr($query, $value, $data)
+  {
+    return $query->where('status', $value);
+  }
+}

catch/permissions/model/search/PermissionsSearch.php

@@ -0,0 +1,31 @@
+<?php
+namespace catchAdmin\permissions\model\search;
+
+use catchAdmin\permissions\model\Roles;
+
+trait PermissionsSearch
+{
+    public function searchPermissionNameAttr($query, $value, $data)
+    {
+        return $query->whereLike('permission_name', $value);
+    }
+
+    public function searchIdAttr($query, $value, $data)
+    {
+      $query->where('parent_id', $value)->whereOr('id', $value);
+    }
+
+    public function searchRoleIdAttr($query, $value, $data)
+    {
+        $permissionIds = [];
+        $permissions = Roles::where('id', $value)->find()->getPermissions();
+
+        foreach ($permissions as $_permission) {
+          $permissionIds[] = $_permission->pivot->permission_id;
+        }
+        
+        if(!empty($permissionIds)) {
+          $query->whereIn('id', $permissionIds);
+        }
+    }
+}

catch/permissions/model/search/RolesSearch.php

@@ -0,0 +1,16 @@
+<?php
+namespace catchAdmin\permissions\model\search;
+
+trait RolesSearch
+{
+  public function searchRoleNameAttr($query, $value, $data)
+  {
+    return $query->whereLike('role_name', $value);
+  }
+
+  public function searchIdAttr($query, $value, $data)
+  {
+    $query->where('parent_id', $value)->whereOr('id', $value);
+  }
+
+}

catch/permissions/model/search/UserSearch.php

@@ -0,0 +1,29 @@
+<?php
+namespace catchAdmin\permissions\model\search;
+
+use catchAdmin\permissions\model\Department;
+
+trait UserSearch
+{
+    public function searchUsernameAttr($query, $value, $data)
+    {
+        return $query->whereLike('username', $value);
+    }
+
+    public function searchEmailAttr($query, $value, $data)
+    {
+        return $query->whereLike('email', $value);
+    }
+
+    public function searchStatusAttr($query, $value, $data)
+    {
+        return $query->where($this->aliasField('status'), $value);
+    }
+
+    public function searchDepartmentIdAttr($query, $value, $data)
+    {
+        $departmentIds = Department::where('parent_id', $value)->column('id');
+        $departmentIds[] = $value;
+        return $query->whereIn($this->aliasField('department_id'), $departmentIds);
+    }
+}

catch/permissions/module.json

@@ -0,0 +1,15 @@
+{
+  "name": "权限管理",
+  "alias": "permissions",
+  "description": "权限管理模块",
+  "version": "1.0.0",
+  "keywords": [],
+  "order": 2,
+  "services": [
+    "\\catchAdmin\\permissions\\PermissionService"
+  ],
+  "aliases": {},
+  "files": [],
+  "requires": [],
+  "enable": true
+}

catch/permissions/request/CreateRequest.php

@@ -1,7 +1,7 @@
 <?php
-namespace catchAdmin\user\request;
+namespace catchAdmin\permissions\request;
 
-use catchAdmin\user\model\Users;
+use catchAdmin\permissions\model\Users;
 use catcher\base\CatchRequest;
 
 class CreateRequest extends CatchRequest

catch/permissions/request/UpdateRequest.php

@@ -1,7 +1,7 @@
 <?php
-namespace catchAdmin\user\request;
+namespace catchAdmin\permissions\request;
 
-use catchAdmin\user\model\Users;
+use catchAdmin\permissions\model\Users;
 use catcher\base\CatchRequest;
 
 class UpdateRequest extends 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

@@ -0,0 +1,27 @@
+<?php
+$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/<id>', '\catchAdmin\permissions\controller\Permission@show');
+    $router->get('controller/methods/<id>', '\catchAdmin\permissions\controller\Permission@getMethods');
+
+    // 部门
+    $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\permissions\controller\User');
+    // 切换状态
+    $router->put('users/switch/status/<id>', '\catchAdmin\permissions\controller\User@switchStatus');
+    $router->put('users/recover/<id>', '\catchAdmin\permissions\controller\User@recover');
+    $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');

catch/system/SystemService.php

@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\system;
+
+use catchAdmin\system\events\AttachmentEvent;
+use catcher\ModuleService;
+
+class SystemService extends ModuleService
+{
+
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+
+    public function loadEvents()
+    {
+        return [
+            'attachment' => [ AttachmentEvent::class ],
+        ];
+    }
+}

catch/system/controller/Attachments.php

@@ -0,0 +1,56 @@
+<?php
+namespace catchAdmin\system\controller;
+
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use catchAdmin\system\model\Attachments as AttachmentsModel;
+use catcher\Utils;
+use catcher\facade\FileSystem;
+
+class Attachments extends CatchController
+{
+    /**
+     * 列表
+     *
+     * @time 2020年07月25日
+     * @param AttachmentsModel $model
+     * @return \think\response\Json
+     */
+    public function index(AttachmentsModel $model)
+    {
+        return CatchResponse::paginate($model->getList());
+    }
+
+    /**
+     * 删除
+     *
+     * @time 2020年07月25日
+     * @param $id
+     * @param AttachmentsModel $model
+     * @throws \League\Flysystem\FileNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return \think\response\Json
+     */
+    public function delete($id, AttachmentsModel $model)
+    {
+        $attachments = $model->whereIn('id', Utils::stringToArrayBy($id))->select();
+
+        if ($model->deleteBy($id)) {
+            foreach ($attachments as $attachment) {
+                if ($attachment->driver == 'local') {
+                    $localPath = config('filesystem.disks.local.root') . DIRECTORY_SEPARATOR;
+                    $path = $localPath . str_replace('\\','\/', $attachment->path);
+                    if (!FileSystem::exists($path)) {
+                        Filesystem::delete($path);
+                    }
+                } else {
+                    Filesystem::delete($attachment->path);
+                }
+            }
+        }
+
+        return CatchResponse::success();
+    }
+}

catch/system/controller/Config.php

@@ -0,0 +1,65 @@
+<?php
+namespace catchAdmin\system\controller;
+
+use app\Request;
+use catcher\base\CatchController;
+use catchAdmin\system\model\Config as ConfigModel;
+use catcher\CatchResponse;
+use think\response\Json;
+
+class Config extends CatchController
+{
+    protected $configModel;
+
+    public function __construct(ConfigModel $configModel)
+    {
+        $this->configModel = $configModel;
+    }
+
+    /**
+     * 获取父级别配置
+     *
+     * @time 2020年04月17日
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return Json
+     */
+    public function parent()
+    {
+        return CatchResponse::success($this->configModel->getParentConfig());
+    }
+
+    /**
+     * 存储配置
+     *
+     * @time 2020年04月17日
+     * @param Request $request
+     * @return Json
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
+     */
+    public function save(Request $request)
+    {
+        return CatchResponse::success([
+            'id' => $this->configModel->storeBy($request->param()),
+            'parents' => $this->configModel->getParentConfig(),
+        ]);
+    }
+
+    /**
+     * 获取配置
+     *
+     * @time 2020年04月20日
+     * @param $id
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return Json
+     */
+    public function read($id)
+    {
+        return CatchResponse::success($this->configModel->getConfig($id));
+    }
+}

catch/system/controller/DataDictionary.php

@@ -0,0 +1,95 @@
+<?php
+namespace catchAdmin\system\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use catcher\exceptions\FailedException;
+use catcher\library\BackUpDatabase;
+use think\Collection;
+use think\facade\Console;
+use think\facade\Db;
+use think\Paginator;
+
+class DataDictionary extends CatchController
+{
+    /**
+     *
+     * @time 2019年12月13日
+     * @param Request $request
+     * @return \think\response\Json
+     */
+    public function tables(Request $request): \think\response\Json
+    {
+        $tables = Db::query('show table status');
+
+        // 重组数据
+        foreach ($tables as $key => &$table) {
+            $table = array_change_key_case($table);
+            $table['index_length'] = $table['index_length'] > 1024 ? intval($table['index_length']/1024) .'MB' : $table['index_length'].'KB';
+            $table['data_length'] = $table['data_length'] > 1024 ? intval($table['data_length']/1024) .'MB' : $table['data_length'].'KB';
+            $table['create_time'] = date('Y-m-d', strtotime($table['create_time']));
+        }
+
+        // 搜素
+        $tables = new Collection($tables);
+        // 名称搜索
+        if ($name = $request->get('tablename', null)) {
+            $tables = $tables->where('name', 'like', $name)->values();
+        }
+        // 引擎搜索
+        if ($engine = $request->get('engine', null)) {
+            $tables =  $tables->where('engine', $engine)->values();
+        }
+
+        $page = $request->get('page', 1);
+        $limit = $request->get('limit', 10);
+
+        return CatchResponse::paginate(Paginator::make(array_slice($tables->toArray(), ($page - 1) * $limit, $limit), $limit, $page, $tables->count(), false, []));
+    }
+
+  /**
+   *
+   * @time 2019年12月13日
+   * @param $table
+   * @return \think\response\Json
+   * @throws \Exception
+   */
+    public function view($table): \think\response\Json
+    {
+        return CatchResponse::success(array_values(Db::getFields($table)));
+    }
+
+    /**
+     *
+     * @time 2019年12月13日
+     * @return \think\response\Json
+     */
+    public function optimize(): \think\response\Json
+    {
+        $tables = \request()->post('data');
+
+        foreach ($tables as $table) {
+            Db::query(sprintf('optimize table %s', $table));
+        }
+
+        return CatchResponse::success([], '优化成功');
+    }
+
+    /**
+     *
+     * @time 2019年12月13日
+     * @throws FailedException
+     * @return \think\response\Json
+     */
+    public function backup(BackUpDatabase $backUpDatabase): \think\response\Json
+    {
+        try {
+            $backUpDatabase->done(trim(implode(',', \request()->post('data')), ','));
+        }catch (\Exception $e) {
+            throw new FailedException($e->getMessage());
+        }
+
+        return CatchResponse::success([], '备份成功');
+    }
+}

catch/system/controller/Developer.php

@@ -0,0 +1,103 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+namespace catchAdmin\system\controller;
+
+use think\Request as Request;
+use catcher\CatchAuth;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\system\model\Developers as DevelopersModel;
+
+class Developer extends CatchController
+{
+    protected $model;
+    
+    public function __construct(DevelopersModel $model)
+    {
+        $this->model = $model;
+    }
+    
+    /**
+     * 列表
+     *
+     * @time 2020/07/13 15:26
+     *  
+     * @return \think\Response
+     */
+    public function index()
+    {
+        return CatchResponse::paginate($this->model->getList());
+    }
+
+    /**
+     * 开发者认证
+     *
+     * @time 2020年07月13日
+     * @param Request $request
+     * @param CatchAuth $auth
+     * @return mixed
+     */
+    public function authenticate(Request $request, CatchAuth $auth)
+    {
+        return CatchResponse::success($auth->guard('developer')->username('username')->attempt($request->post()));
+    }
+
+    /**
+     * 保存
+     *
+     * @time 2020/07/13 15:26
+     * @param Request Request 
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        return CatchResponse::success($this->model->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     *
+     * @time 2020/07/13 15:26
+     * @param $id 
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+       return CatchResponse::success($this->model->findBy($id)); 
+    }
+    
+    /**
+     * 更新
+     *
+     * @time 2020/07/13 15:26
+     * @param Request $request 
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        return CatchResponse::success($this->model->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     *
+     * @time 2020/07/13 15:26
+     * @param $id 
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        return CatchResponse::success($this->model->deleteBy($id));
+    }
+    
+    
+}

catch/system/controller/Generate.php

@@ -0,0 +1,28 @@
+<?php
+namespace catchAdmin\system\controller;
+
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use catcher\generate\Generator;
+use think\Request;
+
+class Generate extends CatchController
+{
+    public function save(Request $request, Generator $generator)
+    {
+        return CatchResponse::success($generator->done($request->param()));
+    }
+
+    /**
+     * 预览
+     *
+     * @time 2020年04月29日
+     * @param Request $request
+     * @param Generator $generator
+     * @return \think\response\Json
+     */
+    public function preview(Request $request, Generator $generator)
+    {
+        return CatchResponse::success($generator->preview($request->param()));
+    }
+}

catch/system/controller/LoginLog.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace catchAdmin\system\controller;
+
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use think\facade\Db;
+use catchAdmin\system\model\LoginLog as Log;
+
+class LoginLog extends CatchController
+{
+    /**
+     *
+     * @time 2020年04月28日
+     * @param Log $log
+     * @throws \think\db\exception\DbException
+     * @return \think\response\Json
+     */
+    public function list(Log $log)
+    {
+        return CatchResponse::paginate($log->getList());
+    }
+
+    /**
+     * 清空
+     * 
+     * @time 2020年04月28日
+     * @param Log $log
+     * @throws \Exception
+     * @return \think\response\Json
+     */
+    public function empty(Log $log)
+    {
+        return CatchResponse::success($log->where('id', '>', 0)->delete(), '清空成功');
+    }
+}

catch/system/controller/OperateLog.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace catchAdmin\system\controller;
+
+use catcher\base\CatchController;
+use catcher\CatchResponse;
+use catchAdmin\system\model\OperateLog as Log;
+
+class OperateLog extends CatchController
+{
+    /**
+     *
+     * @time 2020年04月28日
+     * @param Log $log
+     * @throws \think\db\exception\DbException
+     * @return \think\response\Json
+     */
+    public function list(Log $log)
+    {
+        return CatchResponse::paginate($log->getList());
+    }
+
+    /**
+     *
+     * @time 2020年04月28日
+     * @param Log $log
+     * @throws \Exception
+     * @return \think\response\Json
+     */
+    public function empty(Log $log)
+    {
+        return CatchResponse::success($log->where('id', '>', 0)->delete(), '清空成功');
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param mixed $id
+     * @param Log $log
+     * @return \think\response\Json
+     */
+    public function delete($id, Log $log)
+    {
+        return CatchResponse::success($log->deleteBy($id));
+    }
+}

catch/system/controller/SensitiveWord.php

@@ -0,0 +1,69 @@
+<?php
+namespace catchAdmin\system\controller;
+
+use catchAdmin\system\request\sensitiveWord\CreateRequest;
+use catchAdmin\system\request\sensitiveWord\UpdateRequest;
+use catcher\base\CatchController;
+use catchAdmin\system\model\SensitiveWord as Model;
+use catcher\base\CatchRequest;
+use catcher\CatchResponse;
+
+class SensitiveWord extends CatchController
+{
+    protected $sensitiveWord;
+
+    public function __construct(Model $model)
+    {
+        $this->sensitiveWord = $model;
+    }
+
+    /**
+     * 列表
+     *
+     * @time 2020年06月17日
+     * @return \think\response\Json
+     */
+    public function index()
+    {
+        return CatchResponse::paginate($this->sensitiveWord->getList());
+    }
+
+    /**
+     * 保存
+     *
+     * @time 2020年06月17日
+     * @param CreateRequest $request
+     * @return \think\response\Json
+     */
+    public function save(CreateRequest $request)
+    {
+        return CatchResponse::success($this->sensitiveWord->storeBy($request->param()));
+    }
+
+    /**
+     * 更新
+     *
+     * @time 2020年06月17日
+     * @param $id
+     * @param UpdateRequest $request
+     * @return \think\response\Json
+     */
+    public function update($id, UpdateRequest $request)
+    {
+        return CatchResponse::success($this->sensitiveWord->updateBy($id, $request->param()));
+
+    }
+
+    /**
+     * 删除
+     *
+     * @time 2020年06月17日
+     * @param $id
+     * @return \think\response\Json
+     */
+    public function delete($id)
+    {
+        return CatchResponse::success($this->sensitiveWord->deleteBy($id));
+    }
+
+}

catch/system/controller/Upload.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * @filename  Upload.php
+ * @createdAt 2020/1/25
+ * @project  https://github.com/yanwenwu/catch-admin
+ * @document http://doc.catchadmin.com
+ * @author   JaguarJack <njphper@gmail.com>
+ * @copyright By CatchAdmin
+ * @license  https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt
+ */
+namespace catchAdmin\system\controller;
+
+use catchAdmin\system\model\Attachments;
+use catcher\base\CatchController;
+use catcher\base\CatchRequest;
+use catcher\CatchResponse;
+use catcher\CatchUpload;
+
+class Upload extends CatchController
+{
+    protected $attachment;
+
+    public function __construct(Attachments $attachment)
+    {
+        $this->attachment = $attachment;
+    }
+
+  /**
+   * image upload
+   *
+   * @time 2020年01月25日
+   * @param CatchRequest $request
+   * @param CatchUpload $upload
+   * @return \think\response\Json
+   */
+    public function image(CatchRequest $request, CatchUpload $upload): \think\response\Json
+    {
+        $images = $request->file();
+
+        return CatchResponse::success($upload->checkImages($images)->multiUpload($images['image']));
+    }
+
+  /**
+   * file upload
+   *
+   * @time 2020年01月25日
+   * @param CatchRequest $request
+   * @param CatchUpload $upload
+   * @return \think\response\Json
+   */
+    public function file(CatchRequest $request, CatchUpload $upload): \think\response\Json
+    {
+        $files = $request->file();
+
+        return CatchResponse::success($upload->checkFiles($files)->multiUpload($files['file']));
+    }
+}

catch/system/database/migrations/20191212110930_operate_log.php

@@ -31,7 +31,7 @@ class OperateLog extends Migrator
         $table  =  $this->table('operate_log',['engine'=>'Myisam', 'comment' => '操作日志', 'signed' => false]);
         $table->addColumn('module', 'string',['limit'  =>  50,'default'=>'','comment'=>'模块名称'])
             ->addColumn('operate', 'string',['default'=> '', 'limit' => 20, 'comment'=>'操作模块'])
-            ->addColumn('route', 'string',['default'=> '','limit' => 20, 'comment'=>'路由'])
+            ->addColumn('route', 'string',['default'=> '','limit' => 100, 'comment'=>'路由'])
             ->addColumn('params', 'string',['default'=> '','limit' => 1000, 'comment'=>'参数'])
             ->addColumn('ip', 'string',['default'=>'', 'limit' => 20,'comment'=>'ip', 'signed' => false])
             ->addColumn('creator_id', 'integer',['default'=> 0,'comment'=>'创建人ID', 'signed' => false])

catch/system/database/migrations/20200125133249_attachments.php

@@ -0,0 +1,44 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Attachments extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table  =  $this->table('attachments',['engine'=>'Myisam', 'comment' => '附件管理', 'signed' => false]);
+        $table->addColumn('path', 'string',['limit'  =>  50,'default'=>'','comment'=>'附件存储路径'])
+              ->addColumn('url', 'string',['default'=> '', 'limit' => 100, 'comment'=>'资源地址'])
+              ->addColumn('mime_type', 'string',['default'=> '', 'limit' => 100, 'comment'=>'资源mimeType'])
+              ->addColumn('file_ext', 'string',['default'=> '','limit' => 100, 'comment'=>'资源后缀'])
+              ->addColumn('file_size', 'integer',['default'=> 0, 'comment'=>'资源大小'])
+              ->addColumn('filename', 'string',['default'=>'', 'limit' => 255, 'comment'=>'资源名称'])
+              ->addColumn('driver', 'string',['default'=> 0, 'limit' => 20, 'comment' => 'local,oss,qcloud,qiniu'])
+              ->addColumn('created_at', 'integer', array('default'=>0, 'comment'=>'创建时间', 'signed' => false ))
+              ->addColumn('updated_at', 'integer', array('default'=>0, 'comment'=>'更新时间', 'signed' => false ))
+              ->addColumn('deleted_at', 'integer', array('default'=>0, 'comment'=>'删除时间', 'signed' => false ))
+              ->create();
+    }
+}

catch/system/database/migrations/20200417083602_config.php

@@ -0,0 +1,44 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Config extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table  =  $this->table('config',['engine'=>'InnoDB', 'comment' => '配置管理', 'signed' => false]);
+        $table->addColumn('name', 'string',['limit'  =>  50,'default'=>'','comment'=>'配置名称'])
+            ->addColumn('pid', 'integer', array('default'=> 0,'comment'=>'父级配置', 'signed' => false ))
+            ->addColumn('component', 'string', ['default'=> '', 'limit' => 100, 'comment'=>'tab 引入的组件名称'])
+            ->addColumn('key', 'string',['default'=> '', 'limit' => 100, 'comment'=>'配置键名'])
+            ->addColumn('value', 'string',['default'=> '', 'limit' => 255, 'comment'=>'配置键值'])
+            ->addColumn('status', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 启用 2 禁用'])
+            ->addColumn('creator_id', 'integer', array('default'=> 0,'comment'=>'创建人', 'signed' => false ))
+            ->addColumn('created_at', 'integer', ['default'=> 0,'comment'=>'创建时间', 'signed' => false])
+            ->addColumn('updated_at', 'integer', ['default'=> 0,'comment'=>'更新时间', 'signed' => false])
+            ->addColumn('deleted_at', 'integer', ['default'=> 0,'comment'=>'删除时间', 'signed' => false])
+            ->create();
+    }
+}

catch/system/database/migrations/20200617060757_sensitive_word.php

@@ -0,0 +1,39 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class SensitiveWord extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table  =  $this->table('sensitive_word',['engine'=>'InnoDB', 'comment' => '敏感词库', 'signed' => false]);
+        $table->addColumn('word', 'string',['limit'  =>  50,'default'=>'','comment'=>'词汇'])
+              ->addColumn('creator_id', 'integer', array('default'=>0, 'comment'=>'创建人ID', 'signed' => false ))
+              ->addColumn('created_at', 'integer', array('default'=>0, 'comment'=>'创建时间', 'signed' => false ))
+              ->addColumn('updated_at', 'integer', array('default'=>0, 'comment'=>'更新时间', 'signed' => false ))
+              ->addColumn('deleted_at', 'integer', array('default'=>0, 'comment'=>'删除时间', 'signed' => false ))
+              ->create();
+    }
+}

catch/system/database/migrations/20200713152608_developers.php

@@ -0,0 +1,44 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Developers extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table = $this->table('developers', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '开发者' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('username', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => '用户名',])
+			->addColumn('password', 'string', ['limit' => 255,'null' => false,'default' => '','signed' => false,'comment' => '密码',])
+			->addColumn('mobile', 'string', ['limit' => 30,'null' => false,'default' => '','signed' => false,'comment' => '手机号',])
+			->addColumn('id_card', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => '身份证',])
+			->addColumn('alipay_account', 'string', ['limit' => 100,'null' => false,'default' => '','signed' => false,'comment' => '支付宝账户',])
+			->addColumn('status', 'boolean', ['null' => false,'default' => 1,'signed' => false,'comment' => '1 待认证 2 已认证',])
+			->addColumn('created_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '创建时间',])
+			->addColumn('updated_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '更新时间',])
+			->addColumn('deleted_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '软删除',])
+            ->create();
+    }
+}

catch/system/database/migrations/20200726001810_update_attachments_url.php

@@ -0,0 +1,38 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class UpdateAttachmentsUrl extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        if ($this->hasTable('attachments')) {
+            $table = $this->table('attachments');
+
+            $table->changeColumn('url', 'string', ['default'=> '', 'limit' => 255, 'comment'=>'资源地址'])
+                ->update();
+        }
+    }
+}

catch/system/database/seeds/ConfigSeed.php

@@ -0,0 +1,36 @@
+<?php
+
+use think\migration\Seeder;
+
+class ConfigSeed extends Seeder
+{
+    /**
+     * Run Method.
+     *
+     * Write your database seeder using this method.
+     *
+     * More information on writing seeders is available here:
+     * http://docs.phinx.org/en/latest/seeding.html
+     */
+    public function run()
+    {
+        $data = [
+            [
+                'name' => '基础配置',
+                'pid' => 0,
+                'component' => 'basic',
+                'key' => 'basic',
+            ],
+            [
+                'name' => '上传配置',
+                'pid' => 0,
+                'component' => 'upload',
+                'key' => 'upload',
+            ],
+        ];
+
+        foreach ($data as $item) {
+            \catchAdmin\system\model\Config::create($item);
+        }
+    }
+}

catch/system/database/seeds/SystemMenusSeed.php

@@ -0,0 +1,679 @@
+<?php
+
+use think\migration\Seeder;
+
+class SystemMenusSeed extends Seeder
+{
+    /**
+     * Run Method.
+     *
+     * Write your database seeder using this method.
+     *
+     * More information on writing seeders is available here:
+     * http://docs.phinx.org/en/latest/seeding.html
+     */
+    public function run()
+    {
+        \catcher\Utils::importTreeData($this->getPermissions(), 'permissions', 'parent_id');
+    }
+
+    protected function getPermissions()
+    {
+       return array (
+  0 => 
+  array (
+    'id' => 37,
+    'permission_name' => '系统管理',
+    'parent_id' => 0,
+    'level' => '',
+    'route' => '/system',
+    'icon' => 'el-icon-s-tools',
+    'module' => 'system',
+    'creator_id' => 1,
+    'permission_mark' => 'system',
+    'component' => 'layout',
+    'redirect' => 'attactments',
+    'hidden' => 1,
+    'keepalive' => 2,
+    'type' => 1,
+    'sort' => 1,
+    'created_at' => 1587462349,
+    'updated_at' => 1599288737,
+    'deleted_at' => 0,
+    'children' => 
+    array (
+      0 => 
+      array (
+        'id' => 38,
+        'permission_name' => '数据字典',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/database',
+        'icon' => 'el-icon-copy-document',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'dataDictionary',
+        'component' => 'database',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 8,
+        'created_at' => 1587463087,
+        'updated_at' => 1599362678,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 39,
+            'permission_name' => '查看',
+            'parent_id' => 38,
+            'level' => '37-38',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'dataDictionary@view',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587463113,
+            'updated_at' => 1599362691,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 40,
+            'permission_name' => '列表',
+            'parent_id' => 38,
+            'level' => '37-38',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'dataDictionary@tables',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 10,
+            'created_at' => 1587463173,
+            'updated_at' => 1599362678,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 41,
+            'permission_name' => '优化',
+            'parent_id' => 38,
+            'level' => '37-38',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'dataDictionary@optimize',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587463201,
+            'updated_at' => 1599362678,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 42,
+            'permission_name' => '备份',
+            'parent_id' => 38,
+            'level' => '37-38',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'optimize@backup',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587463217,
+            'updated_at' => 1599362678,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      1 => 
+      array (
+        'id' => 43,
+        'permission_name' => '附件管理',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/attactments',
+        'icon' => 'el-icon-folder-opened',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'attactments',
+        'component' => 'attachment',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 10,
+        'created_at' => 1587463302,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 44,
+            'permission_name' => '列表',
+            'parent_id' => 43,
+            'level' => '37-43',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'attachments@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587463335,
+            'updated_at' => 1599217559,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 45,
+            'permission_name' => '删除',
+            'parent_id' => 43,
+            'level' => '37-43',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'attachments@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587463355,
+            'updated_at' => 1599217559,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 46,
+            'permission_name' => '上传图片',
+            'parent_id' => 43,
+            'level' => '37-43',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'upload@image',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587466919,
+            'updated_at' => 1599217559,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 47,
+            'permission_name' => '上传文件',
+            'parent_id' => 43,
+            'level' => '37-43',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'upload@file',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587466939,
+            'updated_at' => 1599217559,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      2 => 
+      array (
+        'id' => 48,
+        'permission_name' => '配置管理',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/config',
+        'icon' => 'el-icon-setting',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'config',
+        'component' => 'config',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 9,
+        'created_at' => 1587466991,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 49,
+            'permission_name' => '父级配置',
+            'parent_id' => 48,
+            'level' => '37-48',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'config@parent',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467036,
+            'updated_at' => 1591345651,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 50,
+            'permission_name' => '存储',
+            'parent_id' => 48,
+            'level' => '37-48',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'config@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467052,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 51,
+            'permission_name' => '获取',
+            'parent_id' => 48,
+            'level' => '37-48',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'config@read',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467062,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      3 => 
+      array (
+        'id' => 52,
+        'permission_name' => '登陆日志',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/log/operate',
+        'icon' => 'el-icon-coin',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'loginLog',
+        'component' => 'loginLog',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 5,
+        'created_at' => 1587467150,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 53,
+            'permission_name' => '列表',
+            'parent_id' => 52,
+            'level' => '37-52',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'loginlog@list',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467206,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 54,
+            'permission_name' => '清空',
+            'parent_id' => 52,
+            'level' => '37-52',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'loginlog@empty',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467221,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      4 => 
+      array (
+        'id' => 55,
+        'permission_name' => '操作日志',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/log/login',
+        'icon' => 'el-icon-house',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'operateLog',
+        'component' => 'operateLog',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 1,
+        'created_at' => 1587467180,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 56,
+            'permission_name' => '列表',
+            'parent_id' => 55,
+            'level' => '37-55',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'operatelog@list',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467246,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 57,
+            'permission_name' => '清空',
+            'parent_id' => 55,
+            'level' => '37-55',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'operatelog@empty',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1587467266,
+            'updated_at' => 1587547118,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      5 => 
+      array (
+        'id' => 58,
+        'permission_name' => '代码生成',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/generate',
+        'icon' => 'el-icon-scissors',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'generate',
+        'component' => 'generate',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 1,
+        'created_at' => 1587717452,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 59,
+            'permission_name' => '生成',
+            'parent_id' => 58,
+            'level' => '37-58',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'generate@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1588110923,
+            'updated_at' => 1599217574,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 60,
+            'permission_name' => '预览',
+            'parent_id' => 58,
+            'level' => '37-58',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'generate@preview',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1588110962,
+            'updated_at' => 1599217574,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      6 => 
+      array (
+        'id' => 68,
+        'permission_name' => '敏感词库',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/sensitive/word',
+        'icon' => 'el-icon-folder-delete',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'sensitiveWord',
+        'component' => 'sensitiveWord',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 1,
+        'created_at' => 1592375865,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+        'children' => 
+        array (
+          0 => 
+          array (
+            'id' => 69,
+            'permission_name' => '列表',
+            'parent_id' => 68,
+            'level' => '37-68',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'sensitiveWord@index',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1592382167,
+            'updated_at' => 1593589434,
+            'deleted_at' => 0,
+          ),
+          1 => 
+          array (
+            'id' => 70,
+            'permission_name' => '新增',
+            'parent_id' => 68,
+            'level' => '37-68',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'sensitiveWord@save',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1592382179,
+            'updated_at' => 1593589434,
+            'deleted_at' => 0,
+          ),
+          2 => 
+          array (
+            'id' => 71,
+            'permission_name' => '更新',
+            'parent_id' => 68,
+            'level' => '37-68',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'sensitiveWord@update',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1592382192,
+            'updated_at' => 1593589434,
+            'deleted_at' => 0,
+          ),
+          3 => 
+          array (
+            'id' => 72,
+            'permission_name' => '删除',
+            'parent_id' => 68,
+            'level' => '37-68',
+            'route' => '',
+            'icon' => '',
+            'module' => 'system',
+            'creator_id' => 1,
+            'permission_mark' => 'sensitiveWord@delete',
+            'component' => '',
+            'redirect' => '',
+            'hidden' => 1,
+            'keepalive' => 1,
+            'type' => 2,
+            'sort' => 1,
+            'created_at' => 1592382202,
+            'updated_at' => 1593589434,
+            'deleted_at' => 0,
+          ),
+        ),
+      ),
+      7 => 
+      array (
+        'id' => 101,
+        'permission_name' => '开发者',
+        'parent_id' => 37,
+        'level' => '37',
+        'route' => '/system/develop',
+        'icon' => 'el-icon-rank',
+        'module' => 'system',
+        'creator_id' => 1,
+        'permission_mark' => 'develop',
+        'component' => 'develop',
+        'redirect' => '',
+        'hidden' => 1,
+        'keepalive' => 1,
+        'type' => 1,
+        'sort' => 1,
+        'created_at' => 1594626307,
+        'updated_at' => 1599288737,
+        'deleted_at' => 0,
+      ),
+    ),
+  ),
+);
+    }
+}

catch/system/events/AttachmentEvent.php

@@ -0,0 +1,17 @@
+<?php
+namespace catchAdmin\system\events;
+
+
+use catchAdmin\system\model\Attachments;
+
+class AttachmentEvent
+{
+    public function handle($params)
+    {
+        $file = $params['file'];
+
+        unset($params['file']);
+
+        Attachments::store($params, $file);
+    }
+}

catch/system/model/Attachments.php

@@ -0,0 +1,57 @@
+<?php
+namespace catchAdmin\system\model;
+
+use catchAdmin\system\model\search\AttachmentsSearch;
+use catcher\base\CatchModel;
+use think\file\UploadedFile;
+use think\Model;
+
+class Attachments extends CatchModel
+{
+    use AttachmentsSearch;
+
+    protected $name = 'attachments';
+    
+    protected $field = [
+            'id', // 
+			'path', // 附件存储路径
+            'url', // 资源地址
+			'mime_type', // 资源mimeType
+			'file_ext', // 资源后缀
+			'file_size', // 资源大小
+			'filename', // 资源名称
+			'driver', // local,oss,qcloud,qiniu
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除时间
+    ];
+
+    public function getList()
+    {
+        return $this->order('id', 'desc')
+                    ->catchSearch()
+                    ->catchOrder()
+                    ->paginate();
+    }
+
+    /**
+     *
+     *
+     * @time 2020年06月01日
+     * @param $data ['driver' => '', 'path' => '', 'url' => ],
+     * @param UploadedFile $file
+     * @return Attachments|Model
+     */
+    public static function store($data, UploadedFile $file)
+    {
+        return parent::create([
+            'file_size' => $file->getSize(),
+            'mime_type' => $file->getMime(),
+            'file_ext' => $file->getOriginalExtension(),
+            'filename' => $file->getOriginalName(),
+            'driver'  => $data['driver'],
+            'url' => $data['url'],
+            'path' => $data['path']
+        ]);
+    }
+}

catch/system/model/Config.php

@@ -0,0 +1,162 @@
+<?php
+namespace catchAdmin\system\model;
+
+use catcher\base\CatchModel;
+use catcher\exceptions\FailedException;
+use thans\jwt\exception\UserNotDefinedException;
+use think\Model;
+
+class Config extends CatchModel
+{
+    protected $name = 'config';
+
+    protected $pk = 'id';
+
+    protected $field = [
+        'id', // 
+		'name', // 配置名称
+		'pid', // 父级配置
+		'key', // 配置键名
+		'value', // 配置键值
+        'component', // 组件
+		'status', // 1 启用 2 禁用
+		'creator_id', // 创建人
+		'created_at', // 创建时间
+		'updated_at', // 更新时间
+		'deleted_at', // 删除时间   
+    ];
+
+    /**
+     *
+     * @time 2020年04月17日
+     * @return \think\Collection
+     *@throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\db\exception\DataNotFoundException
+     */
+    public function getParentConfig()
+    {
+        return $this->where('pid', 0)
+                    ->field(['id', 'name', 'component'])->select();
+    }
+
+    /**
+     * 存储配置
+     *
+     * @time 2020年04月20日
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return bool
+     */
+    public function storeBy(array $data)
+    {
+        if (empty($data)) {
+            return true;
+        }
+
+        $parent = $data['parent'] ?? false;
+        if (!$parent) {
+            throw new FailedException('父配置丢失');
+        }
+        unset($data['parent']);
+
+        $parentConfig = $this->where('key', $parent)->find();
+        $config = [];
+        foreach ($data as $key => $item) {
+            foreach ($item as $k => $value) {
+                if ($value) {
+                    $config[$key . '.' .$k] = [
+                        'pid' => $parentConfig['id'],
+                        'key' => $key . '.' . $k,
+                        'value' => $value,
+                        'created_at' => time(),
+                        'updated_at' => time(),
+                    ];
+                }
+            }
+        }
+
+        $this->where('pid', $parentConfig->id)
+           ->select()
+           ->each(function ($item) use (&$config){
+               if (isset($config[$item['key']])) {
+                  if ($config[$item['key']]['value'] != $item->value) {
+                      $item['value'] = $config[$item['key']]['value'];
+                      $item->save();
+                  }
+                   unset($config[$item['key']]);
+              }
+           });
+
+        if (count($config)) {
+            return $this->insertAll($config);
+        }
+
+        return true;
+    }
+
+    /**
+     * 配置是否存在
+     *
+     * @time 2020年04月19日
+     * @param $key
+     * @param int $pid
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return array|Model|null
+     */
+    public function isExistConfig($key, $pid = 0)
+    {
+        return $this->where('pid', $pid)
+                    ->where('key', $key)
+                    ->find();
+    }
+
+    /**
+     * 获取子配置
+     *
+     * @time 2020年04月19日
+     * @param int $pid
+     * @param array $field
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return \think\Collection
+     */
+    public function subConfig($pid = 0, array $field = ['*'])
+    {
+        return $this->where('pid', $pid)
+                    ->field($field)
+                    ->select();
+    }
+
+    /**
+     * 获取配置
+     *
+     * @time 2020年04月20日
+     * @param string $component
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return array|mixed
+     */
+    public function getConfig(string $component)
+    {
+        $data = [];
+        $configs = $this->where('pid', $this->where('component', $component)->value('id'))
+                      ->field('id,`key` as k,value,pid')
+                      ->select();
+
+        foreach ($configs as $config) {
+            if (strpos($config['k'], '.') !== false) {
+                list($object, $key) = explode('.', $config['k']);
+                $data[$object][$key] = $config['value'];
+            }
+        }
+
+        return $data;
+    }
+}

catch/system/model/Developers.php

@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+namespace catchAdmin\system\model;
+
+use catchAdmin\system\model\search\DeveloperSearch;
+use catcher\base\CatchModel as Model;
+
+class Developers extends Model
+{
+    use DeveloperSearch;
+
+    protected $name = 'developers';
+
+    protected $field = [
+        'id', // 
+		'username', // 用户名
+		'password', // 密码
+		'mobile', // 手机号
+		'id_card', // 身份证
+		'alipay_account', // 支付宝账户
+		'status', // 1 待认证 1 已认证
+		'created_at', // 创建时间
+		'updated_at', // 更新时间
+		'deleted_at', // 软删除
+    ];
+
+
+    public function setPasswordAttr($value)
+    {
+        return password_hash($value, PASSWORD_DEFAULT);
+    }
+  
+}

catch/system/model/LoginLog.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace catchAdmin\system\model;
+
+use catcher\traits\db\BaseOptionsTrait;
+use catchAdmin\system\model\search\LoginLogSearch;
+
+class LoginLog extends \think\Model
+{
+	use BaseOptionsTrait, LoginLogSearch;
+
+	protected $name = 'login_log';
+
+	protected $field = [
+		'id', // 
+		'login_name', // 用户名
+		'login_ip', // 登录地点ip
+		'browser', // 浏览器
+		'os', // 操作系统
+		'login_at', // 登录时间
+		'status', // 1 成功 2 失败   
+	];
+
+	public function getList()
+	{
+		return $this->catchSearch()
+			->order('id', 'desc')
+			->paginate();
+	}
+}

catch/system/model/OperateLog.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace catchAdmin\system\model;
+
+use catchAdmin\permissions\model\Users;
+use catcher\traits\db\BaseOptionsTrait;
+use catchAdmin\system\model\search\OperateLogSearch;
+
+class OperateLog extends \think\Model
+{
+    use BaseOptionsTrait;
+    use OperateLogSearch;
+
+
+    protected $name = 'operate_log';
+
+    protected $field = [
+        'id', // 
+        'module', // 模块名称
+        'operate', // 操作模块
+        'route', // 路由
+        'params', // 参数
+        'ip', // ip
+        'creator_id', // 创建人ID
+        'method', // 请求方法
+        'created_at', // 登录时间   
+    ];
+
+    /**
+     * get list
+     *
+     * @time 2020年04月28日
+     * @param $params
+     * @throws \think\db\exception\DbException
+     * @return void
+     */
+    public function getList()
+    {
+        return $this->field([$this->aliasField('*')])
+            ->catchJoin(Users::class, 'id', 'creator_id', ['username as creator'])
+            ->catchSearch()
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+    }
+}

catch/system/model/SensitiveWord.php

@@ -0,0 +1,43 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+namespace catchAdmin\system\model;
+
+use catchAdmin\permissions\model\Users;
+use catcher\base\CatchModel;
+
+class SensitiveWord extends CatchModel
+{
+    protected $name = 'sensitive_word';
+
+    protected $field = [
+        'id', // 
+		'word', // 词汇
+		'creator_id', // 创建人ID
+		'created_at', // 创建时间
+		'updated_at', // 更新时间
+		'deleted_at', // 删除时间
+    ];
+
+    /**
+     * 词汇查询
+     *
+     * @time 2020年06月17日
+     * @param $query
+     * @param $value
+     * @param $data
+     * @return mixed
+     */
+    public function searchWordAttr($query, $value, $data)
+    {
+        return $query->whereLike('word', $value);
+    }
+}

catch/system/model/search/AttachmentsSearch.php

@@ -0,0 +1,29 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\system\model\search;
+
+trait AttachmentsSearch
+{
+    public function searchFileExtAttr($query, $value, $data)
+    {
+        return $query->where('file_ext', $value);
+    }
+
+    public function searchMimeTypesAttr($query, $value, $data)
+    {
+        return $query->where('mime_type', $value);
+    }
+
+    public function searchDriverAttr($query, $value, $data)
+    {
+        return $query->where('driver', $value);
+    }
+}

catch/system/model/search/DeveloperSearch.php

@@ -0,0 +1,29 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\system\model\search;
+
+trait DeveloperSearch
+{
+    public function searchUsernameAttr($query, $value, $data)
+    {
+        return $query->whereLike('username', $value);
+    }
+
+    public function searchMobileAttr($query, $value, $data)
+    {
+        return $query->whereLike('mobile', $value);
+    }
+
+    public function searchStatusAttr($query, $value, $data)
+    {
+        return $query->where('driver', $value);
+    }
+}

catch/system/model/search/LoginLogSearch.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace catchAdmin\system\model\search;
+
+trait LoginLogSearch
+{
+    public function searchLoginNameAttr($query, $value, $data)
+    {
+        return $query->whereLike('login_name', $value);
+    }
+
+    public function searchLoginIpAttr($query, $value, $data)
+    {
+        return $query->whereLike('login_ip', $value);
+    }
+
+    public function searchLoginAtAttr($query, $value, $data)
+    {
+        return $query->whereTime('login_at', 'between', $value);
+    }
+}

catch/system/model/search/OperateLogSearch.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace catchAdmin\system\model\search;
+
+trait OperateLogSearch
+{
+    public function searchModuleAttr($query, $value, $data)
+    {
+        return $query->whereLike('module', $value);
+    }
+
+    public function searchMethodAttr($query, $value, $data)
+    {
+        return $query->whereLike('method', $value);
+    }
+
+    public function searchCreatorAttr($query, $value, $data)
+    {
+        return $query->where('username', $value);
+    }
+
+    public function searchCreateAtAttr($query, $value, $data)
+    {
+        return $query->whereTime($this->aliasField('created_at'), 'between', $value);
+    }
+}

catch/system/module.json

@@ -0,0 +1,15 @@
+{
+    "name": "系统管理",
+    "alias": "system",
+    "description": "系统管理模块",
+    "version": "1.0.0",
+    "keywords": [],
+    "order": 2,
+    "services": [
+        "\\catchAdmin\\system\\SystemService"
+    ],
+    "aliases": [],
+    "files": [],
+    "requires": [],
+    "enable": true
+}