add:优雅的返回Json数据

fixed:修复类型异常未捕获
2020-08-27 16:19:06 +08:00 · 2020-08-27 16:18:09 +08:00
253 changed files with 2502 additions and 13312 deletions
--- a/README.md
+++ b/README.md
@@ -4,10 +4,7 @@


 <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>
+<a href="https://pro.loacg.com/docs/getting-started">ant degisn pro vue</a>二次开发而成的后台管理系统，采用了目前趋势的前后端分离开发模式，后端仅需要提供简洁的 API 数据结构，前端负责呈现数据。目前前端采用数据驱动，大大提高了开发效率。这不仅仅是一个项目，更是后端更新技术栈的一次实践</p>

 <p align="center">
 <a href="http://doc.catchadmin.com/">文档</a> |
@@ -31,62 +28,18 @@
    <img src="https://svg.hamm.cn/badge.svg?key=License&value=Apache-2.0"/>
 </p >

-## AntDV 版本
- 请使用 `v1`分支
-
-## 功能
- [x] `用户管理` 后台用户管理
- [x] `部门管理` 配置公司的部门结构，支持树形结构
- [x] `岗位管理` 配置后台用户的职务
- [x] `菜单管理` 配置系统菜单，按钮等等
- [x] `角色管理` 配置用户担当的角色，分配权限
- [x] `数据字典` 管理后台表结构
- [x] `操作日志` 后台用户操作记录
- [x] `登录日志` 后台系统用户的登录记录
- [x] `代码生成` 生成 API 端的 CURD 操作
- [x] `敏感词`  支持敏感词配置
- [x] `附件管理` 可管理上传的文件
- [x] `定时任务` 可管理定时任务，而不依赖于 Crontab
- [x] `短信平台` 短信云管理，支持 阿里大于，腾讯云，Ucloud，Submail
- [x] `云上传`  支持云上传，七牛，OSS，腾讯
- [ ] `微信管理`
-
 ## 项目地址
 - [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>
+<p align="center">
+    <img src="https://cdn.learnku.com/uploads/images/202005/17/18206/0ECPy72zUZ.png!large">
+</p>
+<p align="center">
+    <img src="https://cdn.learnku.com/uploads/images/202005/17/18206/ngzSU0A9SI.png!large">
+</p>

 ## 环境要求
 - php7.1+ (需以下扩展)
@@ -110,7 +63,8 @@ curl -sS https://install.phpcomposer.com/installer | php

 composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/

-composer install --ignore-platform-reqs
+composer install
+
 ```
 - composer 安装
 ```shell
@@ -126,8 +80,8 @@ composer create-project jaguarjack/catchadmin:dev-master
 ## 体验地址

 [体验地址](http://vue.catchadmin.com)
- 账号: catch@admin.com
- 密码: catchadmin
+- 账号: admin@gmail.com
+- 密码: admin

 [catchadmin 文档地址](http://doc.catchadmin.com)

@@ -143,21 +97,22 @@ composer create-project jaguarjack/catchadmin:dev-master
 如果你觉得项目对你有帮助，可以请作者喝杯咖啡☕️！鼓励下
 <img src="https://cdn.learnku.com/uploads/images/202008/11/18206/e6qAAM8Bod.jpg!large">

-### Who used
- [uctoo 应用开发管理后台](https://gitee.com/uctoo/uctoo)
-
 ### Talking
 - [论坛讨论](http://bbs.catchadmin.com)
 - 可以提 `ISSUE`，请按照 `issue` 模板提问
- 加入 Q 群 `302266230` 前请先 star 项目支持一下， 备注填写用户名 + 平台。例如： JaguarJack Github
+- 加入 Q 群 `302266230` 讨论以及反馈一些问题。
+    - 加群需要付费，所以请使用能支持群费的客户端。(不喜勿喷，过滤一部分不看文档和 TP 框架文档并且衣来伸手饭来张口的用户)
+    - 不建议你付费入群，认真阅读文档可以解决所有问题
+    - 更愿意以 `ISSUE` 的方式提问
+    - 付费入群，群里的各位也是没有义务回答各种各样的基础问题。请 GOOGLE。

 ### Thanks
- 感谢 [JetBrains](https://www.jetbrains.com) 提供生产力巨高的 `PHPStorm`和`WebStorm`
-> 排名不分先后
+> 排名部分先后

 - [top-think/think](https://github.com/top-think/think)
- [element-admin](https://panjiachen.gitee.io/vue-element-admin-site/zh/)
+- [ant-design-pro-vue](https://github.com/sendya/ant-design-pro-vue)
 - [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)
--- a/app/Request.php
+++ b/app/Request.php
@@ -33,7 +33,7 @@ class Request extends \think\Request
        $user = $this->auth->guard($guard ? : config('catch.auth.default.guard'))->user();

        if ($user->status == Users::DISABLE) {
-            throw new LoginFailedException('该用户已被禁用', Code::USER_FORBIDDEN);
+            throw new LoginFailedException('该用户已被禁用');
        }
    }  catch (\Exception $e) {
        if ($e instanceof TokenExpiredException) {
@@ -45,7 +45,7 @@ class Request extends \think\Request
        if ($e instanceof TokenInvalidException) {
            throw new FailedException('token 不合法', Code::LOST_LOGIN);
        }
-        throw new FailedException('认证失败: '. $e->getMessage(), $e->getCode());
+        throw new FailedException('认证失败: '. $e->getMessage(), Code::LOST_LOGIN);
    }

    return $user;
--- a/catch/domain/DomainService.php
+++ b/catch/domain/DomainService.php
@@ -1,53 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\domain;
-
-use catchAdmin\domain\support\contract\DomainActionInterface;
-use catchAdmin\domain\support\contract\DomainRecordInterface;
-use catchAdmin\domain\support\driver\aliyun\Domain;
-use catchAdmin\domain\support\driver\aliyun\DomainRecord;
-use catcher\ModuleService;
-
-class DomainService extends ModuleService
-{
-    public function register()
-    {
-        parent::register(); // TODO: Change the autogenerated stub
-
-        $this->registerInstance();
-    }
-
-    public function loadConfig()
-    {
-        return require __DIR__ . DIRECTORY_SEPARATOR . 'config.php';
-    }
-
-    /**
-     * @return string
-     */
-    public function loadRouteFrom()
-    {
-        // TODO: Implement loadRouteFrom() method.
-        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
-    }
-
-    /**
-     *
-     */
-    protected function registerInstance()
-    {
-        $default = config('catch.domains.default');
-       
-        $this->app->instance(DomainActionInterface::class, $this->app->make(__NAMESPACE__ . '\\support\\driver\\' . $default . '\Domain'));
-        $this->app->instance(DomainRecordInterface::class, $this->app->make(__NAMESPACE__ . '\\support\\driver\\' . $default . '\DomainRecord'));
-    }
-}
--- a/catch/domain/README.md
+++ b/catch/domain/README.md
@@ -1,46 +0,0 @@
-## 域名管理
- 阿里云（主支持）
- 腾讯云（需要做适配）
-
-#### 配置
-首先在 .env 文件设置
-```
-[ALIYUN]
-ACCESS_KEY=
-ACCESS_SECRET=
-
-[QCLOUD]
-ACCESS_KEY=
-ACCESS_SECRET=
-```
-也可以在 config.php 文件配置
-```
-'domains' => [
-    // 默认阿里云
-    'default' => 'aliyun',
-
-    /**
-     * 阿里云配置
-     *
-     */
-    'aliyun' => [
-        'api_domain' => 'http://alidns.aliyuncs.com',
-
-        'access_key' => Env::get('aliyun.access_key', ''),
-
-        'access_secret' =>  Env::get('aliyun.access_secret', ''),
-    ],
-
-    /**
-     * 腾讯云配置
-     *
-     */
-    'qcloud' => [
-        'api_domain' => 'cns.api.qcloud.com',
-
-        'access_key' => Env::get('qcloud.access_key', ''),
-
-        'access_secret' => Env::get('qcloud.access_secret', ''),
-    ]
-]
-```
--- a/catch/domain/config.php
+++ b/catch/domain/config.php
@@ -1,43 +0,0 @@
-<?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\facade\Env;
-
-return [
-    'domains' => [
-        // 默认阿里云
-        'default' => 'aliyun',
-
-        /**
-         * 阿里云配置
-         *
-         */
-        'aliyun' => [
-            'api_domain' => 'http://alidns.aliyuncs.com',
-
-            'access_key' => Env::get('aliyun.access_key', ''),
-
-            'access_secret' =>  Env::get('aliyun.access_secret', ''),
-        ],
-
-        /**
-         * 腾讯云配置
-         *
-         */
-        'qcloud' => [
-            'api_domain' => 'cns.api.qcloud.com',
-
-            'access_key' => Env::get('qcloud.access_key', ''),
-
-            'access_secret' => Env::get('qcloud.access_secret', ''),
-        ]
-    ]
-];
--- a/catch/domain/controller/Domain.php
+++ b/catch/domain/controller/Domain.php
@@ -1,50 +0,0 @@
-<?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\domain\controller;
-
-use catchAdmin\domain\support\contract\DomainActionInterface;
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-
-class Domain extends CatchController
-{
-    protected $domain;
-
-    public function __construct(DomainActionInterface $domain)
-    {
-        $this->domain = $domain;
-    }
-
-    /**
-     * 列表
-     *
-     * @time 2020/09/11 18:14
-     * @param Request $request
-     * @return \think\Response
-     */
-    public function index(Request $request): \think\Response
-    {
-        return CatchResponse::paginate($this->domain->getList($request->param()));
-    }
-
-    /**
-     * 读取
-     *
-     * @time 2020/09/11 18:14
-     * @param $name
-     * @return \think\Response
-     */
-    public function read($name)
-    {
-        return CatchResponse::success($this->domain->read(str_replace('-', '.', $name)));
-    }
-}
--- a/catch/domain/controller/DomainRecord.php
+++ b/catch/domain/controller/DomainRecord.php
@@ -1,99 +0,0 @@
-<?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\domain\controller;
-
-use catchAdmin\domain\support\contract\DomainRecordInterface;
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-
-class DomainRecord extends CatchController
-{
-    protected $domainRecord;
-
-    public function __construct(DomainRecordInterface $record)
-    {
-        $this->domainRecord = $record;
-    }
-
-    /**
-     * 列表
-     *
-     * @time 2020/09/11 18:14
-     * @param Request $request
-     * @return \think\Response
-     */
-    public function index(Request $request): \think\Response
-    {
-        return CatchResponse::paginate($this->domainRecord->getList($request->param()));
-    }
-
-    /**
-     * 保存
-     *
-     * @time 2020/09/11 18:14
-     * @param Request Request
-     * @return \think\Response
-     */
-    public function save(Request $request): \think\Response
-    {
-        return CatchResponse::success($this->domainRecord->store($request->post()));
-    }
-
-    /**
-     * 读取
-     *
-     * @time 2020/09/11 18:14
-     * @param $name
-     * @return \think\Response
-     */
-    public function read($name): \think\Response
-    {
-        return CatchResponse::success($this->domainRecord->read($name));
-    }
-
-    /**
-     * 更新
-     *
-     * @time 2020/09/11 18:14
-     * @param Request $request
-     * @param $id
-     * @return \think\Response
-     */
-    public function update($id, Request $request): \think\Response
-    {
-        return CatchResponse::success($this->domainRecord->update($id, $request->post()));
-    }
-
-    /**
-     * 删除
-     *
-     * @time 2020/09/11 18:14
-     * @param $id
-     * @return \think\Response
-     */
-    public function delete($id): \think\Response
-    {
-        return CatchResponse::success($this->domainRecord->delete($id));
-    }
-
-    /**
-     * 设置状态
-     *
-     * @param $id
-     * @param $status
-     * @return \think\response\Json
-     */
-    public function enable($id, $status)
-    {
-        return CatchResponse::success($this->domainRecord->enable($id, $status));
-    }
-}
--- a/catch/domain/database/seeds/DomainMenusSeed.php
+++ b/catch/domain/database/seeds/DomainMenusSeed.php
@@ -1,100 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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 DomainMenusSeed 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' => 82,
-    'permission_name' => '域名管理',
-    'parent_id' => 0,
-    'level' => '',
-    'route' => '/domain',
-    'icon' => 'el-icon-stopwatch',
-    'module' => 'domain',
-    'creator_id' => 1,
-    'permission_mark' => 'domain',
-    'component' => 'layout',
-    'redirect' => '/domain/index',
-    'keepalive' => 1,
-    'type' => 1,
-    'hidden' => 1,
-    'sort' => 1,
-    'created_at' => 1601105834,
-    'updated_at' => 1612754299,
-    'deleted_at' => 0,
-    'children' => 
-    array (
-      0 => 
-      array (
-        'id' => 83,
-        'permission_name' => '域名设置',
-        'parent_id' => 82,
-        'level' => '82',
-        'route' => '/domain/index',
-        'icon' => 'el-icon-setting',
-        'module' => 'domain',
-        'creator_id' => 1,
-        'permission_mark' => 'domain',
-        'component' => 'domain',
-        'redirect' => '',
-        'keepalive' => 1,
-        'type' => 1,
-        'hidden' => 1,
-        'sort' => 8,
-        'created_at' => 1601105879,
-        'updated_at' => 1612754299,
-        'deleted_at' => 0,
-      ),
-      1 => 
-      array (
-        'id' => 84,
-        'permission_name' => '域名记录',
-        'parent_id' => 82,
-        'level' => '82',
-        'route' => '/domain/record/:domain',
-        'icon' => 'el-icon-document',
-        'module' => 'domain',
-        'creator_id' => 1,
-        'permission_mark' => 'domainRecord',
-        'component' => 'domainRecord',
-        'redirect' => '',
-        'keepalive' => 1,
-        'type' => 1,
-        'hidden' => 2,
-        'sort' => 1,
-        'created_at' => 1601112569,
-        'updated_at' => 1612754299,
-        'deleted_at' => 0,
-      ),
-    ),
-  ),
-);
-    }
-}
--- a/catch/domain/module.json
+++ b/catch/domain/module.json
@@ -1,15 +0,0 @@
-{
-    "name": "域名管理",
-    "alias": "domain",
-    "description": "域名，阿里云，腾讯云",
-    "version": "1.0.0",
-    "keywords": [],
-    "order": 0,
-    "services": [
-        "\\catchAdmin\\domain\\DomainService"
-    ],
-    "aliases": {},
-    "files": [],
-    "requires": [],
-    "enable": false
-}
--- a/catch/domain/route.php
+++ b/catch/domain/route.php
@@ -1,24 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-/* @var think\Route $router */
-
-// you should use `$router`
-use catchAdmin\domain\controller\DomainRecord;
-
-$router->group(function () use ($router){
-    // 域名管理
-    $router->get('domain',  '\catchAdmin\domain\controller\Domain@index');
-    $router->get('domain/<name>',  '\catchAdmin\domain\controller\Domain@read');
-    // 域名解析管理
-    $router->resource('record/domain', DomainRecord::class);
-    $router->put('record/domain/<id>/<status>', '\catchAdmin\domain\controller\DomainRecord@enable');
-})->middleware('auth');
-
--- a/catch/domain/support/CommonParams.php
+++ b/catch/domain/support/CommonParams.php
@@ -1,70 +0,0 @@
-<?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\domain\support;
-
-use catchAdmin\domain\support\signature\Aliyun;
-use catchAdmin\domain\support\signature\Qcloud;
-
-/**
- * 公共参数
- *
- * Class CommonParams
- * @package catchAdmin\domain\support
- */
-class CommonParams
-{
-    /**
-     * 阿里云公共参数
-     *
-     * @param array $params
-     * @param string $method
-     * @return array
-     */
-    public static function aliyun(array $params, $method = 'GET')
-    {
-        date_default_timezone_set('UTC');
-
-        $params = array_merge($params, [
-            'Format' => 'json',
-            'Version' => '2015-01-09',
-            'AccessKeyId' => config('catch.domains.aliyun.access_key'),
-            'SignatureMethod' => 'HMAC-SHA1',
-            'Timestamp' => date('Y-m-d\TH:i:s\Z'),
-            'SignatureVersion' => '1.0',
-            'SignatureNonce' => uniqid()
-        ]);
-
-        $params['Signature'] = (new Aliyun($params))->signature($method);
-
-        return $params;
-    }
-
-    /**
-     * 腾讯云公共参数
-     *
-     * @param array $params
-     * @param string $method
-     * @return array
-     */
-    public static function qcloud(array $params, $method = 'GET')
-    {
-        $params = array_merge($params, [
-            'SecretId' => config('catch.domains.qcloud.access_key'),
-            'SignatureMethod' => 'HmacSHA1',
-            'Timestamp' => time(),
-            'Nonce' => uniqid()
-        ]);
-
-        $params['Signature'] = (new Qcloud($params))->signature($method);
-
-        return $params;
-    }
-}
--- a/catch/domain/support/Transformer.php
+++ b/catch/domain/support/Transformer.php
@@ -1,112 +0,0 @@
-<?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\domain\support;
-
-use think\Paginator;
-
-class Transformer
-{
-    /**
-     * 分页展示
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public static function aliyunDomainPaginate(array $data)
-    {
-        $list = [];
-
-        foreach ($data['Domains']['Domain'] as $item) {
-            $list[] = [
-                'name' => $item['DomainName'],
-                'created_at' => date('Y-m-d', $item['CreateTimestamp']/1000),
-                'dns_server' => $item['DnsServers']['DnsServer'],
-                'from' => $item['VersionName'],
-                'free' => $item['VersionCode'] === 'mianfei',
-                'record_count' => $item['RecordCount'],
-                'tags' => $item['Tags']['Tag'],
-                'id' => $item['DomainId']
-            ];
-        }
-        
-        return Paginator::make($list, $data['PageSize'], $data['PageNumber'], $data['TotalCount']);
-    }
-
-    /**
-     * 腾讯云域名列表
-     *
-     * @param array $data
-     * @param $page
-     * @param $limit
-     * @return Paginator|\think\paginator\driver\Bootstrap
-     */
-    public static function qcloudDomainPaginate(array $data, $page, $limit)
-    {
-        $info = $data['data']['info'];
-        $domains = $data['data']['domains'];
-
-        $list = [];
-
-        foreach ($domains as $item) {
-            $list[] = [
-                'name' => $item['name'],
-                'created_at' => $item['created_on'],
-                'dns_server' => [],
-                'from' => 'qcloud',
-                'free' => $item['grade'] === 'DP_Free',
-                'record_count' => $item['records'],
-                'tags' => [],
-                'id' => $item['id']
-            ];
-        }
-
-        return Paginator::make($list,  $limit, $page + 1,$info['domain_total']);
-    }
-
-    /**
-     * 阿里云域名解析
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public static function aliyunDomainRecordPaginate(array $data)
-    {
-        $list = [];
-
-        foreach ($data['DomainRecords']['Record'] as &$item) {
-            $list[] = array_change_key_case($item);
-        }
-
-        return Paginator::make($list, $data['PageSize'], $data['PageNumber'], $data['TotalCount']);
-    }
-
-    /**
-     * DNS 记录
-     *
-     * @param array $data
-     * @param $page
-     * @param $limit
-     * @return Paginator|\think\paginator\driver\Bootstrap
-     */
-    public static function qcloudDomainRecordPaginate(array $data, $page, $limit)
-    {
-        $list = [];
-
-        foreach ($data['data']['records'] as &$item) {
-            $item['status'] = $item['status'] === 'enabled' ? 'ENABLE' : 'DISABLE';
-            $item['rr'] = $item['name'];
-            $item['recordid'] = $item['id'];
-            $list[] = array_change_key_case($item);
-        }
-
-        return Paginator::make($list, $limit, $page + 1, $data['data']['info']['record_total']);
-    }
-}
--- a/catch/domain/support/contract/DomainActionInterface.php
+++ b/catch/domain/support/contract/DomainActionInterface.php
@@ -1,22 +0,0 @@
-<?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\domain\support\contract;
-
-interface DomainActionInterface
-{
-    public function getList(array $params);
-
-    public function store(array $params);
-
-    public function delete(array $params);
-
-    public function read($name);
-}
--- a/catch/domain/support/contract/DomainRecordInterface.php
+++ b/catch/domain/support/contract/DomainRecordInterface.php
@@ -1,27 +0,0 @@
-<?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\domain\support\contract;
-
-interface DomainRecordInterface
-{
-    public function getList(array $params);
-
-    public function store(array $params);
-
-    public function delete($recordId);
-
-    public function read(array $params);
-
-    public function update($recordId, array $params);
-
-    public function enable($recordId, $status);
-
-}
--- a/catch/domain/support/driver/ApiTrait.php
+++ b/catch/domain/support/driver/ApiTrait.php
@@ -1,32 +0,0 @@
-<?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\domain\support\driver;
-
-use catcher\facade\Http;
-use catchAdmin\domain\support\CommonParams;
-
-trait ApiTrait
-{
-    public function get(array $params)
-    {
-        $name = config('catch.domains.default');
-
-        $apiDomain = config('catch.domains.' . $name . '.api_domain');
-
-        if (strpos($apiDomain, 'https') === false &&
-        strpos($apiDomain, 'http') === false) {
-            $apiDomain = 'https://' . $apiDomain . '/v2/index.php';
-        }
-
-        return Http::ignoreSsl()->query(CommonParams::{$name}($params))
-            ->get($apiDomain)->json();
-    }
-}
--- a/catch/domain/support/driver/aliyun/Domain.php
+++ b/catch/domain/support/driver/aliyun/Domain.php
@@ -1,55 +0,0 @@
-<?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\domain\support\driver\aliyun;
-
-use catchAdmin\domain\support\contract\DomainActionInterface;
-use catchAdmin\domain\support\driver\ApiTrait;
-use catchAdmin\domain\support\Transformer;
-
-class Domain implements DomainActionInterface
-{
-    use ApiTrait;
-
-    public function getList(array $params)
-    {
-        // TODO: Implement getList() method.
-       return Transformer::aliyunDomainPaginate($this->get([
-            'Action' => 'DescribeDomains',
-            'StarMark' => true,
-            'SearchModel' => 'LIKE',
-            'PageNumber' => $params['page'] ?? 1,
-            'PageSize' => $params['limit'] ?? 20,
-        ]));
-    }
-
-    public function store(array $params)
-    {
-        // TODO: Implement add() method.
-    }
-
-    public function delete(array $params)
-    {
-        // TODO: Implement delete() method.
-        return $this->get([
-            'Action' => 'DeleteDomain',
-            'DomainName' => $params['name'],
-        ]);
-    }
-
-    public function read($name)
-    {
-        // TODO: Implement info() method.
-        return $this->get([
-            'Action' => 'DescribeDomainInfo',
-            'DomainName' => $name
-        ]);
-    }
-}
--- a/catch/domain/support/driver/aliyun/DomainRecord.php
+++ b/catch/domain/support/driver/aliyun/DomainRecord.php
@@ -1,147 +0,0 @@
-<?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\domain\support\driver\aliyun;
-
-use catchAdmin\domain\support\contract\DomainRecordInterface;
-use catchAdmin\domain\support\driver\ApiTrait;
-use catchAdmin\domain\support\Transformer;
-
-class DomainRecord implements DomainRecordInterface
-{
-    use ApiTrait;
-
-    /**
-     * 列表
-     *
-     * @param array $params
-     * @return mixed
-     */
-    public function getList(array $params)
-    {
-        $data = [
-            'Action' => 'DescribeDomainRecords',
-            'DomainName' => $params['name'],
-            'PageNumber' => $params['page'] ?? 1,
-            'PageSize' => $params['limit'] ?? 20,
-        ];
-
-        if ($params['rr']) {
-            $data['RRKeyWord'] = $params['rr'];
-        }
-
-        if ($params['type']) {
-            $data['TypeKeyWord'] = $params['type'];
-        }
-
-        if ($params['value']) {
-            $data['ValueKeyWord'] = $params['value'];
-        }
-
-        if ($params['line']) {
-            $data['Line'] = $params['line'];
-        }
-
-        if ($params['status']) {
-            $data['Status'] = $params['status'];
-        }
-
-        // TODO: Implement getList() method.
-        return Transformer::aliyunDomainRecordPaginate($this->get($data));
-    }
-
-    /**
-     * 新增解析
-     *
-     * @param array $params
-     * @return array
-     *
-     */
-    public function store(array $params)
-    {
-        // TODO: Implement add() method.
-        return $this->get([
-            'Action' => 'AddDomainRecord',
-            'DomainName' => $params['name'],
-            'RR' => $params['rr'],
-            'Type' => $params['type'],
-            'Value' => $params['value'],
-            'Line' => $params['line'],
-            'TTL' => $params['ttl'],
-        ]);
-    }
-
-    /**
-     * 删除解析
-     *
-     * @param $recordId
-     * @return array
-     */
-    public function delete($recordId)
-    {
-        // TODO: Implement delete() method.
-        return $this->get([
-            'Action' => 'DeleteDomainRecord',
-            'RecordId' => $recordId
-        ]);
-    }
-
-    /**
-     * 获取解析记录
-     *
-     * @param array $params
-     * @return array
-     */
-    public function read(array $params)
-    {
-        // TODO: Implement info() method.
-        return $this->get([
-            'Action' => 'DescribeDomainRecord',
-            'RecordId' => $params['record_id'],
-        ]);
-    }
-
-    /**
-     * 更新解析
-     *
-     * @param array $params
-     * @param $recordId
-     * @return array
-     */
-    public function update($recordId, array $params)
-    {
-        // TODO: Implement update() method.
-        return $this->get([
-            'Action' => 'UpdateDomainRecord',
-            'RecordId' => $recordId,
-            'RR' => $params['rr'],
-            'Type' => $params['type'],
-            'Value' => $params['value'],
-            'Line' => $params['line'],
-            'TTL' => $params['ttl'],
-        ]);
-    }
-
-    /**
-     * 设置状态
-     *
-     * @param $recordId
-     * @param $status
-     * @return array
-     */
-    public function enable($recordId, $status)
-    {
-        return $this->get([
-            'Action' => 'SetDomainRecordStatus',
-            'RecordId' => $recordId,
-            'Status' => ucfirst(strtolower($status))
-        ]);
-    }
-}
--- a/catch/domain/support/driver/qcloud/Domain.php
+++ b/catch/domain/support/driver/qcloud/Domain.php
@@ -1,56 +0,0 @@
-<?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\domain\support\driver\qcloud;
-
-use catchAdmin\domain\support\contract\DomainActionInterface;
-use catchAdmin\domain\support\driver\ApiTrait;
-use catchAdmin\domain\support\Transformer;
-
-class Domain implements DomainActionInterface
-{
-    use ApiTrait;
-
-    public function getList(array $params)
-    {
-        $offset = ($params['page'] ?? 1) - 1;
-        $length = $params['limit'] ?? 10;
-
-        // TODO: Implement getList() method.
-       return Transformer::qcloudDomainPaginate($this->get([
-            'Action' => 'DomainList',
-            'offset' => $offset,
-            'length' => $length
-        ]), $offset, $length);
-    }
-
-    public function store(array $params)
-    {
-        // TODO: Implement add() method.
-    }
-
-    public function delete(array $params)
-    {
-        // TODO: Implement delete() method.
-        return $this->get([
-            'Action' => 'DeleteDomain',
-            'DomainName' => $params['name'],
-        ]);
-    }
-
-    public function read($name)
-    {
-        // TODO: Implement info() method.
-        return $this->get([
-            'Action' => 'DescribeDomainInfo',
-            'DomainName' => $name
-        ]);
-    }
-}
--- a/catch/domain/support/driver/qcloud/DomainRecord.php
+++ b/catch/domain/support/driver/qcloud/DomainRecord.php
@@ -1,125 +0,0 @@
-<?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\domain\support\driver\qcloud;
-
-use catchAdmin\domain\support\contract\DomainRecordInterface;
-use catchAdmin\domain\support\driver\ApiTrait;
-use catchAdmin\domain\support\Transformer;
-
-class DomainRecord implements DomainRecordInterface
-{
-    use ApiTrait;
-
-    /**
-     * 列表
-     *
-     * @param array $params
-     * @return mixed
-     */
-    public function getList(array $params)
-    {
-        $data = [
-            'Action' => 'RecordList',
-            'domain' => $params['name'],
-            'offset' => ($params['page'] ?? 1) - 1,
-            'length' => $params['limit'] ?? 10,
-        ];
-
-        if ($params['rr']) {
-            $data['subDomain'] = $params['rr'];
-        }
-
-        if ($params['type']) {
-            $data['recordType'] = $params['type'];
-        }
-
-        // TODO: Implement getList() method.
-        return Transformer::qcloudDomainRecordPaginate($this->get($data), $data['offset'], $data['length']);
-    }
-
-    /**
-     * 新增解析
-     *
-     * @param array $params
-     * @return array
-     *
-     */
-    public function store(array $params)
-    {
-        // TODO: Implement add() method.
-        return $this->get([
-            'Action' => 'RecordCreate',
-            'domain' => $params['name'],
-            'subDomain' => $params['rr'],
-            'recordType' => $params['type'],
-            'value' => $params['value'],
-            'recordLine' => $params['line'],
-            'ttl' => $params['ttl'],
-        ]);
-    }
-
-    /**
-     * 删除解析
-     *
-     * @param $recordId
-     * @return array
-     */
-    public function delete($recordId)
-    {
-        // TODO: Implement delete() method.
-        return $this->get([
-            'Action' => 'RecordDelete',
-            'recordId' => $recordId
-        ]);
-    }
-
-    /**
-     * 更新解析
-     *
-     * @param array $params
-     * @param $recordId
-     * @return array
-     */
-    public function update($recordId, array $params)
-    {
-        // TODO: Implement update() method.
-        return $this->get([
-            'Action' => 'RecordModify',
-            'recordId' => $recordId,
-            'subDomain' => $params['rr'],
-            'recordType' => $params['type'],
-            'value' => $params['value'],
-            'recordLine' => $params['line'],
-            'ttl' => $params['ttl'],
-        ]);
-    }
-
-    /**
-     * 设置状态
-     *
-     * @param $recordId
-     * @param $status
-     * @return array
-     */
-    public function enable($recordId, $status)
-    {
-        return $this->get([
-            'Action' => 'RecordStatus',
-            'recordId' => $recordId,
-            'Status' => strtolower($status)
-        ]);
-    }
-
-    public function read(array $params)
-    {
-        // TODO: Implement read() method.
-    }
-}
--- a/catch/domain/support/signature/Aliyun.php
+++ b/catch/domain/support/signature/Aliyun.php
@@ -1,64 +0,0 @@
-<?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\domain\support\signature;
-
-class Aliyun
-{
-    /**
-     * @var array
-     */
-    protected $params;
-
-    /**
-     * Aliyun constructor.
-     * @param $params
-     */
-    public function __construct(array $params)
-    {
-        $this->params = $params;
-    }
-
-    /**
-     * encode
-     *
-     * @time 2020年09月25日
-     * @param $str
-     * @return string|string[]|null
-     */
-    protected function percentEncode(string $str)
-    {
-        return preg_replace(['/\+/', '/\*/', '/%7E/'], ['%20', '%2A', '~'], urlencode($str));
-    }
-
-    /**
-     * 签名
-     *
-     * @time 2020年09月25日
-     * @param $method
-     * @return string
-     */
-    public function signature(string $method)
-    {
-        ksort($this->params);
-
-        $queryString = '';
-
-        foreach ($this->params as $key => $param) {
-            $queryString .= '&' . $this->percentEncode($key) . '=' . $this->percentEncode($param);
-        }
-
-        $signString = $method . '&' .
-                      $this->percentEncode('/') . '&' .
-                      $this->percentEncode(substr($queryString, 1));
-
-        return base64_encode(hash_hmac('sha1', $signString, config('catch.domains.aliyun.access_secret'). '&', true));
-    }
-}
--- a/catch/domain/support/signature/Qcloud.php
+++ b/catch/domain/support/signature/Qcloud.php
@@ -1,63 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-namespace catchAdmin\domain\support\signature;
-
-class Qcloud
-{
-    /**
-     * @var array
-     */
-    protected $params;
-
-    /**
-     * Qcloud constructor.
-     * @param $params
-     */
-    public function __construct(array $params)
-    {
-        $this->params = $params;
-    }
-
-    /**
-     * key 替换
-     *
-     * @param $key
-     * @return mixed|string|string[]
-     */
-    protected function replaceKey($key)
-    {
-        return strpos($key, '_') === false ?
-            $key : str_replace('_', '.', $key);
-    }
-
-    /**
-     * 签名
-     *
-     * @time 2020年09月25日
-     * @param $method
-     * @return string
-     */
-    public function signature(string $method)
-    {
-        ksort($this->params);
-
-        $queryString = '';
-
-        foreach ($this->params as $key => $param) {
-            $queryString .= '&' . $this->replaceKey($key) . '=' . $param;
-        }
-
-        $signString = $method . config('catch.domains.qcloud.api_domain') . '/v2/index.php?'
-                              . substr($queryString, 1);
-
-        return base64_encode(hash_hmac('sha1', $signString, config('catch.domains.qcloud.access_secret'), true));
-    }
-}
--- a/catch/login/LoginLogEvent.php
+++ b/catch/login/LoginLogEvent.php
@@ -11,13 +11,15 @@ class LoginLogEvent
    {
        $agent = request()->header('user-agent');

+        $username = Users::where('email', $params['email'])->value('username');
+
        app(LoginLog::class)->storeBy([
-            'login_name' => $params['login_name'],
+            'login_name' => $username ? : $params['email'],
            'login_ip'   => request()->ip(),
            'browser'    => $this->getBrowser($agent),
            'os'         => $this->getOs($agent),
            'login_at'   => time(),
-            'status'     => $params['success'],
+            'status'     => $params['success'] ? 1 : 2,
        ]);
    }

--- a/catch/login/controller/Index.php
+++ b/catch/login/controller/Index.php
@@ -6,105 +6,52 @@ 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
-     */
+  /**
+   * 登陆
+   *
+   * @time 2019年11月28日
+   * @param LoginRequest $request
+   * @param CatchAuth $auth
+   * @return bool|string
+   */
    public function login(LoginRequest $request, CatchAuth $auth)
    {
-        $condition = $request->param();
+        $params = $request->param();

-        try {
-            $token = $auth->attempt($condition);
+        $token = $auth->attempt($params);

-            $user = $auth->user();
+        $user = $auth->user();

-            $this->afterLoginSuccess($user, $token);
-            // 登录事件
-            $this->loginEvent($user->username);
-
-            return CatchResponse::success([
-                'token' => $token,
-            ], '登录成功');
-        } catch (\Exception $exception) {
-            $this->detailWithLoginFailed($exception, $condition);
-            $code = $exception->getCode();
-            return CatchResponse::fail($code == Code::USER_FORBIDDEN ?
-                '该账户已被禁用，请联系管理员' : '登录失败,请检查邮箱和密码', Code::LOGIN_FAILED);
-        }
-    }
-
-    /**
-     * 处理登录失败
-     *
-     * @time 2020年10月26日
-     * @param $exception
-     * @param $condition
-     * @return void
-     */
-    protected function detailWithLoginFailed($exception, $condition)
-    {
-        $message = $exception->getMessage();
-
-        if (strpos($message, '|') !== false) {
-            $username = explode('|', $message)[1];
-        } else {
-            $username = $condition['email'];
+        if ($user->status == Users::DISABLE) {
+          throw new LoginFailedException('该用户已被禁用');
        }

-        $this->loginEvent($username, false);
-    }
-
-    /**
-     * 用户登录成功后
-     *
-     * @time 2020年09月09日
-     * @param $user
-     * @param $token
-     * @return void
-     */
-    protected function afterLoginSuccess($user, $token)
-    {
+        // 记录用户登录
        $user->last_login_ip = request()->ip();
        $user->last_login_time = time();
-        if ($user->hasField('remember_token')) {
-            $user->remember_token = $token;
-        }
        $user->save();
-    }

-    /**
-     * 登录事件
-     *
-     * @time 2020年09月09日
-     * @param $name
-     * @param bool $success
-     * @return void
-     */
-    protected function loginEvent($name, $success = true)
-    {
-        $params['login_name'] = $name;
-        $params['success'] = $success ? 1 : 2;
+        // 登录事件
+        $params['success'] = $token;
+
        event('loginLog', $params);
+
+        return $token ? CatchResponse::success([
+            'token' => $token,
+        ], '登录成功') : CatchResponse::success('', '登录失败');
    }

-
-    /**
-     * 登出
-     *
-     * @time 2019年11月28日
-     * @return \think\response\Json
-     */
+  /**
+   * 登出
+   *
+   * @time 2019年11月28日
+   * @return \think\response\Json
+   */
    public function logout(): \think\response\Json
    {
        return CatchResponse::success();
--- a/catch/login/module.json
+++ b/catch/login/module.json
@@ -4,7 +4,7 @@
  "description": "login 模块",
  "version": "1.0.0",
  "keywords": [],
-  "order": 100,
+  "order": 1,
  "services": [
    "\\catchAdmin\\login\\LoginService"
  ],
--- a/catch/login/route.php
+++ b/catch/login/route.php
@@ -1,7 +1,4 @@
 <?php
-
-/* @var think\Route $router */
-
 $router->group(function () use ($router){
    # 登入
    $router->post('login', '\catchAdmin\login\controller\Index@login');
--- a/catch/monitor/MonitorService.php
+++ b/catch/monitor/MonitorService.php
@@ -1,34 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor;
-
-use catcher\ModuleService;
-
-class MonitorService extends ModuleService
-{
-    protected function loadConfig()
-    {
-         return  require __DIR__ . DIRECTORY_SEPARATOR . 'config.php';
-    }
-
-    public function loadRouteFrom()
-    {
-        // TODO: Implement loadRouteFrom() method.
-        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
-    }
-
-    public function loadCommands()
-    {
-        return [__NAMESPACE__, __DIR__ . DIRECTORY_SEPARATOR . 'command'];
-    }
-
-}
--- a/catch/monitor/command/CatchCrontabCommand.php
+++ b/catch/monitor/command/CatchCrontabCommand.php
@@ -1,175 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-declare (strict_types = 1);
-
-namespace catchAdmin\monitor\command;
-
-use catchAdmin\monitor\command\process\Master;
-use catchAdmin\monitor\command\process\Process;
-use catcher\facade\FileSystem;
-use think\console\Command;
-use think\console\Input;
-use think\console\input\Argument;
-use think\console\input\Option;
-use think\console\Output;
-use think\console\Table;
-
-class CatchCrontabCommand extends Command
-{
-    protected $pid;
-
-    protected function configure()
-    {
-        // 指令配置
-        $this->setName('catch:crontab')
-            ->addArgument('action', Argument::OPTIONAL, '[start|reload|stop|restart]', 'start')
-            ->addOption('daemon', '-d', Option::VALUE_NONE, 'daemon mode')
-            ->addOption('pid', '-p', Option::VALUE_REQUIRED, 'you can send signal to the process of pid')
-            ->addOption('static', '-s', Option::VALUE_REQUIRED, 'default static process number', 1)
-            ->addOption('dynamic', '-dy', Option::VALUE_REQUIRED, 'default dynamic process number', 10)
-            ->addOption('interval', '-i', Option::VALUE_REQUIRED, 'interval/seconds', 5)
-            ->setDescription('start catch crontab schedule');
-    }
-
-    protected function execute(Input $input, Output $output)
-    {
-        if (!$input->hasOption('pid')) {
-            $this->pid = Master::getMasterPid();
-        } else {
-            $this->pid = $input->getOption('pid');
-        }
-
-        if (!extension_loaded('pcntl') || !extension_loaded('posix')) {
-            $output->error('you should install extension [pcntl && posix]');
-        } else {
-            $this->{$input->getArgument('action')}();
-        }
-    }
-
-    /**
-     * 进程启动
-     *
-     * @time 2020年09月14日
-     * @return void
-     */
-    protected function start()
-    {
-        $worker = new Master();
-
-        $worker->staticNumber($this->input->getOption('static'))
-            ->dynamic($this->input->getOption('dynamic'))
-            ->interval($this->input->getOption('interval'))
-            ->asDaemon($this->input->hasOption('daemon'))
-            ->run();
-    }
-
-    /**
-     * 停止任务
-     *
-     * @time 2020年07月07日
-     * @return void
-     */
-    protected function stop()
-    {
-        $retryTimes = 0;
-
-        if (Process::isAlive($this->pid)) {
-            $this->output->info('🔨 catch crontab is running.');
-            Process::kill($this->pid, SIGTERM);
-            // 睡眠 1 秒
-            $this->output->info('⌛️ killing catch crontab service, please waiting...');
-            sleep(1);
-            if (!Process::isAlive($this->pid)) {
-                $this->output->info('🎉 catch crontab stopped!');
-            } else {
-                while (true) {
-                    Process::kill($this->pid, SIGKILL);
-                    if (Process::isAlive($this->pid)) {
-                        $retryTimes++;
-                        $this->output->info('🔥 retry $retryTimes times');
-                        usleep(500 * 1000);
-                        if ($retryTimes >= 3) {
-                            $this->output->info('💔 catch crontab is running, stop failed, please use [kill -9 {$this->pid}] to Stop it');
-                            break;
-                        }
-                    } else {
-                        $this->output->info('🎉 catch crontab stopped!');
-                        break;
-                    }
-                }
-            }
-            Master::exitMasterDo();
-        } else {
-            $this->output->error('🤔️ catch crontab is not running, Please Check it!');
-        }
-
-        $this->output->info('🎉 stop catch crontab successfully');
-    }
-
-    /**
-     * 重启任务
-     *
-     * @time 2020年07月07日
-     * @return void
-     */
-    protected function reload()
-    {
-        Process::kill($this->pid, SIGUSR1);
-    }
-
-    /**
-     * 重启
-     *
-     * @time 2020年07月07日
-     * @return void
-     */
-    protected function restart()
-    {
-        $this->stop();
-
-        $this->output->info('catch crontab restarting...');
-
-        usleep(500 * 1000);
-
-        $this->start();
-    }
-
-    /**
-     * status
-     *
-     * @time 2020年07月22日
-     * @return void
-     */
-    protected function status()
-    {
-        if ($this->pid) {
-            if (Process::isAlive($this->pid)) {
-                Process::kill($this->pid, SIGUSR2);
-
-                usleep(100000);
-
-                $worker = new Master;
-                $table = new Table;
-
-                $table->setHeader(['PID', '名称', '内存', '处理任务', '开始时间', '运行时间', '状态'], Table::ALIGN_CENTER);
-
-                $table->setRows($worker->getWorkerStatus(), Table::ALIGN_CENTER);
-
-                $this->output->info($table->render());
-            } else {
-                $this->output->error('🤔️ catch crontab is not running, Please Check it!');
-            }
-        } else {
-            $this->output->error('🤔️ catch crontab is not running, Please Check it!');
-        }
-    }
-}
--- a/catch/monitor/command/ScheduleCommand.php
+++ b/catch/monitor/command/ScheduleCommand.php
@@ -1,128 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-declare (strict_types=1);
-
-namespace catchAdmin\monitor\command;
-
-use catchAdmin\monitor\command\process\Process;
-use catchAdmin\monitor\model\Crontab;
-use catchAdmin\monitor\model\CrontabLog;
-use Cron\CronExpression;
-use think\console\Command;
-use think\console\Input;
-use think\console\Output;
-use think\facade\Log;
-
-class ScheduleCommand extends Command
-{
-    protected $pid;
-
-    protected function configure()
-    {
-        // 指令配置
-        $this->setName('catch:schedule')
-            ->setDescription('catch schedule');
-    }
-
-    protected function execute(Input $input, Output $output)
-    {
-        try {
-            foreach ($this->getExecuteAbleCommands() as $command) {
-
-                $process = new Process(function (Process $process) use ($command) {
-                        $this->executeCommand($command);
-                        $process->exit();
-                });
-
-                $process->start();
-            }
-        } catch (\Exception $e) {
-            Log::error('CatchSchedule Error:' . $e->getMessage());
-        }
-    }
-
-    /**
-     * 执行 command
-     *
-     * @time 2021年01月18日
-     * @param $command
-     * @return void
-     */
-    protected function executeCommand($command)
-    {
-        $start = time();
-
-        $errorMessage = '';
-
-        try {
-            $this->getConsole()->call($command->task);
-        } catch (\Exception $e) {
-            $errorMessage = $e->getMessage();
-        }
-
-        $end = time();
-
-        // 插入 crontab 执行日志
-        CrontabLog::insert([
-            'crontab_id' => $command->id,
-            'used_time' => $end - $start,
-            'status' => $errorMessage ? CrontabLog::FAILED : CrontabLog::SUCCESS,
-            'error_message' => $errorMessage,
-            'created_at' => time(),
-            'updated_at' => time(),
-        ]);
-    }
-
-    /**
-     * 获取可执行任务
-     *
-     * @time 2021年01月17日
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return array
-     */
-    protected function getExecuteAbleCommands()
-    {
-        $executeAbleCommands = [];
-
-
-        Crontab::where('status', Crontab::ENABLE)
-            ->select()
-            ->each(function ($command) use (&$executeAbleCommands){
-                if ($command->tactics == Crontab::EXECUTE_IMMEDIATELY) {
-                    $executeAbleCommands[] = $command;
-                    $command->tactics = Crontab::EXECUTE_NORMAL;
-                    return $command->save();
-                }
-
-                $can = date('Y-m-d H:i',
-                        (new CronExpression(trim($command->cron)))
-                        ->getNextRunDate(date('Y-m-d H:i:s'), 0, true)
-                        ->getTimestamp()) == date('Y-m-d H:i', time());
-
-                if ($can) {
-                    // 如果任务只执行一次 之后禁用该任务
-                    if ($command->tactics === Crontab::EXECUTE_ONCE) {
-                        $command->tactics = Crontab::DISABLE;
-                        $command->save();
-                    }
-
-                    $executeAbleCommands[] = $command;
-                }
-                return true;
-            });
-
-        return $executeAbleCommands;
-    }
-}
--- a/catch/monitor/command/process/Attributes.php
+++ b/catch/monitor/command/process/Attributes.php
@@ -1,145 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor\command\process;
-
-use catcher\base\CatchCronTask;
-
-trait Attributes
-{
-    /**
-     * 是否以守护进程方式运行
-     *
-     * @var bool
-     */
-    protected $daemon = false;
-
-    /**
-     * 静态进程数量
-     *
-     * @var int
-     */
-    protected $static;
-
-    /**
-     * 动态进程数量
-     *
-     * @var int
-     */
-    protected $dynamic;
-
-    /**
-     * 定时器触发时间
-     *
-     * @var int
-     */
-    protected $interval;
-
-    /**
-     * set name
-     *
-     * @var
-     */
-    protected $name = 'catch-crontab';
-
-    /**
-     * @var string
-     */
-    protected $crontabQueueName = 'catch-crontab-task';
-
-    /**
-     * 安全退出
-     *
-     * @var bool
-     */
-    protected $exitSafely = false;
-
-    /**
-     * 设置守护进程
-     *
-     * @time 2020年07月21日
-     * @param bool $daemon
-     * @return $this
-     */
-    public function asDaemon($daemon = false)
-    {
-        $this->daemon = $daemon;
-
-        return $this;
-    }
-
-    public function staticNumber($n)
-    {
-        $this->static = $n;
-
-        return $this;
-    }
-
-    /**
-     * 可扩容
-     *
-     * @time 2020年07月21日
-     * @param $n
-     * @return $this
-     */
-    public function dynamic($n)
-    {
-        $this->dynamic = $n;
-
-        return $this;
-    }
-
-    /**
-     * 定时
-     *
-     * @time 2020年07月21日
-     * @param $n
-     * @return $this
-     */
-    public function interval($n)
-    {
-        $this->interval = $n;
-
-        return $this;
-    }
-
-
-    /**
-     * 设置 name
-     *
-     * @time 2020年07月23日
-     * @param $name
-     * @return $this
-     */
-    public function name($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * 设置报告错误
-     *
-     * @time 2020年07月24日
-     * @return void
-     */
-    public function displayErrors()
-    {
-        ini_set('display_errors', 1);
-
-        error_reporting(E_ALL & ~E_WARNING);
-
-        ini_set('display_startup_errors', 1);
-
-        ini_set('ignore_repeated_errors', 1);
-    }
-}
--- a/catch/monitor/command/process/Master.php
+++ b/catch/monitor/command/process/Master.php
@@ -1,361 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor\command\process;
-
-use Exception;
-use catcher\facade\Filesystem;
-use think\cache\driver\Redis;
-use think\facade\Cache;
-
-/**
- *
- * - 以后台形式工作 daemon
- * - 分静态进程和动态扩容进程
- * - 信号处理机制
- *   - 重启工作进程
- *   - 重启服务
- *   - 定时器 扩容工作进程
- *   - 关闭进程
- *   - 统计信息
- * - 是否拉起进程，工作进程销毁后是否继续主进程保留
- * - Fatal Error 处理
- * - Exception 处理
- * - 发生内存泄漏如何处理
- * - 错误输出到哪里
- * - 提供基础面板查看
- * - Log 文件的记录
- *
- * @time 2020年07月29日
- */
-class Master
-{
-    use RegisterSignal, Attributes, Store, ParseTask;
-
-    /**
-     * 保存子进程 PID
-     *
-     * @var array
-     */
-    protected $workerIds = [];
-
-    /**
-     * 开始时间
-     *
-     * @var
-     */
-    public $start_at;
-
-    /**
-     * @var
-     */
-    public $worker_start_at;
-
-    /**
-     * 保存当前工作进程的数量
-     *
-     * @var
-     */
-    protected $allWorkersCount;
-
-    /**
-     * 保存当前重定向输出文件
-     *
-     * @var string
-     */
-    protected static $stdout;
-
-    /**
-     * 任务对象
-     *
-     * @var
-     */
-    protected $taskService;
-
-    /**
-     * 处理的任务数量
-     *
-     * @var int
-     */
-    protected $dealNum = 0;
-
-    /**
-     * busy waiting
-     *
-     * @var
-     */
-    protected $status = 'waiting';
-
-    /**
-     * @var
-     */
-    protected $redis;
-
-    /**
-     * 启动
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    public function run()
-    {
-        try {
-            if ($this->daemon) {
-                Process::daemon();
-            }
-
-            if ($this->interval) {
-                Process::alarm($this->interval);
-            }
-            $this->init();
-            // 初始化进程池
-            $this->initWorkers();
-            // 设置进程名称
-            Process::setWorkerName($this->name . ' master');
-            // 注册信号
-            $this->registerSignal();
-            // 写入进程状态
-            $this->setWorkerStatus($this->name . ' master');
-            // 信号发送
-            while (true) {
-                Process::dispatch();
-                $pid = pcntl_waitpid(-1, $status, WNOHANG);
-                Process::dispatch();
-                if ($pid > 0) {
-                    if (isset($this->workerIds[$pid])) {
-                        unset($this->workerIds[$pid]);
-                        $this->deleteWorkerStatusFile($pid);
-                        $this->worker_start_at = time();
-                        // 如果进程挂掉，正常退出码都是 0，当然这里可以自己定义，看 exit($status) 设置什么
-                        // 真实的 exit code  pcntl_wexitstatus 函数获取
-                        // exit code > 0 都是由于异常导致的
-                        $exitCode = pcntl_wexitstatus($status);
-                        if (!in_array($exitCode, [255, 250])) {
-                            $this->forkStatic();
-                        }
-                    }
-                    // 如果静态工作进程全部退出，会发生 CPU 空转，所以这里需要 sleep 1
-                    if (!count($this->workerIds)) {
-                        // sleep(1);
-                        self::exitMasterDo();
-                        exit(0);
-                    }
-                }
-
-                usleep(500 * 1000);
-            }
-        } catch (\Throwable $exception) {
-            // todo
-            echo sprintf('[%s]: ', date('Y-m-d H:i:s')) . $exception->getMessage();
-        }
-    }
-
-    /**
-     * 初始化
-     * @throws Exception
-     */
-    protected function init()
-    {
-        $this->displayErrors();
-        $this->start_at = $this->worker_start_at = time();
-        // 记录 masterID
-        FileSystem::put(self::masterPidStorePath(), posix_getpid());
-        // 保存信息
-        $this->saveTaskInfo();
-        // 初始化进程数量
-        $this->allWorkersCount = $this->static;
-        // 显示UI
-        $this->display();
-        // 重定向
-        $this->dup();
-    }
-
-    /**
-     * 初始化进程池
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function initWorkers()
-    {
-        $this->redis = $this->getRedisHandle();
-
-        for ($i = 0; $i < $this->static; $i++) {
-            $this->forkStatic();
-        }
-    }
-
-    /**
-     * fork 进程
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function forkDynamic()
-    {
-        $process = new Process(function (Process $process) {
-            $redis = $this->getRedisHandle();
-            while($crontab = $redis->rpop($this->crontabQueueName)) {
-                $task = $this->getTaskObject(\json_decode($crontab, true));
-                $task->run();
-            }
-
-            $process->exit();
-        });
-
-        $process->start();
-
-        $this->workerIds[$process->pid] = true;
-    }
-
-    /**
-     * 静态进程
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function forkStatic()
-    {
-        $process = new Process(function (Process $process) {
-            $process->initMemory();
-
-            $name = $this->name . ' worker';
-            $this->setWorkerStatus($name, $this->dealNum, $this->status);
-
-            Process::setWorkerName($name);
-
-            Process::signal(SIGUSR2, function ($signal) use ($name) {
-                $this->setWorkerStatus($name, $this->dealNum, $this->status);
-            });
-
-            // 该信号保证进程完成任务后安全退出
-            Process::signal(SIGTERM, function ($signal) {
-                $this->exitSafely = true;
-            });
-
-            while (true) {
-                /************** 任务 *********************/
-                $this->status = 'busying';
-                $this->setWorkerStatus($name, $this->dealNum, 'busying');
-
-                // 处理定时任务
-                while ($crontab = $this->redis->rpop($this->crontabQueueName)) {
-                    $task = $this->getTaskObject(\json_decode($crontab, true));
-                    $task->run();
-                    if ($task->shouldExit()) {
-                        $process->exit(250);
-                    }
-                    $this->dealNum += 1;
-                }
-
-                $this->status = 'waiting';
-                $this->setWorkerStatus($name, $this->dealNum, 'waiting');
-                /****************处理*********************/
-                // 暂停一秒 让出CPU调度
-                sleep(1);
-                // 信号调度
-                Process::dispatch();
-                // 是否需要安全退出 || 查看内存是否溢出
-                if ($this->exitSafely || $process->isMemoryOverflow()) {
-                    $process->exit();
-                    //exit(0);
-                }
-            }
-        });
-
-        $process->start();
-
-        $this->workerIds[$process->pid] = true;
-    }
-
-    /**
-     * 重定向文件流
-     *
-     * @time 2020年07月22日
-     * @return void
-     * @throws Exception
-     */
-    protected function dup()
-    {
-        if (!$this->daemon) {
-            return;
-        }
-
-        global $stdout, $stderr;
-
-        // 关闭标准输入输出
-        fclose(STDOUT);
-        fclose(STDIN);
-        fclose(STDERR);
-
-        // 重定向输出&错误
-        $stdoutPath = self::$stdout ?: self::stdoutPath();
-
-        !file_exists($stdoutPath) && touch($stdoutPath);
-        // 等待 100 毫秒
-        usleep(100 * 1000);
-
-        $stdout = fopen($stdoutPath, 'a');
-
-        $stderr = fopen($stdoutPath, 'a');
-
-        return;
-    }
-
-    /**
-     * 输出
-     *
-     * @time 2020年07月21日
-     * @return string
-     */
-    public function output()
-    {
-        $isShowCtrlC = $this->daemon ? '' : 'Ctrl+c to stop' . "\r\n";
-
-        $info = <<<EOT
- ---------------------------------------------------------------- 🚀                                                
-|            _       _                            _        _     |
-|           | |     | |                          | |      | |    |
-|   ___ __ _| |_ ___| |__     ___ _ __ ___  _ __ | |_ __ _| |__  |
-|  / __/ _` | __/ __| '_ \   / __| '__/ _ \| '_ \| __/ _` | '_ \ |
-| | (_| (_| | || (__| | | | | (__| | | (_) | | | | || (_| | |_) ||
-|  \___\__,_|\__\___|_| |_|  \___|_|  \___/|_| |_|\__\__,_|_.__/ |
-|                                                                |                                                            |
-|----------------------------------------------------------------|
-$isShowCtrlC          
-EOT;
-        return file_put_contents(self::statusPath(), $info);
-    }
-
-    /**
-     * 显示
-     *
-     * @time 2020年07月22日
-     * @return false|int
-     */
-    protected function display()
-    {
-        $this->output();
-
-        return fwrite(STDOUT, $this->renderStatus());
-    }
-
-    /**
-     * 获取 redis 句柄
-     *
-     * @time 2020年09月15日
-     * @return object|null
-     */
-    protected function getRedisHandle()
-    {
-        return Cache::store('redis')->handler();
-    }
-}
--- a/catch/monitor/command/process/ParseTask.php
+++ b/catch/monitor/command/process/ParseTask.php
@@ -1,47 +0,0 @@
-<?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\monitor\command\process;
-
-use catcher\facade\FileSystem;
-use think\exception\ClassNotFoundException;
-use think\helper\Str;
-
-trait ParseTask
-{
-    /**
-     * 获取任务
-     *
-     * @time 2020年09月15日
-     * @param $crontab
-     * @return mixed
-     */
-    protected function getTaskObject($crontab)
-    {
-        $class = $this->getTaskNamespace() . ucfirst(Str::camel($crontab['task']));
-
-        if (class_exists($class)) {
-            return app()->make($class)->setCrontab($crontab);
-        }
-
-        throw new ClassNotFoundException('Task '. $crontab['task'] . ' not found');
-    }
-
-    /**
-     * 获取任务命名空间
-     *
-     * @time 2020年09月15日
-     * @return mixed
-     */
-    protected function getTaskNamespace()
-    {
-        return config('catch.crontab.task_namespace');
-    }
-}
--- a/catch/monitor/command/process/Process.php
+++ b/catch/monitor/command/process/Process.php
@@ -1,213 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor\command\process;
-
-use catcher\exceptions\FailedException;
-
-class Process
-{
-    /**
-     * 保存工作进程 PID
-     *
-     * @var
-     */
-    public $pid;
-
-    /**
-     * 用户自定义方法
-     *
-     * @var callable
-     */
-    protected $callable;
-
-    /**
-     * 申请最大内存 给出缓冲期
-     *
-     * @var string
-     */
-    protected $initMemory = '256M';
-
-    /**
-     * 超过最大内存报警
-     *
-     * @var float|int
-     */
-    protected $allowMaxMemory = 128 * 1024 * 1024;
-
-    public function __construct(callable $callable)
-    {
-        $this->callable = $callable;
-    }
-
-    /**
-     * 守护进程
-     *
-     * @time 2020年07月21日
-     * @return void
-     * @throws FailedException
-     */
-    public static function daemon()
-    {
-        $pid = pcntl_fork();
-
-        if ($pid < 0) {
-            throw new FailedException('fork process failed');
-        }
-        // 退出父进程
-        if ($pid > 0) {
-            exit(0);
-        }
-        // 设置新的会话组
-        if (posix_setsid() < 0) {
-            exit(0);
-        }
-        chdir('/');
-        // 重置掩码 权限问题
-        umask(0);
-    }
-
-    /**
-     * 启动进程
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    public function start()
-    {
-        $pid = pcntl_fork();
-
-        if ($this->pid < 0) {
-            exit('fork failed');
-        }
-
-        if ($pid > 0) {
-            $this->pid = $pid;
-        } else {
-            call_user_func_array($this->callable, [$this]);
-        }
-    }
-
-    /**
-     * 信号
-     *
-     * @time 2020年07月21日
-     * @param $signal
-     * @param $callable
-     * @param $restartSysCalls
-     * @return void
-     */
-    public static function signal($signal, $callable, $restartSysCalls = false)
-    {
-        pcntl_signal($signal, $callable, $restartSysCalls);
-    }
-
-    /**
-     * default 1 second
-     *
-     * @param $interval
-     * @return mixed
-     */
-    public static function alarm($interval = 1)
-    {
-        return pcntl_alarm($interval);
-    }
-
-    /**
-     * linux 进程下设置进程名称
-     *
-     * @time 2020年07月21日
-     * @param $title
-     * @return void
-     */
-    public static function setWorkerName($title)
-    {
-        if (strtolower(PHP_OS) === 'linux') {
-            cli_set_process_title($title);
-        }
-    }
-
-
-    /**
-     * 安全退出
-     *
-     * @time 2020年07月21日
-     * @param int $status
-     * @return void
-     */
-    public function exit($status = 0)
-    {
-        exit($status);
-    }
-
-    /**
-     * kill
-     *
-     * @time 2020年07月22日
-     * @param $pid
-     * @param $signal
-     * @return bool
-     */
-    public static function kill($pid, $signal)
-    {
-        return posix_kill($pid, $signal);
-    }
-
-    /**
-     *
-     * @time 2020年07月22日
-     * @return void
-     */
-    public static function dispatch()
-    {
-        pcntl_signal_dispatch();
-    }
-
-
-    /**
-     * 是否存活
-     *
-     * @time 2020年07月22日
-     * @param $pid
-     * @return bool
-     */
-    public static function isAlive($pid)
-    {
-        return posix_kill($pid, 0);
-    }
-
-    /**
-     * 初始化进程内存
-     *
-     * @time 2020年07月22日
-     * @param int $memory
-     * @return void
-     */
-    public function initMemory($memory = 0)
-    {
-        if (ini_get('memory_limit') != $this->initMemory) {
-            // 这里申请一块稍微大的内存
-            ini_set('memory_limit', $memory ?: $this->initMemory);
-        }
-    }
-
-    /**
-     * 是否超过最大内存
-     *
-     * @time 2020年07月22日
-     * @return mixed
-     */
-    public function isMemoryOverflow()
-    {
-        // 一旦超过了允许的内存 直接退出进程
-        return memory_get_usage() > $this->allowMaxMemory;
-    }
-}
--- a/catch/monitor/command/process/RegisterSignal.php
+++ b/catch/monitor/command/process/RegisterSignal.php
@@ -1,158 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor\command\process;
-
-use catchAdmin\monitor\model\Crontab;
-use catcher\facade\FileSystem;
-use Cron\CronExpression;
-use EasyWeChat\Kernel\Messages\News;
-use think\cache\driver\Redis;
-
-trait RegisterSignal
-{
-    public function registerSignal()
-    {
-        // 退出信号
-        $this->exit();
-        // 等待子进程退出
-        $this->waitWorkersExit();
-        // 动态扩容
-        $this->workerChecked();
-        // 重启进程
-        $this->reload();
-        // 统计信息
-        $this->showStatus();
-    }
-
-    /**
-     * 进程退出
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function exit()
-    {
-        Process::signal(SIGTERM, function ($signal) {
-            foreach ($this->workerIds as $pid => $v) {
-                if (isset($this->workerIds[$pid])) {
-                    unset($this->workerIds[$pid]);
-                }
-                Process::kill($pid, SIGTERM);
-            }
-            Process::kill(self::getMasterPid(), SIGKILL);
-        });
-
-        Process::signal(SIGINT, function ($signal) {
-            foreach ($this->workerIds as $pid => $v) {
-                if (isset($this->workerIds[$pid])) {
-                    unset($this->workerIds[$pid]);
-                }
-                Process::kill($pid, SIGKILL);
-            }
-            Process::kill(self::getMasterPid(), SIGKILL);
-        });
-    }
-
-    /**
-     * 子进程退出
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function waitWorkersExit()
-    {
-        Process::signal(SIGCHLD, function ($signal) {
-
-        });
-    }
-
-
-    /**
-     * 进程检测
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function workerChecked()
-    {
-        Process::signal(SIGALRM, function ($signal) {
-            $process = new Process(function (Process $process) {
-                $crontabs = Crontab::where('status', Crontab::ENABLE)
-                            ->where('tactics', '<>', Crontab::EXECUTE_FORBIDDEN)
-                            ->select()->toArray();
-
-                // 任务
-                foreach ($crontabs as $crontab) {
-                    $can = date('Y-m-d H:i', CronExpression::factory(trim($crontab['cron']))
-                                ->getNextRunDate(date('Y-m-d H:i:s'), 0 , true)
-                                ->getTimestamp()) == date('Y-m-d H:i', time());
-
-                    if ($can) {
-                        // 如果任务只执行一次 之后禁用该任务
-                        if ($crontab['tactics'] === Crontab::EXECUTE_ONCE) {
-                            Crontab::where('id', $crontab['id'])->update([
-                                'status' => Crontab::DISABLE,
-                            ]);
-                        }
-
-                        $redis = $this->getRedisHandle();
-
-                        $redis->lpush($this->crontabQueueName, json_encode([
-                            'id' => $crontab['id'],
-                            'task' => $crontab['task'],
-                        ]));
-                    }
-                }
-
-                $process->exit();
-            });
-
-            $process->start();
-
-            Process::alarm($this->interval);
-        });
-    }
-
-    /**
-     * 重启
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function reload()
-    {
-        Process::signal(SIGUSR1, function ($signal) {
-            $this->worker_start_at = 0;
-            foreach ($this->workerIds as $pid => $v) {
-                Process::kill($pid, SIGTERM);
-            }
-        }, false);
-    }
-
-    /**
-     * 预留信号
-     *
-     * @time 2020年07月21日
-     * @return void
-     */
-    protected function showStatus()
-    {
-        Process::signal(SIGUSR2, function ($signal) {
-            $this->setWorkerStatus($this->name . ' master');
-            foreach ($this->workerIds as $pid => $v) {
-                Process::kill($pid, SIGUSR2);
-            }
-        });
-    }
-}
-
-
--- a/catch/monitor/command/process/Store.php
+++ b/catch/monitor/command/process/Store.php
@@ -1,243 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\monitor\command\process;
-
-use catcher\facade\FileSystem;
-
-trait Store
-{
-    /**
-     * worker 根目录
-     *
-     * @time 2020年07月23日
-     * @return string
-     */
-    public static function storeTaskPath()
-    {
-        $path = config('catch.crontab.store_path');
-
-        if (!Filesystem::exists($path)) {
-            FileSystem::makeDirectory($path, 0777, true);
-        }
-
-        return $path;
-    }
-
-    /**
-     * 保存信息备用
-     *
-     * @time 2020年07月29日
-     * @return void
-     */
-    protected function saveTaskInfo()
-    {
-         FileSystem::put(self::storeTaskPath() . 'information.json', \json_encode([
-             'name' => $this->name,
-             'static' => $this->static,
-             'dynamic' => $this->dynamic,
-             'interval' => $this->interval,
-        ], JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE));
-    }
-
-    /**
-     * worker master pid
-     *
-     * @time 2020年07月23日
-     * @return string
-     */
-    public static function masterPidStorePath()
-    {
-        return self::storeTaskPath() . 'master.pid';
-    }
-
-    /**
-     * worker master status
-     *
-     * @time 2020年07月23日
-     * @return string
-     */
-    public static function statusPath()
-    {
-        return self::storeTaskPath() . 'master.status';
-    }
-
-
-    /**
-     * worker status
-     *
-     * @time 2020年07月23日
-     * @param string $name
-     * @return string
-     */
-    public static function workerStatusPath($name)
-    {
-        $path = self::storeTaskPath() . 'status/';
-
-        if (!FileSystem::exists($path)) {
-            FileSystem::makeDirectory($path, 0777, true);
-        }
-
-        return $path . $name . '.status';
-    }
-
-    /**
-     *
-     * @time 2020年07月23日
-     * @return string
-     */
-    public static function getWorkerStatusPath()
-    {
-        return self::storeTaskPath() . 'status/';
-    }
-
-    /**
-     * worker log
-     *
-     * @time 2020年07月23日
-     * @return string
-     */
-    public static function stdoutPath()
-    {
-        return self::storeTaskPath() . 'errors.log';
-    }
-
-
-    /**
-     * 获取 master pid
-     *
-     * @time 2020年07月21日
-     * @return false|string
-     */
-    public static function getMasterPid()
-    {
-        $pidFile = config('catch.crontab.master_pid_file');
-
-        if (!FileSystem::exists($pidFile)) {
-            return 0;
-        }
-
-        return FileSystem::sharedGet($pidFile);
-    }
-
-    /**
-     * status
-     *
-     * @time 2020年07月21日
-     * @return false|string
-     */
-    public function renderStatus()
-    {
-        return FileSystem::sharedGet(self::statusPath());
-    }
-
-    /**
-     * 运行时间
-     *
-     * @time 2020年07月23日
-     * @param $runtime
-     * @return string
-     */
-    protected function getRunningTime($runtime)
-    {
-        $day = 3600 * 24;
-        if ($runtime > $day) {
-            $days = floor($runtime / $day);
-            return $days . '天:' . gmstrftime('%H:%M:%S', $runtime % $day);
-        } else {
-            return gmstrftime('%H:%M:%S', $runtime);
-        }
-    }
-
-    /**
-     * 获取工作进程
-     *
-     * @time 2020年07月23日
-     * @return mixed
-     */
-    public function getWorkerStatus()
-    {
-        usleep(500 * 1000);
-
-        $files = FileSystem::glob(self::storeTaskPath() . 'status/*.status');
-
-        $workerStatus = [];
-
-        foreach ($files as $file) {
-            $workerStatus[] = explode("\t", FileSystem::sharedGet($file));
-        }
-
-        return $workerStatus;
-    }
-
-    /**
-     * 设置进程状态
-     *
-     * @time 2020年07月23日
-     * @param $name
-     * @param int $dealNum
-     * @param string $status
-     * @return void
-     */
-    protected function setWorkerStatus($name, $dealNum = 0, $status = 'running')
-    {
-        $startAt = strpos($name, 'worker') ? $this->worker_start_at : $this->start_at;
-
-        if ($this->daemon) {
-            FileSystem::put($this->workerStatusPath($this->workerStatusFileName($name)), implode("\t", [
-                posix_getpid(),
-                $name,
-                floor(memory_get_usage() / 1024 / 1024) . 'M',
-                $dealNum,
-                date('Y-m-d H:i:s', $startAt),
-                $this->getRunningTime(time() - $startAt),
-                $status
-            ]));
-        }
-    }
-
-    /**
-     * 进程名称
-     *
-     * @time 2020年09月15日
-     * @param $name
-     * @return string
-     */
-    protected function workerStatusFileName($name)
-    {
-        return $name . '_' . posix_getpid();
-    }
-
-    /**
-     * 删除进程状态文件
-     *
-     * @time 2020年09月15日
-     * @param $pid
-     * @return void
-     */
-    protected function deleteWorkerStatusFile($pid)
-    {
-        @unlink(self::workerStatusPath($this->name . ' worker_' . $pid));
-    }
-
-    /**
-     * 退出
-     *
-     * @time 2020年09月15日
-     * @return void
-     */
-    public static function exitMasterDo()
-    {
-        @unlink(self::masterPidStorePath());
-        @unlink(self::statusPath());
-        Filesystem::deleteDirectory(self::getWorkerStatusPath());
-    }
-}
--- a/catch/monitor/config.php
+++ b/catch/monitor/config.php
@@ -1,59 +0,0 @@
-<?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 ]
-// +----------------------------------------------------------------------
-return [
-    /**
-     *
-     * 定时任务配置
-     *
-     */
-    'crontab' => [
-        /**
-         * 存储目录
-         */
-        'store_path' => runtime_path('catch/crontab'),
-
-        /**
-         * 主进程 pid 存储
-         */
-        'master_pid_file' => runtime_path('catch/crontab') . 'master.pid',
-
-        /**
-         * 日志配置
-         */
-        'log' => [
-            // 日志记录方式
-            'type'           => 'File',
-            // 日志保存目录
-            'path'           => runtime_path('catch/schedule'),
-            // 单文件日志写入
-            'single'         => false,
-            // 独立日志级别
-            'apart_level'    => [],
-            // 最大日志文件数量
-            'max_files'      => 0,
-            // 使用JSON格式记录
-            'json'           => false,
-            // 日志处理
-            'processor'      => null,
-            // 关闭通道日志写入
-            'close'          => false,
-            // 日志输出格式化
-            'format'         => '[%s][%s] %s',
-            // 是否实时写入
-            'realtime_write' => false,
-        ],
-
-        /**
-         * crontab 任务命名空间
-         */
-        'task_namespace' => '\\app\\task\\',
-    ],
-];
--- a/catch/monitor/controller/Crontab.php
+++ b/catch/monitor/controller/Crontab.php
@@ -1,105 +0,0 @@
-<?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\monitor\controller;
-
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use catchAdmin\monitor\model\Crontab as CrontabModel;
-use Cron\CronExpression;
-
-class Crontab extends CatchController
-{
-    protected $model;
-    
-    public function __construct(CrontabModel $model)
-    {
-        $this->model = $model;
-    }
-    
-    /**
-     * 列表
-     *
-     * @time 2020/09/14 20:35
-     *  
-     * @return \think\Response
-     */
-    public function index()
-    {
-        return CatchResponse::paginate($this->model->getList());
-    }
-    
-    /**
-     * 保存
-     *
-     * @time 2020/09/14 20:35
-     * @param Request Request 
-     * @return \think\Response
-     */
-    public function save(Request $request)
-    {
-        new CronExpression($request->post('cron'));
-
-        return CatchResponse::success($this->model->storeBy($request->post()));
-    }
-    
-    /**
-     * 读取
-     *
-     * @time 2020/09/14 20:35
-     * @param $id 
-     * @return \think\Response
-     */
-    public function read($id)
-    {
-       return CatchResponse::success($this->model->findBy($id)); 
-    }
-    
-    /**
-     * 更新
-     *
-     * @time 2020/09/14 20:35
-     * @param Request $request 
-     * @return \think\Response
-     */
-    public function update(Request $request, $id)
-    {
-        new CronExpression($request->post('cron'));
-
-        return CatchResponse::success($this->model->updateBy($id, $request->post()));
-    }
-    
-    /**
-     * 删除
-     *
-     * @time 2020/09/14 20:35
-     * @param $id 
-     * @return \think\Response
-     */
-    public function delete($id)
-    {
-        return CatchResponse::success($this->model->deleteBy($id));
-    }
-
-    /**
-     * 禁用启用
-     *
-     * @time 2020年09月15日
-     * @param $id
-     * @return \think\response\Json
-     */
-    public function disOrEnable($id)
-    {
-        return CatchResponse::success($this->model->disOrEnable($id));
-    }
-    
-}
--- a/catch/monitor/controller/CrontabLog.php
+++ b/catch/monitor/controller/CrontabLog.php
@@ -1,50 +0,0 @@
-<?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\monitor\controller;
-
-use catchAdmin\monitor\model\CrontabLog as LogModel;
-use catcher\base\CatchController;
-use catcher\CatchResponse;
-use think\Request;
-
-class CrontabLog extends CatchController
-{
-    protected $model;
-
-    public function __construct(LogModel $model)
-    {
-        $this->model = $model;
-    }
-
-    /**
-     * 日志列表
-     *
-     * @time 2020年09月15日
-     * @throws \think\db\exception\DbException
-     * @return \think\response\Json
-     */
-    public function index()
-    {
-        return CatchResponse::paginate($this->model->getList());
-    }
-
-    /**
-     * 删除日志
-     *
-     * @time 2020年09月15日
-     * @param $id
-     * @return \think\response\Json
-     */
-    public function delete($id)
-    {
-        return CatchResponse::success($this->model->deleteBy($id));
-    }
-}
--- a/catch/monitor/database/migrations/20200914203553_crontab.php
+++ b/catch/monitor/database/migrations/20200914203553_crontab.php
@@ -1,46 +0,0 @@
-<?php
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class Crontab 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('crontab', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '定时任务' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('name', 'string', ['limit' => 255,'null' => false,'default' => '','signed' => false,'comment' => '任务名称',])
-			->addColumn('group', 'boolean', ['null' => false,'default' => 1,'signed' => false,'comment' => '1 默认 2 系统',])
-			->addColumn('task', 'string', ['limit' => 255,'null' => false,'default' => '','signed' => false,'comment' => '任务名称',])
-			->addColumn('cron', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => 'cron 表达式',])
-			->addColumn('tactics', 'boolean', ['null' => false,'default' => 1,'signed' => false,'comment' => '1 立即执行 2 执行一次 3 正常执行',])
-			->addColumn('status', 'boolean', ['null' => false,'default' => 1,'signed' => false,'comment' => '1 正常 2 禁用',])
-			->addColumn('remark', 'string', ['limit' => 1000,'null' => false,'default' => '','signed' => false,'comment' => '备注',])
-			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '创建人ID',])
-			->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();
-    }
-}
--- a/catch/monitor/database/migrations/20200915101135_crontab_log.php
+++ b/catch/monitor/database/migrations/20200915101135_crontab_log.php
@@ -1,51 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class CrontabLog 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('crontab_log', ['engine' => 'Myisam', 'collation' => 'utf8mb4_general_ci', 'comment' => '定时任务日志' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('crontab_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => 'crontab 任务ID',])
-            ->addColumn('used_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '任务消耗时间',])
-            ->addColumn('status', 'boolean', ['null' => false,'default' => 1,'signed' => false,'comment' => '1 成功 2 失败',])
-            ->addColumn('error_message', 'string', ['limit' => 1000,'null' => false,'default' => '','signed' => false,'comment' => '错误信息',])
-            ->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();
-    }
-}
--- a/catch/monitor/database/seeds/MonitorMenusSeed.php
+++ b/catch/monitor/database/seeds/MonitorMenusSeed.php
@@ -1,253 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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 MonitorMenusSeed 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' => 103,
-    'permission_name' => '系统监控',
-    'parent_id' => 0,
-    'level' => '',
-    'route' => '/monitor',
-    'icon' => 'el-icon-view',
-    'module' => 'monitor',
-    'creator_id' => 1,
-    'permission_mark' => 'monitor',
-    'component' => 'layout',
-    'redirect' => '/monitor/crontab',
-    'keepalive' => 1,
-    'type' => 1,
-    'hidden' => 1,
-    'sort' => 1,
-    'created_at' => 1600126383,
-    'updated_at' => 1600136975,
-    'deleted_at' => 0,
-    'children' => 
-    array (
-      0 => 
-      array (
-        'id' => 104,
-        'permission_name' => '定时任务',
-        'parent_id' => 103,
-        'level' => '103',
-        'route' => '/monitor/crontab',
-        'icon' => 'el-icon-time',
-        'module' => 'monitor',
-        'creator_id' => 1,
-        'permission_mark' => 'crontab',
-        'component' => 'crontab',
-        'redirect' => '',
-        'keepalive' => 1,
-        'type' => 1,
-        'hidden' => 1,
-        'sort' => 1,
-        'created_at' => 1600126931,
-        'updated_at' => 1600136975,
-        'deleted_at' => 0,
-        'children' => 
-        array (
-          0 => 
-          array (
-            'id' => 105,
-            'permission_name' => '列表',
-            'parent_id' => 104,
-            'level' => '103-104',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'crontab@index',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600127069,
-            'updated_at' => 1600136975,
-            'deleted_at' => 0,
-          ),
-          1 => 
-          array (
-            'id' => 106,
-            'permission_name' => '保存',
-            'parent_id' => 104,
-            'level' => '103-104',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'crontab@save',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600127078,
-            'updated_at' => 1600136975,
-            'deleted_at' => 0,
-          ),
-          2 => 
-          array (
-            'id' => 107,
-            'permission_name' => '更新',
-            'parent_id' => 104,
-            'level' => '103-104',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'crontab@update',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600127085,
-            'updated_at' => 1600136975,
-            'deleted_at' => 0,
-          ),
-          3 => 
-          array (
-            'id' => 108,
-            'permission_name' => '删除',
-            'parent_id' => 104,
-            'level' => '103-104',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'crontab@delete',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600127091,
-            'updated_at' => 1600136975,
-            'deleted_at' => 0,
-          ),
-          4 => 
-          array (
-            'id' => 109,
-            'permission_name' => '禁用/启用',
-            'parent_id' => 104,
-            'level' => '103-104',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'crontab@disOrEnable',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600129279,
-            'updated_at' => 1600136975,
-            'deleted_at' => 0,
-          ),
-        ),
-      ),
-      1 => 
-      array (
-        'id' => 110,
-        'permission_name' => '任务日志',
-        'parent_id' => 103,
-        'level' => '103-104',
-        'route' => '/monitor/crontab/log/:crontab_id?',
-        'icon' => 'el-icon-guide',
-        'module' => 'monitor',
-        'creator_id' => 1,
-        'permission_mark' => 'CrontabLog',
-        'component' => 'crontabLog',
-        'redirect' => '',
-        'keepalive' => 1,
-        'type' => 1,
-        'hidden' => 2,
-        'sort' => 1,
-        'created_at' => 1600167562,
-        'updated_at' => 1600188651,
-        'deleted_at' => 0,
-        'children' => 
-        array (
-          0 => 
-          array (
-            'id' => 111,
-            'permission_name' => '列表',
-            'parent_id' => 110,
-            'level' => '103-104-110',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'CrontabLog@index',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600167574,
-            'updated_at' => 1600168082,
-            'deleted_at' => 0,
-          ),
-          1 => 
-          array (
-            'id' => 112,
-            'permission_name' => '删除',
-            'parent_id' => 110,
-            'level' => '103-104-110',
-            'route' => '',
-            'icon' => '',
-            'module' => 'monitor',
-            'creator_id' => 1,
-            'permission_mark' => 'CrontabLog@delete',
-            'component' => '',
-            'redirect' => '',
-            'keepalive' => 1,
-            'type' => 2,
-            'hidden' => 1,
-            'sort' => 1,
-            'created_at' => 1600167581,
-            'updated_at' => 1600168082,
-            'deleted_at' => 0,
-          ),
-        ),
-      ),
-    ),
-  ),
-);
-    }
-}
--- a/catch/monitor/model/Crontab.php
+++ b/catch/monitor/model/Crontab.php
@@ -1,42 +0,0 @@
-<?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\monitor\model;
-
-use catchAdmin\monitor\model\search\CrontabSearch;
-use catcher\base\CatchModel as Model;
-
-class Crontab extends Model
-{
-    use CrontabSearch;
-
-    protected $name = 'crontab';
-
-    protected $field = [
-        'id', // 
-		'name', // 任务名称
-		'group', // 1 默认 2 系统
-		'task', // 任务名称
-		'cron', // cron 表达式
-		'tactics', // 1 立即执行 2 执行一次 3 放弃执行
-		'status', // 1 正常 2 禁用
-		'remark', // 备注
-		'creator_id', // 创建人ID
-		'created_at', // 创建时间
-		'updated_at', // 更新时间
-		'deleted_at', // 软删除
-    ];
-
-
-    const EXECUTE_IMMEDIATELY = 1; // 立即执行
-    const EXECUTE_ONCE = 2; // 执行一次
-    const EXECUTE_NORMAL = 3; // 正常执行
-}
--- a/catch/monitor/model/CrontabLog.php
+++ b/catch/monitor/model/CrontabLog.php
@@ -1,53 +0,0 @@
-<?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\monitor\model;
-
-use catchAdmin\monitor\model\search\CrontabLogSearch;
-use catcher\base\CatchModel;
-
-class CrontabLog extends CatchModel
-{
-    use CrontabLogSearch;
-
-    protected $name = 'crontab_log';
-
-    protected $field = [
-        'id', // 
-		'crontab_id', // crontab 任务ID
-		'used_time', // 任务消耗时间
-		'status', // 1 成功 2 失败
-		'error_message', // 错误信息
-		'created_at', // 创建时间
-		'updated_at', // 更新时间
-		'deleted_at', // 软删除
-    ];
-
-
-    const SUCCESS = 1;
-    const FAILED = 2;
-
-    /**
-     * 获取日志列表
-     *
-     * @time 2020年09月15日
-     * @throws \think\db\exception\DbException
-     * @return mixed|\think\Paginator
-     */
-    public function getList()
-    {
-        return $this->catchLeftJoin(Crontab::class, 'id', 'crontab_id', ['name', 'group', 'task'])
-                    ->catchSearch()
-                    ->catchOrder()
-                    ->field(['used_time', 'error_message', $this->aliasField('status'), $this->aliasField('id'), $this->aliasField('created_at')])
-                    ->paginate();
-    }
-}
--- a/catch/monitor/model/search/CrontabLogSearch.php
+++ b/catch/monitor/model/search/CrontabLogSearch.php
@@ -1,39 +0,0 @@
-<?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\monitor\model\search;
-
-trait CrontabLogSearch
-{
-    public function searchCrontabIdAttr($query, $value, $data)
-    {
-        return $query->where('crontab_id', $value);
-    }
-
-    public function searchNameAttr($query, $value, $data)
-    {
-        return $query->whereLike('crontab.name', $value);
-    }
-
-    public function searchStatusAttr($query, $value, $data)
-    {
-        return $query->where('crontab_log.status', $value);
-    }
-
-    public function searchStartAtAttr($query, $value, $data)
-    {
-        return $query->where($this->aliasField('created_at'), '>=', strtotime($value));
-    }
-
-    public function searchEndAtAttr($query, $value, $data)
-    {
-        return $query->where($this->aliasField('created_at'), '<=', strtotime($value));
-    }
-}
--- a/catch/monitor/model/search/CrontabSearch.php
+++ b/catch/monitor/model/search/CrontabSearch.php
@@ -1,24 +0,0 @@
-<?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\monitor\model\search;
-
-trait CrontabSearch
-{
-    public function searchNameAttr($query, $value, $data)
-    {
-        return $query->whereLike('name', $value);
-    }
-
-    public function searchStatusAttr($query, $value, $data)
-    {
-        return $query->where('status', $value);
-    }
-}
--- a/catch/monitor/module.json
+++ b/catch/monitor/module.json
@@ -1,15 +0,0 @@
-{
-    "name": "系统监控",
-    "alias": "monitor",
-    "description": "系统监控模块",
-    "version": "1.0.0",
-    "keywords": [],
-    "order": 0,
-    "services": [
-        "\\catchAdmin\\monitor\\MonitorService"
-    ],
-    "aliases": [],
-    "files": [],
-    "requires": [],
-    "enable": true
-}
--- a/catch/monitor/route.php
+++ b/catch/monitor/route.php
@@ -1,24 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-/* @var think\Route $router */
-
-// you should use `$router`
-$router->group('monitor', function () use ($router){
-	// crontab路由
-	$router->resource('crontab', '\catchAdmin\monitor\controller\Crontab');
-    $router->put('crontab/enable/<id>', '\catchAdmin\monitor\controller\Crontab@disOrEnable');
-
-    // crontab 日志
-    $router->get('crontab/log/list', '\catchAdmin\monitor\controller\CrontabLog@index');
-    $router->delete('crontab/log/list/<id>', '\catchAdmin\monitor\controller\CrontabLog@delete');
-
-})->middleware('auth');
--- a/catch/permissions/controller/Department.php
+++ b/catch/permissions/controller/Department.php
@@ -5,7 +5,6 @@ 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
@@ -27,7 +26,7 @@ class Department extends CatchController
   */
    public function index(): \think\response\Json
    {
-        return CatchResponse::success($this->department->getList());
+        return CatchResponse::success(Tree::done($this->department->getList()));
    }

  /**
@@ -64,10 +63,6 @@ class Department extends CatchController
   */
    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));
    }
 }
