0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复模块服务发现导致的兼容问题

Browse Source
This commit is contained in:
JaguarJack
2020-06-22 12:36:25 +08:00
parent 51d237d0f0
commit d873ba10f9
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
catch/wechat/controller/Message.php Normal file
View File

@@ -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 ]
// +----------------------------------------------------------------------

4
extend/catcher/CatchAdmin.php
View File

@@ -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 [];

15
extend/catcher/command/install/InstallModuleServiceCommand.php
View File

@@ -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();
}
/**