From d873ba10f9b739458fb57a2ad23ecf0b3f455abc Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 22 Jun 2020 12:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9D=97=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=91=E7=8E=B0=E5=AF=BC=E8=87=B4=E7=9A=84=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/wechat/controller/Message.php               | 10 ++++++++++
 extend/catcher/CatchAdmin.php                     |  4 ++--
 .../install/InstallModuleServiceCommand.php       | 15 +++++++--------
 3 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 catch/wechat/controller/Message.php

diff --git a/catch/wechat/controller/Message.php b/catch/wechat/controller/Message.php
new file mode 100644
index 0000000..ef90e0a
--- /dev/null
+++ b/catch/wechat/controller/Message.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/CatchAdmin.php b/extend/catcher/CatchAdmin.php
index 28f9191..234016f 100644
--- a/extend/catcher/CatchAdmin.php
+++ b/extend/catcher/CatchAdmin.php
@@ -205,8 +205,8 @@ class CatchAdmin
      */
     public static function getModuleInfo($module)
     {
-        if (file_exists(self::moduleDirectory($module) . DIRECTORY_SEPARATOR . 'module.json')) {
-            return \json_decode(file_get_contents(self::moduleDirectory($module) . DIRECTORY_SEPARATOR . 'module.json'), true);
+        if (file_exists($module . DIRECTORY_SEPARATOR . 'module.json')) {
+            return \json_decode(file_get_contents($module. DIRECTORY_SEPARATOR . 'module.json'), true);
         }
 
         return [];
diff --git a/extend/catcher/command/install/InstallModuleServiceCommand.php b/extend/catcher/command/install/InstallModuleServiceCommand.php
index 2621637..9c408c0 100644
--- a/extend/catcher/command/install/InstallModuleServiceCommand.php
+++ b/extend/catcher/command/install/InstallModuleServiceCommand.php
@@ -75,18 +75,17 @@ PHP
      */
     protected function getServices($module)
     {
-        $services = [];
 
-        foreach ($this->getModules($module) as $module) {
-            $information = CatchAdmin::getModuleInfo($module);
-            if (!empty($information)) {
-                if (isset($information['services']) && !empty($information['services'])) {
-                    $services = array_merge($services, $information['services']);
-                }
+        if ($module) {
+            $moduleInfo = CatchAdmin::getModuleInfo(CatchAdmin::directory() . $module);
+            if (isset($moduleInfo['services']) && !empty($moduleInfo['services'])) {
+                return $moduleInfo['services'];
+            } else {
+                return [];
             }
         }
 
-        return $services;
+        return CatchAdmin::getServices();
     }
 
     /**