--- a/catch/permissions/controller/Permission.php
+++ b/catch/permissions/controller/Permission.php
@@ -9,7 +9,6 @@ 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
@@ -47,9 +46,9 @@ class Permission extends CatchController
        // 子节点的 key
        $children = $request->param('actionList') ?? 'children';
        // 返回树结构
-        return CatchResponse::success($menuList->each(function (&$item) use ($buttonList, $children){
+        return CatchResponse::success(Tree::done($menuList->each(function (&$item) use ($buttonList, $children){
            $item[$children] = $buttonList[$item['id']] ?? [];
-        })->toTree());
+        })->toArray()));
    }

  /**
@@ -67,22 +66,9 @@ class Permission extends CatchController

        // 如果是子分类 自动写入父类模块
        $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;
+        if ($parentId) {
+            $parent = $this->permissions->findBy($parentId);
+            $params['module'] = $parent->module;
        }

        return CatchResponse::success($this->permissions->storeBy($params));
@@ -99,34 +85,6 @@ class Permission extends CatchController
    {
        $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
@@ -176,7 +134,40 @@ class Permission extends CatchController
     */
    public function show($id)
    {
-        return CatchResponse::success($this->permissions->show($id));
+        $permission = $this->permissions->findBy($id);
+
+        $permission->status = $permission->status == Permissions::ENABLE ? Permissions::DISABLE : Permissions::ENABLE;
+
+        if ($permission->save()) {
+            $this->permissions->where('parent_id', $id)->update([
+                'status' => $permission->status,
+            ]);
+        }
+
+        return CatchResponse::success($permission->save());
+    }
+
+    /**
+     *
+     * @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];
+
+        $methods = $parseClass->setModule('catch')->setRule($module, $controller)->onlySelfMethods();
+
+        return CatchResponse::success($methods);
    }
 }

--- a/catch/permissions/controller/Role.php
+++ b/catch/permissions/controller/Role.php
@@ -1,19 +1,19 @@
 <?php
 namespace catchAdmin\permissions\controller;

-use catchAdmin\permissions\model\Roles;
+use catchAdmin\permissions\model\Permissions;
 use catcher\base\CatchRequest as Request;
 use catcher\base\CatchController;
 use catcher\CatchResponse;
 use catcher\exceptions\FailedException;
+use catcher\Tree;
 use think\response\Json;
-use catchAdmin\permissions\model\Roles as RoleModel;

 class Role extends CatchController
 {
    protected $role;

-    public function __construct(RoleModel $role)
+    public function __construct(\catchAdmin\permissions\model\Roles $role)
    {
        $this->role = $role;
    }
@@ -21,11 +21,12 @@ class Role extends CatchController
  /**
   *
   * @time 2019年12月09日
-   * @return string|Json
+   * @param Request $request
+   * @return string
   */
    public function index()
    {
-      return CatchResponse::success($this->role->getList());
+      return CatchResponse::success(Tree::done($this->role->getList()));
    }

    /**
@@ -37,20 +38,14 @@ class Role extends CatchController
     */
    public function save(Request $request)
    {
-        $params = $request->param();
+        $this->role->storeBy($request->param());

-        if (Roles::where('identify', $params['identify'])->find()) {
-            throw new FailedException('角色标识 [' . $params['identify'] . ']已存在');
+        $permissions = $request->param('permissions');
+        if (!empty($permissions)) {
+            $this->role->attachPermissions(array_unique($permissions));
        }
-
-        $this->role->storeBy($params);
-        // 分配权限
-        if (count($params['permissions'])) {
-            $this->role->attachPermissions(array_unique($params['permissions']));
-        }
-        // 分配部门
-        if (isset($params['departments']) && count($params['departments'])) {
-            $this->role->attachDepartments($params['departments']);
+        if (!empty($request->param('departments'))) {
+            $this->role->attachDepartments($request->param('departments'));
        }
        // 添加角色
        return CatchResponse::success();
@@ -74,10 +69,6 @@ class Role extends CatchController
     */
    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);

@@ -102,7 +93,7 @@ class Role extends CatchController
        if (!empty($attachIds)) {
            $role->attachPermissions(array_unique($attachIds));
        }
-
+        
        // 更新department
        $hasDepartmentIds = $role->getDepartments()->column('id');
        $departmentIds = $request->param('departments',[]);
@@ -155,4 +146,37 @@ class Role extends CatchController

        return CatchResponse::success();
    }
+
+    /**
+     *
+     * @time 2019年12月11日
+     * @param Request $request
+     * @param \catchAdmin\permissions\model\Permissions $permission
+     * @return Json
+     */
+    public function getPermissions(Request $request, \catchAdmin\permissions\model\Permissions $permission): Json
+    {
+        $parentRoleHasPermissionIds = [];
+        if ($request->param('parent_id')) {
+            $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,
+        ]);
+    }
 }
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -1,19 +1,16 @@
 <?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 catchAdmin\permissions\request\ProfileRequest;
 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;
