From 6c5383f83c4b3eb78f73a459c2e7c34024b0c392 Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Thu, 20 Feb 2020 13:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=8A=E5=A4=84service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/CatchAdminService.php | 39 ++++++++++++----------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/extend/catcher/CatchAdminService.php b/extend/catcher/CatchAdminService.php
index 9d86a0a..23f2700 100644
--- a/extend/catcher/CatchAdminService.php
+++ b/extend/catcher/CatchAdminService.php
@@ -1,13 +1,6 @@
 <?php
-namespace catchAdmin;
+namespace catcher;
 
-use catchAdmin\login\LoginLogListener;
-use catchAdmin\permissions\OperateLogListener;
-use catchAdmin\permissions\PermissionsMiddleware;
-use catchAdmin\system\event\LoginLogEvent;
-use catchAdmin\system\event\OperateLogEvent;
-use catcher\CatchExceptionHandle;
-use catcher\CatchQuery;
 use catcher\command\BackupCommand;
 use catcher\command\CompressPackageCommand;
 use catcher\command\CreateModuleCommand;
@@ -19,8 +12,6 @@ use catcher\command\ModelGeneratorCommand;
 use catcher\command\ModuleCacheCommand;
 use catcher\command\SeedRunCommand;
 use catcher\command\worker\WsWorkerCommand;
-use catcher\event\LoadModuleRoutes;
-use catcher\validates\Sometimes;
 use think\exception\Handle;
 use think\facade\Validate;
 use think\Service;
@@ -110,20 +101,16 @@ class CatchAdminService extends Service
      */
     protected function registerListeners(): void
     {
-        $this->app->event->listenEvents([
-            'loginLog' => [
-                LoginLogListener::class,
-            ],
-            'operateLog' => [
-                OperateLogListener::class,
-            ],
-            'RouteLoaded' => [
-                LoadModuleRoutes::class
-            ],
-        ]);
+        $this->app->event->listenEvents(config('catch.events'));
     }
 
-    protected function registerQuery()
+  /**
+   * register query
+   *
+   * @time 2020年02月20日
+   * @return void
+   */
+    protected function registerQuery(): void
     {
         $connections = $this->app->config->get('database.connections');
 
@@ -134,7 +121,13 @@ class CatchAdminService extends Service
         ], 'database');
     }
 
-    protected function registerExceptionHandle()
+  /**
+   * register exception
+   *
+   * @time 2020年02月20日
+   * @return void
+   */
+    protected function registerExceptionHandle(): void
     {
         $this->app->bind(Handle::class, CatchExceptionHandle::class);
     }