From 8c32893c914cf17d2455ddce9ad01b8701f9fad7 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 24 Jun 2020 09:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9E=B6=E6=9E=84=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90=E6=A8=A1=E5=9D=97=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/PermissionService.php       | 44 +++++++++++++++++++
 catch/permissions/event/OperateLogEvent.php   |  2 +-
 .../middleware/AuthTokenMiddleware.php        |  2 +-
 .../middleware/PermissionsMiddleware.php      |  2 +-
 .../middleware/RecordOperateMiddleware.php    |  2 +-
 catch/permissions/module.json                 |  7 ++-
 catch/permissions/route.php                   | 42 +++++++++---------
 7 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/catch/permissions/PermissionService.php b/catch/permissions/PermissionService.php
index ef90e0a..66b763f 100644
--- a/catch/permissions/PermissionService.php
+++ b/catch/permissions/PermissionService.php
@@ -8,3 +8,47 @@
 // +----------------------------------------------------------------------
 // | Author: JaguarJack [ njphper@gmail.com ]
 // +----------------------------------------------------------------------
+namespace catchAdmin\permissions;
+
+use catchAdmin\permissions\event\OperateLogEvent;
+use catchAdmin\permissions\middleware\AuthTokenMiddleware;
+use catchAdmin\permissions\middleware\PermissionsMiddleware;
+use catchAdmin\permissions\middleware\RecordOperateMiddleware;
+use catcher\ModuleService;
+
+class PermissionService extends ModuleService
+{
+    public function register()
+    {
+        parent::register(); // TODO: Change the autogenerated stub
+
+        $this->registerMiddleWares();
+    }
+
+    public function loadEvents()
+    {
+        return [
+            'operateLog' => [ OperateLogEvent::class ],
+        ];
+    }
+
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+
+
+    protected function registerMiddleWares()
+    {
+        $middleware = $this->app->config->get('middleware');
+
+        $middleware['alias']['auth'] = [
+            AuthTokenMiddleware::class,
+            PermissionsMiddleware::class,
+            RecordOperateMiddleware::class
+        ];
+
+        $this->app->config->set($middleware, 'middleware');
+    }
+}
\ No newline at end of file
diff --git a/catch/permissions/event/OperateLogEvent.php b/catch/permissions/event/OperateLogEvent.php
index 458103c..58cfe52 100644
--- a/catch/permissions/event/OperateLogEvent.php
+++ b/catch/permissions/event/OperateLogEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace catchAdmin\permissions;
+namespace catchAdmin\permissions\event;
 
 use catchAdmin\permissions\model\Permissions;
 use catchAdmin\system\model\OperateLog;
diff --git a/catch/permissions/middleware/AuthTokenMiddleware.php b/catch/permissions/middleware/AuthTokenMiddleware.php
index 8e0bbee..67c9f4a 100644
--- a/catch/permissions/middleware/AuthTokenMiddleware.php
+++ b/catch/permissions/middleware/AuthTokenMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\permissions;
+namespace catchAdmin\permissions\middleware;
 
 use catcher\Code;
 use catcher\exceptions\FailedException;
diff --git a/catch/permissions/middleware/PermissionsMiddleware.php b/catch/permissions/middleware/PermissionsMiddleware.php
index 05f834c..663a8cc 100644
--- a/catch/permissions/middleware/PermissionsMiddleware.php
+++ b/catch/permissions/middleware/PermissionsMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\permissions;
+namespace catchAdmin\permissions\middleware;
 
 use app\Request;
 use catchAdmin\permissions\model\Permissions;
diff --git a/catch/permissions/middleware/RecordOperateMiddleware.php b/catch/permissions/middleware/RecordOperateMiddleware.php
index c7f1175..5fef087 100644
--- a/catch/permissions/middleware/RecordOperateMiddleware.php
+++ b/catch/permissions/middleware/RecordOperateMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\permissions;
+namespace catchAdmin\permissions\middleware;
 
 use app\Request;
 use catchAdmin\permissions\model\Permissions;
diff --git a/catch/permissions/module.json b/catch/permissions/module.json
index 82a671c..f78c9e4 100644
--- a/catch/permissions/module.json
+++ b/catch/permissions/module.json
@@ -4,8 +4,11 @@
   "description": "",
   "keywords": [],
   "order": 2,
-  "services": [],
+  "services": [
+    "\\catchAdmin\\permissions\\PermissionService"
+  ],
   "aliases": {},
   "files": [],
-  "requires": []
+  "requires": [],
+  "enable": true
 }
\ No newline at end of file
diff --git a/catch/permissions/route.php b/catch/permissions/route.php
index 4004198..d8ceab8 100644
--- a/catch/permissions/route.php
+++ b/catch/permissions/route.php
@@ -1,24 +1,26 @@
 <?php
-// 角色
-$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->group(function () use ($router){
+    // 角色
+    $router->resource('roles', '\catchAdmin\permissions\controller\Role');
+    // 角色列表
+    $router->get('/role/get/permissions', '\catchAdmin\permissions\controller\Role@getPermissions');
+    // 权限
+    $router->resource('permissions', '\catchAdmin\permissions\controller\Permission');
+    $router->put('permissions/show/<id>', '\catchAdmin\permissions\controller\Permission@show');
+    $router->get('controller/methods/<id>', '\catchAdmin\permissions\controller\Permission@getMethods');
 
-// 部门
-$router->resource('departments', '\catchAdmin\permissions\controller\Department');
-// 岗位
-$router->resource('jobs', '\catchAdmin\permissions\controller\Job');
+    // 部门
+    $router->resource('departments', '\catchAdmin\permissions\controller\Department');
+    // 岗位
+    $router->resource('jobs', '\catchAdmin\permissions\controller\Job');
 
-$router->get('jobs/all', '\catchAdmin\permissions\controller\Job@getAll');
+    $router->get('jobs/all', '\catchAdmin\permissions\controller\Job@getAll');
 
-// 用户
-$router->resource('users', '\catchAdmin\permissions\controller\User');
-// 切换状态
-$router->put('users/switch/status/<id>', '\catchAdmin\permissions\controller\User@switchStatus');
-$router->put('users/recover/<id>', '\catchAdmin\permissions\controller\User@recover');
-$router->get('users/get/roles', '\catchAdmin\permissions\controller\User@getRoles');
-$router->get('user/info', '\catchAdmin\permissions\controller\User@info');
\ No newline at end of file
+    // 用户
+    $router->resource('users', '\catchAdmin\permissions\controller\User');
+    // 切换状态
+    $router->put('users/switch/status/<id>', '\catchAdmin\permissions\controller\User@switchStatus');
+    $router->put('users/recover/<id>', '\catchAdmin\permissions\controller\User@recover');
+    $router->get('users/get/roles', '\catchAdmin\permissions\controller\User@getRoles');
+    $router->get('user/info', '\catchAdmin\permissions\controller\User@info');
+})->middleware('auth');
\ No newline at end of file