@@ -52,7 +49,7 @@ class User extends CatchController
    {
        $user = $auth->user();

-        $roles = $user->getRoles()->column('identify');
+        $roles = $user->getRoles();

        $permissionIds = $user->getPermissionsBy($user->id);
        // 缓存用户权限
@@ -68,6 +65,15 @@ class User extends CatchController
        return CatchResponse::success($user);
    }

+    /**
+     *
+     * @time 2019年12月06日
+     * @throws \Exception
+     * @return string
+     */
+    public function create()
+    {}
+
    /**
     *
     * @param CreateRequest $request
@@ -80,9 +86,7 @@ class User extends CatchController

        $this->user->attachRoles($request->param('roles'));

-        if ($request->param('jobs')) {
-            $this->user->attachJobs($request->param('jobs'));
-        }
+        $this->user->attachJobs($request->param('jobs'));

        return CatchResponse::success('', '添加成功');
    }
@@ -101,6 +105,12 @@ class User extends CatchController
        return CatchResponse::success($user);
    }

+    /**
+     * @param $id
+     * @return string
+     * @throws \Exception
+     */
+    public function edit($id){}
    /**
     *
     * @time 2019年12月04日
@@ -110,7 +120,7 @@ class User extends CatchController
     */
    public function update($id, UpdateRequest $request)
    {
-        $this->user->updateBy($id, $request->filterEmptyField()->param());
+        $this->user->updateBy($id, $request->param());

        $user = $this->user->findBy($id);

@@ -172,28 +182,47 @@ class User extends CatchController
    }

    /**
-     * 导出
     *
-     * @time 2020年09月08日
-     * @param Excel $excel
-     * @param UserExport $userExport
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @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 export(Excel $excel, UserExport $userExport)
+    public function recover($id): \think\response\Json
    {
-        return CatchResponse::success($excel->save($userExport, Utils::publicPath('export/users')));
+       $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 2020年09月20日
-     * @param ProfileRequest $request
+     * @time 2019年12月11日
+     * @param Request $request
+     * @param Roles $roles
     * @return \think\response\Json
     */
