From 8b4404df55b41ac6107cb50ab89f4ce8b4ccb14a Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 24 Jun 2020 08:47:46 +0800
Subject: [PATCH] =?UTF-8?q?login=E6=96=B0=E5=A2=9EService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/login/LoginService.php                  | 23 +++++++++++++++++++
 catch/login/module.json                       |  7 ++++--
 catch/login/route.php                         | 11 +++++----
 .../{ => event}/OperateLogEvent.php           |  0
 .../{ => middleware}/AuthTokenMiddleware.php  |  0
 .../PermissionsMiddleware.php                 |  0
 .../RecordOperateMiddleware.php               |  0
 catch/system/SystemService.php                | 10 ++++++++
 extend/catcher/ModuleService.php              | 10 ++++++++
 9 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 catch/login/LoginService.php
 rename catch/permissions/{ => event}/OperateLogEvent.php (100%)
 rename catch/permissions/{ => middleware}/AuthTokenMiddleware.php (100%)
 rename catch/permissions/{ => middleware}/PermissionsMiddleware.php (100%)
 rename catch/permissions/{ => middleware}/RecordOperateMiddleware.php (100%)
 create mode 100644 catch/system/SystemService.php
 create mode 100644 extend/catcher/ModuleService.php

diff --git a/catch/login/LoginService.php b/catch/login/LoginService.php
new file mode 100644
index 0000000..ad3d8b2
--- /dev/null
+++ b/catch/login/LoginService.php
@@ -0,0 +1,23 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+namespace catchAdmin\login;
+
+use catcher\ModuleService;
+use think\Service;
+
+class LoginService extends ModuleService
+{
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+}
\ No newline at end of file
diff --git a/catch/login/module.json b/catch/login/module.json
index 8983c0d..7914452 100644
--- a/catch/login/module.json
+++ b/catch/login/module.json
@@ -4,8 +4,11 @@
   "description": "",
   "keywords": [],
   "order": 1,
-  "services": [],
+  "services": [
+    "\\catchAdmin\\login\\LoginService"
+  ],
   "aliases": {},
   "files": [],
-  "requires": []
+  "requires": [],
+  "enable": true
 }
\ No newline at end of file
diff --git a/catch/login/route.php b/catch/login/route.php
index 70e623b..ff5100a 100644
--- a/catch/login/route.php
+++ b/catch/login/route.php
@@ -1,6 +1,9 @@
 <?php
-# 登入
-$router->post('login', '\catchAdmin\login\controller\Index@login');
-$router->post('logout', '\catchAdmin\login\controller\Index@logout');
-$router->post('refresh/token', '\catchAdmin\login\controller\Index@refreshToken');
+$router->group(function () use ($router){
+    # 登入
+    $router->post('login', '\catchAdmin\login\controller\Index@login');
+    $router->post('logout', '\catchAdmin\login\controller\Index@logout');
+    $router->post('refresh/token', '\catchAdmin\login\controller\Index@refreshToken');
+})->middleware('auth');
+
 
diff --git a/catch/permissions/OperateLogEvent.php b/catch/permissions/event/OperateLogEvent.php
similarity index 100%
rename from catch/permissions/OperateLogEvent.php
rename to catch/permissions/event/OperateLogEvent.php
diff --git a/catch/permissions/AuthTokenMiddleware.php b/catch/permissions/middleware/AuthTokenMiddleware.php
similarity index 100%
rename from catch/permissions/AuthTokenMiddleware.php
rename to catch/permissions/middleware/AuthTokenMiddleware.php
diff --git a/catch/permissions/PermissionsMiddleware.php b/catch/permissions/middleware/PermissionsMiddleware.php
similarity index 100%
rename from catch/permissions/PermissionsMiddleware.php
rename to catch/permissions/middleware/PermissionsMiddleware.php
diff --git a/catch/permissions/RecordOperateMiddleware.php b/catch/permissions/middleware/RecordOperateMiddleware.php
similarity index 100%
rename from catch/permissions/RecordOperateMiddleware.php
rename to catch/permissions/middleware/RecordOperateMiddleware.php
diff --git a/catch/system/SystemService.php b/catch/system/SystemService.php
new file mode 100644
index 0000000..ef90e0a
--- /dev/null
+++ b/catch/system/SystemService.php
@@ -0,0 +1,10 @@
+<?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 ]
+// +----------------------------------------------------------------------
diff --git a/extend/catcher/ModuleService.php b/extend/catcher/ModuleService.php
new file mode 100644
index 0000000..ef90e0a
--- /dev/null
+++ b/extend/catcher/ModuleService.php
@@ -0,0 +1,10 @@
+<?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 ]
+// +----------------------------------------------------------------------