From f6783cb13e81e423fe311f377a2175f1bc5f80aa Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 24 Jun 2020 09:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/CatchAdminService.php                        | 4 ++--
 ...eServiceCommand.php => ModuleServiceDiscoverCommand.php} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename extend/catcher/command/install/{InstallModuleServiceCommand.php => ModuleServiceDiscoverCommand.php} (93%)

diff --git a/extend/catcher/CatchAdminService.php b/extend/catcher/CatchAdminService.php
index eed2987..7ab01a5 100644
--- a/extend/catcher/CatchAdminService.php
+++ b/extend/catcher/CatchAdminService.php
@@ -1,7 +1,7 @@
 <?php
 namespace catcher;
 
-use catcher\command\install\InstallModuleServiceCommand;
+use catcher\command\install\ModuleServiceDiscoverCommand;
 use catcher\command\publish\WechatCommand;
 use catcher\command\Tools\BackupCommand;
 use catcher\command\Tools\CacheTrieCommand;
@@ -77,7 +77,7 @@ class CatchAdminService extends Service
             ExcelTaskCommand::class,
             WechatCommand::class,
             CacheTrieCommand::class,
-            InstallModuleServiceCommand::class,
+            ModuleServiceDiscoverCommand::class,
         ]);
     }
     /**
diff --git a/extend/catcher/command/install/InstallModuleServiceCommand.php b/extend/catcher/command/install/ModuleServiceDiscoverCommand.php
similarity index 93%
rename from extend/catcher/command/install/InstallModuleServiceCommand.php
rename to extend/catcher/command/install/ModuleServiceDiscoverCommand.php
index 9c408c0..adcb1ef 100644
--- a/extend/catcher/command/install/InstallModuleServiceCommand.php
+++ b/extend/catcher/command/install/ModuleServiceDiscoverCommand.php
@@ -16,7 +16,7 @@ use think\console\Input;
 use think\console\input\Option;
 use think\console\Output;
 
-class InstallModuleServiceCommand extends Command
+class ModuleServiceDiscoverCommand extends Command
 {
     protected function configure()
     {
@@ -79,13 +79,13 @@ PHP
         if ($module) {
             $moduleInfo = CatchAdmin::getModuleInfo(CatchAdmin::directory() . $module);
             if (isset($moduleInfo['services']) && !empty($moduleInfo['services'])) {
-                return $moduleInfo['services'];
+                return $moduleInfo['enable'] ? $moduleInfo['services'] : [];
             } else {
                 return [];
             }
         }
 
-        return CatchAdmin::getServices();
+        return CatchAdmin::getEnabledService();
     }
 
     /**