-    public function profile(ProfileRequest $request)
+    public function getRoles(Request $request, Roles $roles): \think\response\Json
    {
-       return CatchResponse::success($this->user->updateBy($request->user()->id, $request->filterEmptyField()->param()));
+        $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,
+        ]);
    }
 }
--- a/catch/permissions/database/migrations/20200830025329_update_roles.php
+++ b/catch/permissions/database/migrations/20200830025329_update_roles.php
@@ -1,42 +0,0 @@
-<?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();
-        }
-    }
-}
--- a/catch/permissions/database/migrations/20200830031139_update_permissions.php
+++ b/catch/permissions/database/migrations/20200830031139_update_permissions.php
@@ -1,40 +0,0 @@
-<?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();
-        }
-    }
-}
--- a/catch/permissions/database/migrations/20200920130201_add_user_avatar.php
+++ b/catch/permissions/database/migrations/20200920130201_add_user_avatar.php
@@ -1,51 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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\Migrator;
-use think\migration\db\Column;
-
-class AddUserAvatar 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('users')) {
-            $table = $this->table('users');
-
-            $table->addColumn('avatar', 'string', [
-                'limit' => 255,
-                'default' => '',
-                'comment' => '用户头像',
-                'after' => 'email'])
-                ->update();
-        }
-    }
-}
--- a/catch/permissions/database/migrations/20201123113823_add_user_remember_token.php
+++ b/catch/permissions/database/migrations/20201123113823_add_user_remember_token.php
@@ -1,51 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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\Migrator;
-use think\migration\db\Column;
-
-class AddUserRememberToken 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('users')) {
-            $table = $this->table('users');
-
-            $table->addColumn('remember_token', 'string', [
-                'limit' => 512,
-                'default' => '',
-                'comment' => '用户token',
-                'after' => 'avatar'])
-                ->update();
-        }
-    }
-}
--- a/catch/permissions/database/seeds/PermissionsMenusSeed.php
+++ b/catch/permissions/database/seeds/PermissionsMenusSeed.php
@@ -2,7 +2,7 @@

 use think\migration\Seeder;

