修改忽略文件

.gitignore

@@ -1,5 +1,6 @@
 /.idea
 /.vscode
 /vendor
+/database
 *.log
 .env

catchAdmin/permissions/controller/Permissions.php

@@ -0,0 +1 @@
+<?php

catchAdmin/permissions/controller/Roles.php

@@ -0,0 +1 @@
+<?php

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

@@ -0,0 +1,40 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Roles 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('roles',['engine'=>'Innodb', 'comment' => '角色表', 'signed' => false]);
+        $table->addColumn('name', 'string',['limit'  =>  15,'default'=>'','comment'=>'角色名'])
+            ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
+            ->addColumn('description', 'string',['default'=> '','comment'=>'角色备注'])
+            ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
+            ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
+            ->addColumn('deleted_at', 'integer', array('null'=>true,'comment'=>'删除状态，0未删除 >0 已删除', 'signed' => false))
+            ->create();
+    }
+}

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

@@ -0,0 +1,44 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class Permissions 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('roles',['engine'=>'Innodb', 'comment' => '菜单表', 'signed' => false]);
+        $table->addColumn('name', 'string',['limit'  =>  15,'default'=>'','comment'=>'菜单名称'])
+            ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
+            ->addColumn('route', 'string', ['default' => '', 'comment' => '路由', 'limit' => 50])
+            ->addColumn('permission_mark', 'string', ['null' => false, 'comment' => '权限标识', 'limit' => 50])
+            ->addColumn('type', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 菜单 2 按钮'])
+            ->addColumn('sort', 'integer',['default'=> 0,'comment'=>'排序字段'])
+            ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
+            ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
+            ->addColumn('deleted_at', 'integer', array('null'=>true,'comment'=>'删除状态，null 未删除 timestamp 已删除', 'signed' => false))
+            ->create();
+
+    }
+}

catchAdmin/permissions/database/migrations/20191208131107_user_has_roles.php

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

catchAdmin/permissions/database/migrations/20191208131115_role_has_permissions.php

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

catchAdmin/permissions/model/HasRolesTrait.php

@@ -0,0 +1,50 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+trait UserTrait
+{
+    /**
+     *
+     * @time 2019年12月08日
+     * @return mixed
+     */
+    public function roles()
+    {
+        return $this->belongsToMany(Roles::class, 'user_has_roles', 'user_id', 'role_id');
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param $uid
+     * @return mixed
+     */
+    public function getRoles($uid)
+    {
+        return $this->findBy($uid)->roles()->get();
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param $uid
+     * @param array $roles
+     * @return mixed
+     */
+    public function attach($uid, array $roles)
+    {
+        return $this->findBy($uid)->roles()->attach($roles);
+    }
+
+    /**
+     *
+     * @time 2019年12月08日
+     * @param $uid
+     * @param array $roles
+     * @return mixed
+     */
+    public function detach($uid, array $roles)
+    {
+        return $this->findBy($uid)->roles()->detach($roles);
+    }
+}

catchAdmin/permissions/view/roles/create.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

catchAdmin/permissions/view/roles/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>

extend/catcher/Form.php

@@ -1,7 +0,0 @@
-<?php
-namespace catcher;
-
-class Form
-{
-
-}