diff --git a/app/Request.php b/app/Request.php index 097ac2d..64c6133 100644 --- a/app/Request.php +++ b/app/Request.php @@ -3,12 +3,18 @@ namespace app; // 应用请求对象类 -use catchAdmin\user\Auth; +use catcher\CatchAuth; class Request extends \think\Request { + protected $auth; + public function user() { - return Auth::user(); + if (!$this->auth) { + $this->auth = new CatchAuth; + } + + return $this->auth->user(); } } diff --git a/catch/permissions/database/migrations/20200108143438_department.php b/catch/permissions/database/migrations/20200108143438_department.php new file mode 100644 index 0000000..98d4876 --- /dev/null +++ b/catch/permissions/database/migrations/20200108143438_department.php @@ -0,0 +1,45 @@ +table('department',['engine'=>'Innodb', 'comment' => '部门表', 'signed' => false]); + $table->addColumn('department_name', 'string',['limit' => 15,'default'=>'','comment'=>'部门名称']) + ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false]) + ->addColumn('principal', 'string', ['default' => '', 'comment' => '负责人', 'limit' => 20]) + ->addColumn('mobile', 'string', ['default' => '', 'comment' => '联系电话', 'limit' => 20]) + ->addColumn('email', 'string', ['default' => '', 'comment' => '联系又想', 'limit' => 100]) + ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID']) + ->addColumn('status', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 正常 2 停用']) + ->addColumn('sort', 'integer',['default'=> 0,'comment'=>'排序字段']) + ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false )) + ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false)) + ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态,null 未删除 timestamp 已删除', 'signed' => false)) + ->create(); + } +} diff --git a/catch/permissions/database/migrations/20200108143506_job.php b/catch/permissions/database/migrations/20200108143506_job.php new file mode 100644 index 0000000..6ef7819 --- /dev/null +++ b/catch/permissions/database/migrations/20200108143506_job.php @@ -0,0 +1,43 @@ +table('job',['engine'=>'Innodb', 'comment' => '岗位表', 'signed' => false]); + $table->addColumn('job_name', 'string',['limit' => 15,'default'=>'','comment'=>'岗位名称']) + ->addColumn('coding', 'string', ['default' => '', 'comment' => '编码', 'limit' => 50]) + ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID']) + ->addColumn('status', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 正常 2 停用']) + ->addColumn('sort', 'integer',['default'=> 0,'comment'=>'排序字段']) + ->addColumn('description', 'string', ['default' => '', 'comment' => '描述', 'limit' => 255]) + ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false )) + ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false)) + ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态,null 未删除 timestamp 已删除', 'signed' => false)) + ->create(); + } +}