-class PermissionsMenusSeed extends Seeder
+class PermissionSeed extends Seeder
 {
    /**
     * Run Method.
@@ -27,18 +27,20 @@ class PermissionsMenusSeed extends Seeder
    'parent_id' => 0,
    'level' => '',
    'route' => '/permissions',
-    'icon' => 'el-icon-cpu',
+    'icon' => 'appstore',
    'module' => 'permissions',
    'creator_id' => 1,
-    'permission_mark' => 'permission',
-    'component' => 'layout',
-    'redirect' => '/permissions/users',
-    'hidden' => 1,
+    'method' => 'get',
+    'permission_mark' => 'permission@index',
+    'component' => 'pageView',
+    'redirect' => '',
+    'hide_children_in_menu' => 2,
    'keepalive' => 1,
    'type' => 1,
+    'status' => 1,
    'sort' => 100,
    'created_at' => 1587461455,
-    'updated_at' => 1599362429,
+    'updated_at' => 1593044101,
    'deleted_at' => 0,
    'children' => 
    array (
@@ -49,18 +51,20 @@ class PermissionsMenusSeed extends Seeder
        'parent_id' => 1,
        'level' => '1',
        'route' => '/permissions/users',
-        'icon' => 'el-icon-user',
+        'icon' => 'user',
        'module' => 'permissions',
        'creator_id' => 1,
-        'permission_mark' => 'user',
+        'method' => 'get',
+        'permission_mark' => 'user@index',
        'component' => 'users',
        'redirect' => '',
-        'hidden' => 1,
+        'hide_children_in_menu' => 2,
        'keepalive' => 1,
        'type' => 1,
+        'status' => 1,
        'sort' => 10,
        'created_at' => 1587461597,
-        'updated_at' => 1599362429,
+        'updated_at' => 1592371975,
        'deleted_at' => 0,
        'children' => 
        array (
@@ -74,15 +78,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@index',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461647,
-            'updated_at' => 1599030266,
+            'updated_at' => 1591316160,
            'deleted_at' => 0,
          ),
          1 => 
@@ -95,15 +101,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@create',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461696,
-            'updated_at' => 1599030266,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          2 => 
@@ -116,15 +124,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@save',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461721,
-            'updated_at' => 1599030266,
+            'updated_at' => 1591345475,
            'deleted_at' => 0,
          ),
          3 => 
@@ -137,15 +147,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@edit',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461742,
-            'updated_at' => 1599030266,
+            'updated_at' => 1591345504,
            'deleted_at' => 0,
          ),
          4 => 
@@ -158,15 +170,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@update',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461762,
-            'updated_at' => 1599030266,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          5 => 
@@ -179,15 +193,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@delete',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461841,
-            'updated_at' => 1599030266,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          6 => 
@@ -200,15 +216,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@switchStatus',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461876,
-            'updated_at' => 1599030266,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          7 => 
@@ -221,15 +239,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'user@recover',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461901,
-            'updated_at' => 1599030266,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
        ),
@@ -241,18 +261,20 @@ class PermissionsMenusSeed extends Seeder
        'parent_id' => 1,
        'level' => '1',
        'route' => '/permissions/roles',
-        'icon' => 'el-icon-s-custom',
+        'icon' => 'usergroup-add',
        'module' => 'permissions',
        'creator_id' => 1,
-        'permission_mark' => 'role',
+        'method' => 'get',
+        'permission_mark' => 'role@index',
        'component' => 'roles',
        'redirect' => '',
-        'hidden' => 1,
+        'hide_children_in_menu' => 2,
        'keepalive' => 1,
        'type' => 1,
+        'status' => 1,
        'sort' => 9,
        'created_at' => 1587461939,
-        'updated_at' => 1599362438,
+        'updated_at' => 1592371974,
        'deleted_at' => 0,
        'children' => 
        array (
@@ -266,15 +288,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@index',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587461984,
-            'updated_at' => 1599362438,
+            'updated_at' => 1591341461,
            'deleted_at' => 0,
          ),
          1 => 
@@ -287,15 +311,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@create',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462007,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          2 => 
@@ -308,15 +334,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@save',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462021,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          3 => 
@@ -329,15 +357,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@edit',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462040,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          4 => 
@@ -350,15 +380,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@update',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462058,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          5 => 
@@ -371,15 +403,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@delete',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462070,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          6 => 
@@ -392,15 +426,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'role@getPermissions',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462094,
-            'updated_at' => 1599362438,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
        ),
@@ -412,18 +448,20 @@ class PermissionsMenusSeed extends Seeder
        'parent_id' => 1,
        'level' => '1',
        'route' => '/permissions/rules',
-        'icon' => 'el-icon-collection-tag',
+        'icon' => 'build',
        'module' => 'permissions',
        'creator_id' => 1,
-        'permission_mark' => 'permission',
+        'method' => 'get',
+        'permission_mark' => 'permission@index',
        'component' => 'rules',
        'redirect' => '',
-        'hidden' => 1,
+        'hide_children_in_menu' => 2,
        'keepalive' => 1,
        'type' => 1,
+        'status' => 1,
        'sort' => 8,
        'created_at' => 1587462147,
-        'updated_at' => 1599362475,
+        'updated_at' => 1592371979,
        'deleted_at' => 0,
        'children' => 
        array (
@@ -437,15 +475,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'permission@index',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462205,
-            'updated_at' => 1599362475,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          1 => 
@@ -458,15 +498,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'permission@create',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462232,
-            'updated_at' => 1599362475,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          2 => 
@@ -479,36 +521,40 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'permission@save',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462250,
-            'updated_at' => 1599362475,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          3 => 
          array (
            'id' => 23,
-            'permission_name' => '禁用/启用',
+            'permission_name' => '查看',
            'parent_id' => 19,
            'level' => '1-19',
            'route' => '',
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
-            'permission_mark' => 'permission@show',
+            'method' => 'get',
+            'permission_mark' => 'permission@edit',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462273,
-            'updated_at' => 1599362475,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          4 => 
@@ -521,15 +567,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'permission@update',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462284,
-            'updated_at' => 1599362475,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          5 => 
@@ -542,36 +590,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'permission@delete',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            '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,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
        ),
@@ -583,18 +612,20 @@ class PermissionsMenusSeed extends Seeder
        'parent_id' => 1,
        'level' => '1',
        'route' => '/permissions/departments',
-        'icon' => 'el-icon-monitor',
+        'icon' => 'desktop',
        'module' => 'permissions',
        'creator_id' => 1,
+        'method' => 'get',
        'permission_mark' => 'departments',
        'component' => 'departments',
        'redirect' => '',
-        'hidden' => 1,
+        'hide_children_in_menu' => 2,
        'keepalive' => 1,
        'type' => 1,
+        'status' => 1,
        'sort' => 7,
        'created_at' => 1587462488,
-        'updated_at' => 1599362429,
+        'updated_at' => 1587547118,
        'deleted_at' => 0,
        'children' => 
        array (
@@ -608,15 +639,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'department@index',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462529,
-            'updated_at' => 1599030565,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          1 => 
@@ -629,15 +662,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'department@save',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462548,
-            'updated_at' => 1599030565,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          2 => 
@@ -650,15 +685,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'department@update',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462579,
-            'updated_at' => 1599030565,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          3 => 
@@ -671,15 +708,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'department@delete',
            'component' => '',
            'redirect' => '',
-            'hidden' => 1,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462592,
-            'updated_at' => 1599030565,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
        ),
@@ -691,18 +730,20 @@ class PermissionsMenusSeed extends Seeder
        'parent_id' => 1,
        'level' => '1',
        'route' => '/permissions/jobs',
-        'icon' => 'el-icon-setting',
+        'icon' => 'skin',
        'module' => 'permissions',
        'creator_id' => 1,
+        'method' => 'get',
        'permission_mark' => 'job',
        'component' => 'jobs',
        'redirect' => '',
-        'hidden' => 1,
+        'hide_children_in_menu' => 2,
        'keepalive' => 1,
        'type' => 1,
+        'status' => 1,
        'sort' => 1,
        'created_at' => 1587462707,
-        'updated_at' => 1599362429,
+        'updated_at' => 1587547118,
        'deleted_at' => 0,
        'children' => 
        array (
@@ -716,15 +757,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
-            'permission_mark' => 'job@indexs',
+            'method' => 'get',
+            'permission_mark' => 'job@index',
            'component' => '',
            'redirect' => '',
-            'hidden' => 2,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462757,
-            'updated_at' => 1598959522,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          1 => 
@@ -737,15 +780,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'job@save',
            'component' => '',
            'redirect' => '',
-            'hidden' => 2,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462774,
-            'updated_at' => 1598959522,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          2 => 
@@ -758,15 +803,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'job@update',
            'component' => '',
            'redirect' => '',
-            'hidden' => 2,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462785,
-            'updated_at' => 1598959522,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          3 => 
@@ -779,15 +826,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'job@delete',
            'component' => '',
            'redirect' => '',
-            'hidden' => 2,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462794,
-            'updated_at' => 1598959522,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
          4 => 
@@ -800,15 +849,17 @@ class PermissionsMenusSeed extends Seeder
            'icon' => '',
            'module' => 'permissions',
            'creator_id' => 1,
+            'method' => 'get',
            'permission_mark' => 'job@getAll',
            'component' => '',
            'redirect' => '',
-            'hidden' => 2,
+            'hide_children_in_menu' => 1,
            'keepalive' => 1,
            'type' => 2,
+            'status' => 1,
            'sort' => 1,
            'created_at' => 1587462818,
-            'updated_at' => 1598959522,
+            'updated_at' => 1587547118,
            'deleted_at' => 0,
          ),
        ),
--- a/catch/permissions/database/seeds/RolesSeed.php
+++ b/catch/permissions/database/seeds/RolesSeed.php
@@ -24,9 +24,7 @@ class RolesSeed extends Seeder
    {
        \catchAdmin\permissions\model\Roles::create([
            'role_name' => '超级管理员',
-            'identify'  => 'admin',
            'description' => 'super user',
-            'data_range' => 1,
            'creator_id' => 1,
        ]);

--- a/catch/permissions/database/seeds/UsersSeed.php
+++ b/catch/permissions/database/seeds/UsersSeed.php
@@ -16,8 +16,8 @@ class UsersSeed extends Seeder
    {
        return \catchAdmin\permissions\model\Users::create([
            'username' => 'admin',
-            'password' => 'catchadmin',
-            'email'    => 'catch@admin.com',
+            'password' => 'admin',
+            'email'    => 'admin@gmail.com',
            'creator_id' => 1,
        ]);
    }
--- a/catch/permissions/excel/UserExport.php
+++ b/catch/permissions/excel/UserExport.php
@@ -1,78 +0,0 @@
-<?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
-        ];
-    }
-}
--- a/catch/permissions/middleware/PermissionsMiddleware.php
+++ b/catch/permissions/middleware/PermissionsMiddleware.php
@@ -32,7 +32,6 @@ class PermissionsMiddleware

        // 模块忽略
        [$module, $controller, $action] = Utils::parseRule($rule);
-
        // toad
        if (in_array($module, $this->ignoreModule())) {
            return $next($request);
@@ -43,11 +42,11 @@ class PermissionsMiddleware
            throw new PermissionForbiddenException('Login is invalid', Code::LOST_LOGIN);
        }
        // 超级管理员
-        if (Utils::isSuperAdmin()) {
+        if ($request->user()->id === config('catch.permissions.super_admin_id')) {
            return $next($request);
        }
        // Get 请求
-        if ($this->allowGet($request)) {
+        if ($request->isGet() && config('catch.permissions.is_allow_get')) {
            return $next($request);
        }
        // 判断权限
@@ -107,21 +106,4 @@ class PermissionsMiddleware
            'permission' => $permission,
        ]);
    }
-
-    /**
-     * get allow
-     *
-     * @time 2020年10月12日
-     * @param $request
-     * @return bool
-     * @throws \ReflectionException
-     */
-    protected function allowGet($request)
-    {
-        if (Utils::isMethodNeedAuth($request->rule()->getName())) {
-            return false;
-        }
-
-        return $request->isGet() && config('catch.permissions.is_allow_get');
-    }
 }
--- a/catch/permissions/model/DataRangScopeTrait.php
+++ b/catch/permissions/model/DataRangScopeTrait.php
@@ -13,7 +13,7 @@ trait DataRangScopeTrait
     * @author JaguarJack <njphper@gmail.com>
     * @date 2020/6/6
     */
-    public function dataRange($roles = [])
+    protected function dataRange($roles)
    {
        if (Utils::isSuperAdmin()) {
            return $this;
@@ -44,10 +44,6 @@ trait DataRangScopeTrait

        $user = request()->user();

-        if (empty($roles)) {
-            $roles = $user->getRoles();
-        }
-
        foreach ($roles as $role) {
            switch ($role->data_range) {
                case Roles::ALL_DATA:
@@ -61,11 +57,6 @@ trait DataRangScopeTrait
                    $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;
--- a/catch/permissions/model/Department.php
+++ b/catch/permissions/model/Department.php
@@ -3,7 +3,6 @@ namespace catchAdmin\permissions\model;

 use catchAdmin\permissions\model\search\DepartmentSearch;
 use catcher\base\CatchModel;
-use think\db\exception\DbException;

 class Department extends CatchModel
 {
@@ -30,32 +29,16 @@ class Department extends CatchModel
   * 列表数据
   *
   * @time 2020年01月09日
+   * @param $params
   * @return array
-   * @throws DbException
+   * @throws \think\db\exception\DbException
   */
    public function getList(): array
    {
-        return $this->catchSearch()
+        return $this->withoutField(['department_name'])
+                    ->addFields(['department_name as title'])
+                    ->catchSearch()
                    ->catchOrder()
-                    ->select()->toTree();
-    }
-
-    /**
-     * 获取子部门IDS
-     *
-     * @time 2020年11月04日
-     * @param $id
-     * @throws DbException
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return mixed
-     */
-    public static function getChildrenDepartmentIds($id)
-    {
-        $departmentIds = Department::field(['id', 'parent_id'])->select()->getAllChildrenIds([$id]);
-
-        $departmentIds[] = $id;
-
-        return $departmentIds;
+                    ->select()->toArray();
    }
 }
--- a/catch/permissions/model/Permissions.php
+++ b/catch/permissions/model/Permissions.php
@@ -19,10 +19,12 @@ class Permissions extends CatchModel
        'component', // 组件
        'redirect',
        'keepalive',
+        'hide_children_in_menu',
        'creator_id',
-        'hidden',
+        'status',
        'module', // 模块
        'route', // 路由
+        'method', // 请求方法
        'permission_mark', // 权限标识
        'type', // 1 菜单 2 按钮
        'sort', // 排序字段
@@ -69,7 +71,7 @@ class Permissions extends CatchModel
        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'
+                          'keepalive as keepAlive', 'hide_children_in_menu', 'type', 'permission_mark', 'status'
                      ])
                      ->catchOrder()
                      ->select();
@@ -87,96 +89,16 @@ class Permissions extends CatchModel
     */
    public static function onAfterInsert(Model $model)
    {
-        $restful = intval($model->getData('restful'));
-
        $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;
-
-            $restful && self::createRestful($model, $level);
-
-            return $model->updateBy('id', [
+            return $model->where('id', $model->id)->update([
                'level' => $level
            ]);
        }

        return true;
    }
-
-
-    /**
-     * 创建 restful 菜单
-     *
-     * @time 2021年04月20日
-     * @param Model $model
-     * @param $level
-     * @return void
-     */
-    protected static function createRestful(Model $model, $level)
-    {
-        $restful = [
-            'index' => '列表',
-            'save' => '保存',
-            'update' => '更新',
-            'delete' => '删除',
-        ];
-
-        foreach ($restful as $k => $r) {
-            self::insert([
-                'parent_id' => $model->id,
-                'permission_name' => $r,
-                'level' => $level . '-' . $model->id,
-                'module' => $model->getData('module'),
-                'creator_id' => $model->getData('creator_id'),
-                'permission_mark' => $model->getData('permission_mark') . '@' . $k,
-                'type' => self::BTN_TYPE,
-                'created_at' => time(),
-                'updated_at' => time(),
-                'sort' => 1,
-            ]);
-        }
-    }
-
-
-    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;
-    }
 }
--- a/catch/permissions/model/Roles.php
+++ b/catch/permissions/model/Roles.php
@@ -21,7 +21,6 @@ class Roles extends CatchModel
    protected $field = [
            'id', // 
 			'role_name', // 角色名
-            'identify', // 身份标识
 			'parent_id', // 父级ID
            'creator_id', // 创建者
            'data_range', // 数据范围
@@ -35,19 +34,9 @@ class Roles extends CatchModel
    public function getList()
    {
        return $this->catchSearch()
-                    ->with(['permissions', 'departments'])
                    ->order('id', 'desc')
                    ->select()
-                    ->each(function (&$item){
-                        $permissions = $item->permissions->column('id');
-                        unset($item['permissions']);
-                        $item['_permissions'] = $permissions;
-
-                        $departments = $item->departments->column('id');
-                        unset($item['departments']);
-                        $item['departments'] = $departments;
-                    })
-                    ->toTree();
+                    ->toArray();
    }

    /**
--- a/catch/permissions/model/Users.php
+++ b/catch/permissions/model/Users.php
@@ -5,7 +5,6 @@ use catchAdmin\permissions\model\search\UserSearch;
 use catcher\base\CatchModel;
 use catcher\exceptions\FailedException;
 use catcher\Utils;
-use think\Paginator;

 class Users extends CatchModel
 {
@@ -20,8 +19,6 @@ class Users extends CatchModel
 			'username', // 用户名
 			'password', // 用户密码
 			'email', // 邮箱 登录
-            'avatar', // 头像
-            'remember_token',
            'creator_id', // 创建者ID
            'department_id', // 部门ID
 			'status', // 用户状态 1 正常 2 禁用
@@ -30,6 +27,7 @@ class Users extends CatchModel
 			'created_at', // 创建时间
 			'updated_at', // 更新时间
 			'deleted_at', // 删除状态，0未删除 >0 已删除
+			   
    ];

    /**
@@ -48,25 +46,16 @@ class Users extends CatchModel
     * 用户列表
     *
     * @time 2019年12月08日
-     * @return array|\think\Paginator
-     *@throws \think\db\exception\DbException
+     * @throws \think\db\exception\DbException
+     * @return \think\Paginator
     */
-    public function getList()
+    public function getList(): \think\Paginator
    {
-        $users = $this->withoutField(['updated_at', 'password', 'remember_token'], true)
+        return $this->withoutField(['updated_at'], true)
                    ->catchSearch()
                    ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
-                    ->with(['jobs', 'roles'])
                    ->order($this->aliasField('id'), 'desc')
-                    ->paginate()->toArray();
-
-        foreach ($users['data'] as &$user) {
-            $user['roles'] = array_column($user['roles'], 'id');
-            $user['jobs'] = array_column($user['jobs'], 'id');
-        }
-
-
-        return Paginator::make($users['data'], $users['per_page'], $users['current_page'], $users['total']);
+                    ->paginate();
    }

    /**
--- a/catch/permissions/model/search/UserSearch.php
+++ b/catch/permissions/model/search/UserSearch.php
@@ -1,8 +1,6 @@
 <?php
 namespace catchAdmin\permissions\model\search;

-use catchAdmin\permissions\model\Department;
-
 trait UserSearch
 {
    public function searchUsernameAttr($query, $value, $data)
@@ -20,20 +18,8 @@ trait UserSearch
        return $query->where($this->aliasField('status'), $value);
    }

-    /**
-     * 查询部门下的用户
-     *
-     * @time 2020年11月04日
-     * @param $query
-     * @param $value
-     * @param $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return mixed
-     */
    public function searchDepartmentIdAttr($query, $value, $data)
    {
-        return $query->whereIn($this->aliasField('department_id'), Department::getChildrenDepartmentIds($value));
+        return $query->where($this->aliasField('department_id'), $value);
    }
 }
--- a/catch/permissions/module.json
+++ b/catch/permissions/module.json
@@ -4,7 +4,7 @@
  "description": "权限管理模块",
  "version": "1.0.0",
  "keywords": [],
-  "order": 100,
+  "order": 2,
  "services": [
    "\\catchAdmin\\permissions\\PermissionService"
  ],
--- a/catch/permissions/request/CreateRequest.php
+++ b/catch/permissions/request/CreateRequest.php
@@ -17,7 +17,7 @@ class CreateRequest extends CatchRequest
        ];
    }

-    protected function message()
+    protected function message(): array
    {
        // TODO: Implement message() method.
    }
--- a/catch/permissions/request/ProfileRequest.php
+++ b/catch/permissions/request/ProfileRequest.php
@@ -1,17 +0,0 @@
-<?php
-namespace catchAdmin\permissions\request;
-
-use catchAdmin\permissions\model\Users;
-use catcher\base\CatchRequest;
-
-class ProfileRequest extends CatchRequest
-{
-    protected function rules(): array
-    {
-        // TODO: Implement rules() method.
-        return [
-            'username|用户名' => 'require|max:20',
-            'email|邮箱'    => 'require|email|unique:'.Users::class . ',email,' . $this->user()->id,
-        ];
-    }
-}
--- a/catch/permissions/request/UpdateRequest.php
+++ b/catch/permissions/request/UpdateRequest.php
@@ -15,4 +15,9 @@ class UpdateRequest extends CatchRequest
            'email|邮箱'    => 'require|email|unique:'.Users::class,
        ];
    }
+
+    protected function message(): array
+    {
+        // TODO: Implement message() method.
+    }
 }
--- a/catch/permissions/route.php
+++ b/catch/permissions/route.php
@@ -1,24 +1,26 @@
 <?php
-
-/* @var think\Route $router */
-
 $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->get('jobs/all', '\catchAdmin\permissions\controller\Job@getAll');
    // 岗位
    $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('user/profile', '\catchAdmin\permissions\controller\User@profile');
+    $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');
--- a/catch/permissions/tables/Department.php
+++ b/catch/permissions/tables/Department.php
@@ -1,50 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables;
-
-use catchAdmin\permissions\tables\forms\Factory;
-use catcher\CatchTable;
-use catcher\library\table\Actions;
-use catcher\library\table\HeaderItem;
-use catcher\library\table\Search;
-use catcher\library\table\Table;
-
-class Department extends CatchTable
-{
-    /**
-     * table
-     *
-     * @time 2021年03月29日
-     * @return array
-     */
-    protected function table(): array
-    {
-        // TODO: Implement table() method.
-        return $this->getTable('department')->header([
-            HeaderItem::label('部门名称')->prop('department_name'),
-            HeaderItem::label('排序')->prop('sort')->withEditNumberComponent(),
-            HeaderItem::label('状态')->prop('status')->withSwitchComponent(),
-            HeaderItem::label('创建时间')->prop('created_at'),
-            HeaderItem::label('操作')->width(260)->actions([
-                Actions::update(),
-                Actions::delete(),
-            ])
-        ])->withApiRoute('departments')->withActions([
-            Actions::create()
-        ])->withSearch([
-            Search::label('部门名称')->text('department_name', '请输入部门名称'),
-            Search::label('状态')->status()
-        ])->withDialogWidth('35%')
-            ->toTreeTable()->render();
-    }
-
-    /**
-     * form 方式
-     *
-     * @time 2021年03月29日
-     * @return array
-     */
-    protected function form(): array
-    {
-        return Factory::create('department');
-    }
-}
--- a/catch/permissions/tables/Job.php
+++ b/catch/permissions/tables/Job.php
@@ -1,44 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables;
-
-
-use catcher\CatchTable;
-use catchAdmin\permissions\tables\forms\Factory;
-use catcher\library\table\Actions;
-use catcher\library\table\HeaderItem;
-use catcher\library\table\Search;
-
-class Job extends CatchTable
-{
-    public function table()
-    {
-        return $this->getTable('job')
-                    ->header([
-                        HeaderItem::label('')->type('selection'),
-                        HeaderItem::label('岗位名称')->prop('job_name'),
-                        HeaderItem::label('编码')->prop('coding'),
-                        HeaderItem::label('状态')->prop('status')->withSwitchComponent(),
-                        HeaderItem::label('创建时间')->prop('created_at'),
-                        HeaderItem::label('操作')->width(250)->actions([
-                            Actions::update(),
-                            Actions::delete()
-                        ])
-                    ])
-                    ->withActions([
-                      Actions::create()
-                    ])
-                    ->withSearch([
-                        Search::label('岗位名称')->text('job_name', '岗位名称')
-                    ])
-                    ->withApiRoute('jobs')
-                    ->selectionChange()
-                    ->render();
-    }
-
-
-    public function form()
-    {
-        // TODO: Implement form() method.
-        return Factory::create('job');
-    }
-}
--- a/catch/permissions/tables/Permission.php
+++ b/catch/permissions/tables/Permission.php
@@ -1,50 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables;
-
-
-use catcher\CatchTable;
-use catchAdmin\permissions\tables\forms\Factory;
-use catcher\library\table\Actions;
-use catcher\library\table\HeaderItem;
-use catcher\library\table\Search;
-
-class Permission extends CatchTable
-{
-    public function table()
-    {
-        return $this->getTable('permission')
-            ->header([
-                HeaderItem::label('菜单名称')->prop('permission_name'),
-                HeaderItem::label('路由Path')->prop('route'),
-                HeaderItem::label('权限标识')->prop('actionList')->width(250)->component('actions', 'actionList'),
-                HeaderItem::label('状态')->prop('hidden')->component('status'),
-                HeaderItem::label('创建时间')->prop('created_at'),
-                HeaderItem::label('操作')->width(250)->actions([
-                    Actions::update(),
-                    Actions::delete()
-                ])
-            ])
-            ->withActions([
-                Actions::create()
-            ])
-            ->withSearch([
-                Search::label('菜单名称')->text('permission_name', '菜单名称')->clearable(true),
-                Search::hidden('actionList', 'actionList')
-            ])
-            ->withFilterParams([
-                'permission_name' => '',
-                'actionList'    => 'actionList'
-            ])
-            ->withDefaultQueryParams(['actionList'])
-            ->withApiRoute('permissions')
-            ->toTreeTable()
-            ->render();
-    }
-
-
-    public function form()
-    {
-        // TODO: Implement form() method.
-        return Factory::create('permission');
-    }
-}
--- a/catch/permissions/tables/Role.php
+++ b/catch/permissions/tables/Role.php
@@ -1,43 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables;
-
-
-use catcher\CatchTable;
-use catchAdmin\permissions\tables\forms\Factory;
-use catcher\library\table\Actions;
-use catcher\library\table\HeaderItem;
-use catcher\library\table\Search;
-
-class Role extends CatchTable
-{
-    public function table()
-    {
-        // TODO: Implement table() method.
-        return $this->getTable('role')
-            ->header([
-                HeaderItem::label('角色名称')->prop('role_name')->width(300),
-                HeaderItem::label('角色标识')->prop('identify')->width(300),
-                HeaderItem::label('角色描述')->prop('description'),
-                HeaderItem::label('创建时间')->prop('created_at'),
-                HeaderItem::label('操作')->width(250)->actions([
-                    Actions::update(), Actions::delete()
-                ])
-            ])
-            ->withSearch([
-                Search::label('角色名称')->text('role_name', '角色名称'),
-            ])
-            ->withApiRoute('roles')
-            ->withActions([
-                Actions::create()
-            ])->withDialogWidth('40%')
-            ->toTreeTable()
-            ->forceUpdate()
-            ->render();
-    }
-
-    protected function form()
-    {
-        // TODO: Implement form() method.
-        return Factory::create('role');
-    }
-}
--- a/catch/permissions/tables/User.php
+++ b/catch/permissions/tables/User.php
@@ -1,54 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables;
-
-
-use catcher\CatchTable;
-use catchAdmin\permissions\tables\forms\Factory;
-use catcher\library\table\Actions;
-use catcher\library\table\HeaderItem;
-use catcher\library\table\Search;
-
-class User extends CatchTable
-{
-    public function table()
-    {
-        // TODO: Implement table() method.
-        return $this->getTable('user')
-                    ->header([
-                        HeaderItem::label('')->selection(),
-                        HeaderItem::label('用户名')->prop('username'),
-                        HeaderItem::label('邮箱')->prop('email'),
-                        HeaderItem::label('状态')->prop('status')->component('status', 'status'),
-                        HeaderItem::label('创建时间')->prop('created_at'),
-                        HeaderItem::label('操作')->width(200)->actions([
-                            Actions::update(), Actions::delete()
-                        ])
-                    ])
-                    ->withSearch([
-                        Search::label('用户名')->text('username', '用户名'),
-                        Search::label('邮箱')->text('email', '邮箱'),
-                        Search::label('状态')->status(),
-                        Search::hidden('department_id', '')
-                    ])
-                    ->withApiRoute('users')
-                    ->withActions([
-                        Actions::create(),
-                        Actions::export()
-                    ])
-                    ->withExportRoute('user/export')
-                    ->withFilterParams([
-                        'username' => '',
-                        'email'    => '',
-                        'status'   => '',
-                        'department_id' => ''
-                    ])
-                    ->selectionChange()
-                    ->render();
-    }
-
-    protected function form()
-    {
-        // TODO: Implement form() method.
-        return Factory::create('user');
-    }
-}
--- a/catch/permissions/tables/forms/Department.php
+++ b/catch/permissions/tables/forms/Department.php
@@ -1,32 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catchAdmin\permissions\model\Department as DepartmentModel;
-use catcher\library\form\Form;
-
-class Department extends Form
-{
-    public function fields(): array
-    {
-        return [
-        // TODO: Implement fields() method
-            Form::cascader('parent_id', '上级部门', [0])->options(
-            DepartmentModel::field(['id', 'parent_id', 'department_name'])->select()->toTree()
-            )->clearable(true)->filterable(true)->props([
-                'props' => [
-                    'value' => 'id',
-                    'label' => 'department_name',
-                    'checkStrictly' => true
-                ],
-            ])->style(['width' => '100%']),
-            Form::input('department_name', '部门名称')->required()->placeholder('请输入部门名称'),
-            Form::input('principal', '部门负责人'),
-            Form::input('mobile', '负责人联系方式'),
-            Form::email('email', '邮箱'),
-            Form::radio('status', '状态')->value(1)->options(
-                Form::options()->add('启用', 1)->add('禁用', 2)->render()
-            ),
-            Form::number('sort', '排序')->value(1)->min(1)->max(10000),
-        ];
-    }
-}
--- a/catch/permissions/tables/forms/Factory.php
+++ b/catch/permissions/tables/forms/Factory.php
@@ -1,12 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catcher\library\form\FormFactory;
-
-class Factory extends FormFactory
-{
-    public static function from(): string
-    {
-        return __NAMESPACE__;
-    }
-}
--- a/catch/permissions/tables/forms/Job.php
+++ b/catch/permissions/tables/forms/Job.php
@@ -1,23 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catcher\library\form\Form;
-
-class Job extends Form
-{
-    public function fields(): array
-    {
-        // TODO: Implement fields() method.
-        return [
-            self::input('job_name', '岗位名称')->required(),
-
-            self::input('coding', '岗位编码'),
-
-            self::radio('status', '状态')->value(1)->options(
-                self::options()->add('启用', 1)->add('禁用', 2)->render()
-            ),
-
-            self::number('sort', '排序')->value(1)->min(1)->max(10000),
-        ];
-    }
-}
--- a/catch/permissions/tables/forms/Permission.php
+++ b/catch/permissions/tables/forms/Permission.php
@@ -1,155 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catchAdmin\permissions\model\Permissions;
-use catcher\CatchAdmin;
-use catcher\library\form\Form;
-
-class Permission extends Form
-{
-    public function fields(): array
-    {
-        $this->getModules();
-        // TODO: Implement fields() method.
-        return [
-            self::cascader('parent_id', '父级菜单', [])->options(
-                Permissions::where('type', Permissions::MENU_TYPE)->field(['id', 'permission_name', 'parent_id'])
-                    ->select()->toTree()
-            )->col(12)->props(self::props('permission_name', 'id', [
-                'checkStrictly' => true
-            ]))->filterable(true)->clearable(true)->style(['width' => '100%']),
-
-            self::radio('type', '菜单类型')
-                ->button()
-                ->value(1)
-                ->options(
-                    self::options()->add('菜单', 1)->add('按钮', 2)->render()
-                )->appendControl(
-                   1,
-                       [
-                            self::input('permission_name', '菜单名称')->required()->col(12),
-                            self::input('permission_mark', '权限标识')->required()->col(12),
-
-                            self::select('module', '模块')
-                                ->required()
-                                ->style(['width' => '100%'])
-                                ->allowCreate(true)
-                                ->filterable(true)
-                                ->clearable(true)
-                                ->col(12)
-                                ->options($this->getModules()),
-
-                            self::input('icon', '菜单图标')
-                                ->col(12)
-                                ->style(['width' => '100%'])
-                                ->clearable(true),
-
-                            self::input('route', '菜单Path')->col(12),
-
-                            self::cascader('component', '组件')
-                                ->col(12)
-                                ->options([])
-                                ->style(['width' => '100%'])
-                                ->showAllLevels(false),
-
-                            self::input('redirect', 'Redirect')->col(12),
-                            self::number('sort', '排序')->value(1)->col(12),
-
-                            self::radio('keepalive', 'Keepalive')
-                                ->value(1)
-                                ->col(12)
-                                ->options(
-                                    self::options()->add('启用', 1)
-                                                    ->add('禁用', 2)
-                                                    ->render()
-                                ),
-
-                            self::radio('hidden', 'Hidden')->value(1)->options(
-                                self::options()->add('显示', 1)->add('隐藏', 2)->render()
-                            )->col(12),
-
-                           self::radio('restful', 'Restful 路由')->value(0)->options(
-                               self::options()->add('生成', 1)->add('不生成', 0)->render()
-                           )->col(12)
-                       ]
-                )
-                 ->appendControl( 2,
-                        [
-                             self::select('permission_name', '菜单名称')
-                                 ->allowCreate(true)
-                                 ->filterable(true)
-                                 ->options(
-                                     self::options()->add('列表', '列表')
-                                         ->add('创建', '创建')
-                                     ->add('更新', '更新')->add('读取', '读取')
-                                     ->add('删除', '删除')->add('禁用/启用', '禁用/启用')
-                                     ->add('导出', '导出')->add('导入', '导入')->render()
-                                 )
-                                 ->required()->style(['width' => '100%'])->col(12),
-                             self::select('permission_mark', '权限标识')
-                                 ->allowCreate(true)
-                                 ->filterable(true)
-                                 ->options(
-                                     self::options()->add('index', 'index')
-                                         ->add('save', 'save')
-                                         ->add('update', 'update')->add('read', 'read')
-                                         ->add('delete', 'delete')->add('disable', 'disable')
-                                         ->add('export', 'export')->add('import', 'import')->render()
-                                 )
-                                 ->required()->col(12),
-                             self::number('sort', '排序')->value(1)->col(12),
-                        ]
-                 )->col(12)
-        ];
-    }
-
-
-    /**
-     * 获取模块
-     *
-     * @time 2021年03月31日
-     * @return array
-     */
-    protected function getModules(): array
-    {
-        $modules = [];
-
-        foreach(CatchAdmin::getModulesDirectory() as $d) {
-            $module = CatchAdmin::getModuleInfo($d);
-
-            if (in_array($module['alias'], ['login'])) {
-                continue;
-            }
-
-            if ($module['enable']) {
-                $modules[] = [
-                    'value' => $module['alias'],
-                    'label' => $module['name']
-                ];
-            }
-        }
-
-        return $modules;
-    }
-
-    /**
-     * icons
-     *
-     * @time 2021年03月31日
-     * @return array
-     */
-    protected function getIcons(): array
-    {
-        $icons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round'];
-
-        $options = self::options();
-
-        foreach ($icons as $icon) {
-            $icon = 'el-icon-' . $icon;
-
-            $options->add(htmlspecialchars(sprintf('<i class=\"%s\"></i> %s', $icon, $icon)), $icon);
-        }
-
-        return $options->render();
-    }
-}
--- a/catch/permissions/tables/forms/Role.php
+++ b/catch/permissions/tables/forms/Role.php
@@ -1,66 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catchAdmin\permissions\model\Department as DepartmentModel;
-use catchAdmin\permissions\model\Permissions;
-use catchAdmin\permissions\model\Roles;
-use catcher\library\form\Form;
-
-class Role extends Form
-{
-    public function fields(): array
-    {
-        // TODO: Implement fields() method.
-        return [
-            Form::cascader('parent_id', '上级角色', [])->options(
-                Roles::field(['id', 'parent_id', 'role_name'])->select()->toTree()
-            )->clearable(true)->filterable(true)->props([
-                'props' => [
-                    'value' => 'id',
-                    'label' => 'role_name',
-                    'checkStrictly' => true
-                ],
-            ])->style(['width' => '100%']),
-
-            self::input('role_name', '角色名称')->required()
-                ->clearable(true)->placeholder('请填写角色名称'),
-
-            self::input('identify', '角色标识')
-                ->clearable(true)->required()
-                ->placeholder('请填写角色标识'),
-
-            self::textarea('description', '角色描述')
-                ->clearable(true)->placeholder('请填写角色描述'),
-
-            self::tree('_permissions', '角色权限', [])
-                ->props(self::props('permission_name', 'id', [],
-                    Permissions::field(['id', 'parent_id', 'permission_name'])->select()->toTree()
-                ))
-                ->required(),
-
-            self::select('data_range', '数据权限')
-                ->placeholder('请选择数据权限')
-                ->options(
-                    self::options()->add('全部数据权限', Roles::ALL_DATA)
-                                    ->add('自定义数据权限', Roles::SELF_CHOOSE)
-                                    ->add('仅本人数据权限', Roles::SELF_DATA)
-                                    ->add('本部门数据权限', Roles::DEPARTMENT_DATA)
-                                    ->add('部门以及以下数据权限', Roles::DEPARTMENT_DOWN_DATA)
-                                    ->render()
-                )->style(['width' => '100%'])
-                ->appendControl(Roles::SELF_CHOOSE, [
-                    self::cascader('departments', '自定义权限')
-                            ->options(
-                                DepartmentModel::field(['id', 'parent_id', 'department_name'])->select()->toTree()
-                            )
-                             ->props(self::props('department_name', 'id', [
-                                 'multiple' => true,
-                                 'emitPath' => false
-                             ]))
-                             ->showAllLevels(false)
-                             ->style(['width' => '100%']),
-                ])
-        ];
-    }
-
-}
--- a/catch/permissions/tables/forms/User.php
+++ b/catch/permissions/tables/forms/User.php
@@ -1,42 +0,0 @@
-<?php
-namespace catchAdmin\permissions\tables\forms;
-
-use catchAdmin\permissions\model\Department as DepartmentModel;
-use catchAdmin\permissions\model\Job;
-use catchAdmin\permissions\model\Roles;
-use catcher\library\form\Form;
-
-class User extends Form
-{
-    public function fields(): array
-    {
-        // TODO: Implement fields() method.
-        return [
-            self::input('username', '昵称')->col(self::col(12))->clearable(true)->required(),
-
-            self::cascader('department_id', '部门', [])
-                ->col(self::col(12))
-                ->options(
-                    DepartmentModel::field(['id', 'parent_id', 'department_name'])->select()->toTree()
-                )
-                ->props(self::props('department_name', 'id', [
-                    'checkStrictly' => true
-                ]))->clearable(true),
-
-            self::email('email', '邮箱')->col(self::col(12))->required()->clearable(true),
-
-            self::selectMultiple('jobs', '岗位', [])
-                ->col(self::col(12))->options(
-                    Job::where('status', Job::ENABLE)->field(['id as value', 'job_name as label'])->select()->toArray()
-                )->clearable(true)->filterable(true),
-
-            self::input('password', '密码')->col(self::col(12))
-                ->placeholder('请输入密码')->clearable(true),
-
-            self::tree('roles', '角色', [])
-                ->props(self::props('role_name', 'id', [], Roles::field(['id', 'parent_id', 'role_name'])->select()->toTree()))
-                ->required(),
-        ];
-    }
-
-}
--- a/catch/sms/Sms.php
+++ b/catch/sms/Sms.php
@@ -1,226 +0,0 @@
-<?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\sms;
-
-use catchAdmin\sms\model\SmsConfig;
-use catcher\exceptions\FailedException;
-use Overtrue\EasySms\EasySms;
-use think\helper\Str;
-
-class Sms
-{
-    /**
-     * timeout http 请求时间
-     *
-     * @var int
-     */
-    protected $timeout = 5;
-
-    /**
-     * 错误日志
-     *
-     * @var string
-     */
-    protected $errorLog;
-
-    /**
-     * 网关
-     *
-     * @var array
-     */
-    protected $gateways = [];
-
-    /**
-     * 配置
-     *
-     * @var array
-     */
-    protected $config = [];
-
-    /**
-     * 发送数据
-     *
-     * @var array
-     */
-    protected $sendData = [];
-
-    /**
-     * Sms constructor.
-     * @param $config
-     */
-    public function __construct(array $config)
-    {
-        $config['timeout'] = $this->timeout;
-
-        $config['gateways']['errorlog'] = runtime_path('log') . 'sms.log';
-
-        $this->config = $config;
-    }
-
-    /**
-     * 发送
-     *
-     * @time 2020年09月17日
-     * @param string $phone
-     * @param array $data
-     * @return mixed
-     * @throws \Overtrue\EasySms\Exceptions\NoGatewayAvailableException
-     * @throws \Overtrue\EasySms\Exceptions\InvalidArgumentException
-     */
-    public function send(string $phone, array $data)
-    {
-        try {
-            $this->sendData['data'] = $data;
-
-            return $this->easySms()
-                ->send($phone, $this->sendData);
-        } catch (\Exception $exception) {
-            throw new FailedException($exception->getMessage());
-        }
-    }
-
-
-    /**
-     * easy sms
-     *
-     * @time 2020年09月17日
-     * @return EasySms
-     */
-    public function easySms()
-    {
-        return new EasySms($this->config);
-    }
-
-
-    /**
-     * 内容
-     *
-     * @time 2020年09月17日
-     * @param $content
-     * @param string $key
-     * @return $this
-     */
-    public function content($content, $key = 'content')
-    {
-        $this->sendData[$key] = $content;
-
-        return $this;
-    }
-
-    /**
-     * 模版
-     *
-     * @time 2020年09月17日
-     * @param $template
-     * @param string $key
-     * @return $this
-     */
-    public function template($template, $key = 'template')
-    {
-        $this->sendData[$key] = $template;
-
-        return $this;
-    }
-
-    /**
-     * 超时间时间 s
-     *
-     * @time 2020年09月17日
-     * @param int $timeout
-     * @return $this
-     */
-    public function timeout(int $timeout)
-    {
-        $this->config['timeout'] = $timeout;
-
-        return $this;
-    }
-
-
-    /**
-     * 记录记录地址
-     *
-     * @time 2020年09月17日
-     * @param string $log
-     * @return $this
-     */
-    public function errorLog(string $log)
-    {
-        $this->config['gateways']['errorlog'] = $log;
-
-        return $this;
-    }
-
-    /**
-     * gateways config
-     *
-     * @time 2020年09月17日
-     * @param $gateways
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return array
-     */
-    protected static function getGatewaysConfig($gateways)
-    {
-        $gatewaysConfig = [];
-
-        $smsConfig = new SmsConfig();
-
-        foreach ($gateways as $gate) {
-            $c = $smsConfig->findByName($gate);
-
-            if ($c) {
-                $c->hasConfig()
-                    ->select()
-                    ->each(function ($item) use (&$gatewaysConfig, $gate){
-                         $gatewaysConfig[$gate][$item['key']] = $item['value'];
-                    });
-            }
-
-        }
-
-        return $gatewaysConfig;
-    }
-
-    /**
-     * sms
-     *
-     * @time 2020年09月17日
-     * @param $method
-     * @param $arg
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return Sms
-     */
-    public static function __callStatic($method, $arg)
-    {
-        $gateways = Str::snake($method);
-
-        if (Str::contains($gateways, '_')) {
-            $gateways = explode('_', $gateways);
-        } else {
-            $gateways = [$gateways];
-        }
-
-        $config = [
-            'default' => [
-                'gateways' => $gateways,
-            ],
-
-            'gateways' => static::getGatewaysConfig($gateways)
-        ];
-
-
-        return new self($config);
-    }
-}
--- a/catch/sms/SmsService.php
+++ b/catch/sms/SmsService.php
@@ -1,23 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\sms;
-
-use catcher\ModuleService;
-
-class SmsService extends ModuleService
-{
-    public function loadRouteFrom()
-    {
-        // TODO: Implement loadRouteFrom() method.
-        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
-    }
-}
--- a/catch/sms/controller/Config.php
+++ b/catch/sms/controller/Config.php
@@ -1,89 +0,0 @@
-<?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\sms\controller;
-
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use catchAdmin\sms\model\SmsConfig as SmsConfigModel;
-
-class Config extends CatchController
-{
-    protected $model;
-    
-    public function __construct(SmsConfigModel $model)
-    {
-        $this->model = $model;
-    }
-    
-    /**
-     * 列表
-     *
-     * @time 2020/09/16 17:28
-     *  
-     * @return \think\Response
-     */
-    public function index()
-    {
-        return CatchResponse::paginate($this->model->getList());
-    }
-    
-    /**
-     * 保存
-     *
-     * @time 2020/09/16 17:28
-     * @param Request Request 
-     * @return \think\Response
-     */
-    public function save(Request $request)
-    {
-        return CatchResponse::success($this->model->storeBy($request->param()));
-    }
-    
-    /**
-     * 读取
-     *
-     * @time 2020/09/16 17:28
-     * @param $id 
-     * @return \think\Response
-     */
-    public function read($id)
-    {
-       return CatchResponse::success($this->model->findBy($id));
-    }
-    
-    /**
-     * 更新
-     *
-     * @time 2020/09/16 17:28
-     * @param Request $request 
-     * @return \think\Response
-     */
-    public function update(Request $request, $id)
-    {
-        return CatchResponse::success($this->model->updateBy($id, $request->post()));
-    }
-    
-    /**
-     * 删除
-     *
-     * @time 2020/09/16 17:28
-     * @param $id 
-     * @return \think\Response
-     */
-    public function delete($id)
-    {
-        return CatchResponse::success($this->model->deleteBy($id));
-    }
-    
-    
-}
--- a/catch/sms/controller/Template.php
+++ b/catch/sms/controller/Template.php
@@ -1,86 +0,0 @@
-<?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\sms\controller;
-
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use catchAdmin\sms\model\SmsTemplate as SmsTemplateModel;
-
-class Template extends CatchController
-{
-    protected $model;
-
-    public function __construct(SmsTemplateModel $model)
-    {
-        $this->model = $model;
-    }
-
-    /**
-     * 列表
-     *
-     * @time 2020/09/16 17:28
-     *
-     * @return \think\Response
-     */
-    public function index()
-    {
-        return CatchResponse::success($this->model->getList());
-    }
-
-    /**
-     * 保存
-     *
-     * @time 2020/09/16 17:28
-     * @param Request Request
-     * @return \think\Response
-     */
-    public function save(Request $request)
-    {
-        return CatchResponse::success($this->model->storeBy($request->param()));
-    }
-
-    /**
-     * 读取
-     *
-     * @time 2020/09/16 17:28
-     * @param $id
-     * @return \think\Response
-     */
-    public function read($id)
-    {
-        return CatchResponse::success($this->model->findBy($id));
-    }
-
-    /**
-     * 更新
-     *
-     * @time 2020/09/16 17:28
-     * @param Request $request
-     * @return \think\Response
-     */
-    public function update(Request $request, $id)
-    {
-        return CatchResponse::success($this->model->updateBy($id, $request->post()));
-    }
-
-    /**
-     * 删除
-     *
-     * @time 2020/09/16 17:28
-     * @param $id
-     * @return \think\Response
-     */
-    public function delete($id)
-    {
-        return CatchResponse::success($this->model->deleteBy($id));
-    }
-}
--- a/catch/sms/database/migrations/20200916172849_sms_config.php
+++ b/catch/sms/database/migrations/20200916172849_sms_config.php
@@ -1,43 +0,0 @@
-<?php
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class SmsConfig 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('sms_config', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => 'sms 配置' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('name', 'string', ['limit' => 50,'null' => true,'signed' => false,'comment' => '运营商名称',])
-			->addColumn('pid', 'integer', ['limit' => MysqlAdapter::INT_SMALL,'null' => false,'default' => 0,'signed' => false,'comment' => '父级ID',])
-			->addColumn('key', 'string', ['limit' => 100,'null' => false,'default' => '','signed' => false,'comment' => 'key',])
-			->addColumn('value', 'string', ['limit' => 255,'null' => false,'default' => '','signed' => false,'comment' => 'value',])
-			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '创建人ID',])
-			->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();
-    }
-}
--- a/catch/sms/database/migrations/20200917081331_sms_template.php
+++ b/catch/sms/database/migrations/20200917081331_sms_template.php
@@ -1,43 +0,0 @@
-<?php
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class SmsTemplate 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('sms_template', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '短信模版' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('operator', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => '运营商',])
-            ->addColumn('name', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => '模版名称',])
-			->addColumn('identify', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => false,'comment' => '模版标识',])
-			->addColumn('code', 'string', ['limit' => 100,'null' => false,'default' => '','signed' => false,'comment' => '模版CODE',])
-			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '创建人ID',])
-			->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();
-    }
-}
--- a/catch/sms/database/seeds/SmsMenusSeed.php
+++ b/catch/sms/database/seeds/SmsMenusSeed.php
@@ -1,79 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} 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 SmsMenusSeed 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' => 113,
-    'permission_name' => '短信管理',
-    'parent_id' => 0,
-    'level' => '',
-    'route' => '/sms',
-    'icon' => 'el-icon-s-promotion',
-    'module' => 'sms',
-    'creator_id' => 1,
-    'permission_mark' => 'sms',
-    'component' => 'layout',
-    'redirect' => '',
-    'keepalive' => 1,
-    'type' => 1,
-    'hidden' => 1,
-    'sort' => 1,
-    'created_at' => 1600229598,
-    'updated_at' => 1600229598,
-    'deleted_at' => 0,
-    'children' => 
-    array (
-      0 => 
-      array (
-        'id' => 114,
-        'permission_name' => '短信配置',
-        'parent_id' => 113,
-        'level' => '113',
-        'route' => '/sms/config',
-        'icon' => 'el-icon-copy-document',
-        'module' => 'sms',
-        'creator_id' => 1,
-        'permission_mark' => 'sms',
-        'component' => 'sms',
-        'redirect' => '',
-        'keepalive' => 1,
-        'type' => 1,
-        'hidden' => 1,
-        'sort' => 1,
-        'created_at' => 1600229654,
-        'updated_at' => 1600229778,
-        'deleted_at' => 0,
-      ),
-    ),
-  ),
-);
-    }
-}
--- a/catch/sms/model/SmsConfig.php
+++ b/catch/sms/model/SmsConfig.php
@@ -1,141 +0,0 @@
-<?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\sms\model;
-
-use catcher\base\CatchModel as Model;
-
-class SmsConfig extends Model
-{
-    protected $name = 'sms_config';
-
-    protected $field = [
-        'id', // 
-		'name', // 运营商名称
-		'pid', // 父级ID
-		'key', // key
-		'value', // value
-		'creator_id', // 创建人ID
-		'created_at', // 创建时间
-		'updated_at', // 更新时间
-		'deleted_at', // 软删除
-    ];
-
-    public function hasConfig()
-    {
-        return $this->hasMany(SmsConfig::class, 'pid', 'id');
-    }
-
-    /**
-     * 保存
-     *
-     * @time 2020年09月16日
-     * @param array $data
-     * @return bool|int
-     */
-    public function storeBy(array $data)
-    {
-        $config = $this->findByName($data['name']);
-
-        if ($config) {
-            unset($data['name']);
-            $hasConfig = $config->hasConfig()->select();
-            if (empty($hasConfig)) {
-                return $this->insertConfig($config->id, $data);
-            }
-            $this->deleteBy(array_column($hasConfig->toArray(), 'id'), true);
-            $this->insertConfig($config->id, $data);
-            return true;
-        }
-
-        if (parent::storeBy([
-            'name' => $data['name']
-        ])) {
-            unset($data['name']);
-            $this->insertConfig($this->id, $data);
-            return true;
-        }
-    }
-
-    /**
-     * 新增配置
-     *
-     * @time 2020年09月16日
-     * @param $pid
-     * @param $data
-     * @return int
-     */
-    protected function insertConfig($pid, $data)
-    {
-        $config = [];
-
-        $creatorId = $data['creator_id'];
-        unset($data['creator_id']);
-
-        foreach ($data as $k => $v) {
-            $config[] = [
-                'key' => $k,
-                'value' => $v,
-                'pid' => $pid,
-                'creator_id' => $creatorId,
-                'created_at' => time(),
-                'updated_at' => time(),
-            ];
-        }
-
-        return $this->insertAll($config);
-    }
-
-    /**
-     * 根据 name 查找
-     *
-     * @time 2020年09月16日
-     * @param $name
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return array|\think\Model|null
-     */
-    public function findByName($name)
-    {
-        return $this->where('name', $name)->find();
-    }
-
-    /**
-     * 查找配置
-     *
-     * @time 2020年09月16日
-     * @param $id
-     * @param array|string[] $field
-     * @param false $trash
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @return array|mixed
-     */
-    public function findBy($id, array $field = ['*'], $trash = false)
-    {
-        $config = [];
-
-        if (!$this->findByName($id)) {
-            return [];
-        }
-
-        $this->findByName($id)
-             ->hasConfig()
-             ->select()
-             ->each(function ($item) use (&$config){
-                $config[$item['key']] = $item['value'];
-             });
-
-        return $config;
-    }
-}
--- a/catch/sms/model/SmsTemplate.php
+++ b/catch/sms/model/SmsTemplate.php
@@ -1,37 +0,0 @@
-<?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\sms\model;
-
-use catchAdmin\sms\model\search\SmsTemplateSearch;
-use catcher\base\CatchModel as Model;
-
-class SmsTemplate extends Model
-{
-    use SmsTemplateSearch;
-
-    protected $name = 'sms_template';
-
-    protected $field = [
-        'id', //
-        'operator', // 运营商
-		'name', // 模版名称
-		'identify', // 模版标识
-		'code', // 模版CODE
-		'creator_id', // 创建人ID
-		'created_at', // 创建时间
-		'updated_at', // 更新时间
-		'deleted_at', // 软删除
-    ];
-
-    protected $paginate = false;
-  
-}
--- a/catch/sms/model/search/SmsTemplateSearch.php
+++ b/catch/sms/model/search/SmsTemplateSearch.php
@@ -1,19 +0,0 @@
-<?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\sms\model\search;
-
-trait SmsTemplateSearch
-{
-    public function searchOperatorAttr($query, $value, $data)
-    {
-        return $query->where('operator', $value);
-    }
-}
--- a/catch/sms/module.json
+++ b/catch/sms/module.json
@@ -1,15 +0,0 @@
-{
-  "name": "短信模块",
-  "alias": "sms",
-  "description": "短信，sms，阿里大于",
-  "version": "1.0.0",
-  "keywords": [],
-  "order": 0,
-  "services": [
-    "\\catchAdmin\\sms\\SmsService"
-  ],
-  "aliases": {},
-  "files": [],
-  "requires": [],
-  "enable": false
-}
--- a/catch/sms/route.php
+++ b/catch/sms/route.php
@@ -1,20 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-/* @var think\Route $router */
-
-// you should use `$router`
-$router->group('sms', function () use ($router){
-	// config路由
-	$router->resource('config', '\catchAdmin\sms\controller\Config');
-	// template 路由
-	$router->resource('template', '\catchAdmin\sms\controller\Template');
-})->middleware('auth');
--- a/catch/system/SystemService.php
+++ b/catch/system/SystemService.php
@@ -11,8 +11,6 @@
 namespace catchAdmin\system;

 use catchAdmin\system\events\AttachmentEvent;
-use catcher\command\MigrateRunCommand;
-use catcher\command\SeedRunCommand;
 use catcher\ModuleService;

 class SystemService extends ModuleService
@@ -30,12 +28,4 @@ class SystemService extends ModuleService
            'attachment' => [ AttachmentEvent::class ],
        ];
    }
-
-    protected function registerCommands()
-    {
-        $this->commands([
-            MigrateRunCommand::class,
-            SeedRunCommand::class,
-        ]);
-    }
 }
--- a/catch/system/controller/Attachments.php
+++ b/catch/system/controller/Attachments.php
@@ -4,6 +4,8 @@ namespace catchAdmin\system\controller;
 use catcher\base\CatchController;
 use catcher\CatchResponse;
 use catchAdmin\system\model\Attachments as AttachmentsModel;
+use catcher\Utils;
+use think\facade\Filesystem;

 class Attachments extends CatchController
 {
@@ -33,6 +35,14 @@ class Attachments extends CatchController
     */
    public function delete($id, AttachmentsModel $model)
    {
-        return CatchResponse::success($model->deletes($id));
+        $attachments = $model->whereIn('id', Utils::stringToArrayBy($id))->select();
+
+        if ($model->deleteBy($id)) {
+            foreach ($attachments as $attachment) {
+                Filesystem::delete($attachment->path);
+            }
+        }
+
+        return CatchResponse::success();
    }
 }
--- a/catch/system/controller/DataDictionary.php
+++ b/catch/system/controller/DataDictionary.php
@@ -7,6 +7,7 @@ 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;

@@ -23,7 +24,7 @@ class DataDictionary extends CatchController
        $tables = Db::query('show table status');

        // 重组数据
-        foreach ($tables as &$table) {
+        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';
@@ -40,10 +41,8 @@ class DataDictionary extends CatchController
        if ($engine = $request->get('engine', null)) {
            $tables =  $tables->where('engine', $engine)->values();
        }
-        $page = $request->get('page', 1) ? : 1;
-        $limit = $request->get('limit', 10);

-        return CatchResponse::paginate(Paginator::make(array_slice($tables->toArray(), ($page - 1) * $limit, $limit), $limit, $page, $tables->count(), false, []));
+        return CatchResponse::paginate(Paginator::make($tables->toArray(), $request->get('limit') ?? 10, $request->get('page') ?? 1, $tables->count(), false, []));
    }

  /**
--- a/catch/system/controller/Generate.php
+++ b/catch/system/controller/Generate.php
@@ -3,7 +3,6 @@ namespace catchAdmin\system\controller;

 use catcher\base\CatchController;
 use catcher\CatchResponse;
-use catcher\generate\CreateModule;
 use catcher\generate\Generator;
 use think\Request;

@@ -26,10 +25,4 @@ class Generate extends CatchController
    {
        return CatchResponse::success($generator->preview($request->param()));
    }
-
-
-    public function createModule(Request $request, CreateModule $module)
-    {
-        return CatchResponse::success($module->generate($request->post()));
-    }
 }
--- a/catch/system/controller/LoginLog.php
+++ b/catch/system/controller/LoginLog.php
@@ -4,6 +4,7 @@ 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
@@ -25,12 +26,11 @@ class LoginLog extends CatchController
     * 
     * @time 2020年04月28日
     * @param Log $log
-     * @param $id
     * @throws \Exception
     * @return \think\response\Json
     */
-    public function empty($id, Log $log)
+    public function empty(Log $log)
    {
-        return CatchResponse::success($log->deleteBy($id), '删除成功');
+        return CatchResponse::success($log->where('id', '>', 0)->delete(), '清空成功');
    }
 }
--- a/catch/system/controller/Module.php
+++ b/catch/system/controller/Module.php
@@ -1,91 +0,0 @@
-<?php
-namespace catchAdmin\system\controller;
-
-use catchAdmin\permissions\model\Permissions;
-use catcher\base\CatchController;
-use catcher\CatchResponse;
-use catcher\CatchAdmin;
-use catcher\library\InstallCatchModule;
-use catcher\library\InstallLocalModule;
-use catcher\Utils;
-use think\response\Json;
-
-class Module extends CatchController
-{
-    /**
-     *  模块列表
-     *
-     * @return Json
-     */
-    public function index(): Json
-    {
-        $modules = [];
-
-        foreach(CatchAdmin::getModulesDirectory() as $d) {
-            $modules[] = CatchAdmin::getModuleInfo($d);
-        }
-
-        $hasModules = array_unique(Permissions::whereIn('id', request()->user()->getPermissionsBy())->column('module'));
-
-        $orders = array_column($modules, 'order');
-
-        array_multisort($orders, SORT_DESC, $modules);
-
-        if (!Utils::isSuperAdmin()) {
-            foreach ($modules as $k => $module) {
-                if (!in_array($module['alias'], $hasModules)) {
-                    unset($modules[$k]);
-                }
-            }
-        }
-
-        return CatchResponse::success(array_values($modules));
-    }
-
-    /**
-     * 禁用/启用模块
-     *
-     * @param string $module
-     * @return Json
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\db\exception\DataNotFoundException
-     */
-    public function disOrEnable(string $module): Json
-    {
-        $moduleInfo = CatchAdmin::getModuleInfo(CatchAdmin::directory() . $module);
-
-        $install = new InstallLocalModule($module);
-        if (!$moduleInfo['enable']) {
-            $install->findModuleInPermissions() ? $install->enableModule() : $install->done();
-        } else {
-            $install->disableModule();
-        }
-
-        return CatchResponse::success();
-    }
-
-    /**
-     * 缓存
-     *
-     * @time 2020年09月21日
-     * @return Json
-     */
-    public function cache(): Json
-    {
-        return CatchResponse::success(CatchAdmin::cacheServices());
-    }
-
-    /**
-     * 清理缓存
-     *
-     * @time 2020年09月21日
-     * @return Json
-     */
-    public function clear(): Json
-    {
-        return !file_exists(CatchAdmin::getCacheServicesFile()) ?
-            CatchResponse::fail('模块没有缓存') :
-            CatchResponse::success(unlink(CatchAdmin::getCacheServicesFile()));
-    }
-}
--- a/catch/system/controller/Upload.php
+++ b/catch/system/controller/Upload.php
@@ -15,7 +15,6 @@ use catcher\base\CatchController;
 use catcher\base\CatchRequest;
 use catcher\CatchResponse;
 use catcher\CatchUpload;
-use catcher\exceptions\FailedException;

 class Upload extends CatchController
 {
@@ -38,10 +37,6 @@ class Upload extends CatchController
    {
        $images = $request->file();

-        if (!$images) {
-            throw new FailedException('请选择图片上传');
-        }
-
        return CatchResponse::success($upload->checkImages($images)->multiUpload($images['image']));
    }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JaguarJack	160e506bfe	add:优雅的返回Json数据	2020-08-27 16:19:06 +08:00
JaguarJack	a859e98207	fixed:修复类型异常未捕获	2020-08-27 16:18:09 +08:00