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

更新公共库

Browse Source
This commit is contained in:
wuyanwen 2019-12-12 22:34:27 +08:00
parent 86a198d66a
commit 6f7e0d71c2
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extend/catcher/CatchAdmin.php
View File

@ -131,15 +131,22 @@ class CatchAdmin
* @time 2019年12月12日 * @time 2019年12月12日
* @return array * @return array
*/ */
public static function getModulesInfo(): array public static function getModulesInfo($select = true): array
{ {
$modules = []; $modules = [];
foreach (self::getModulesDirectory() as $module) { if ($select) {
$moduleInfo = self::getModuleInfo($module); foreach (self::getModulesDirectory() as $module) {
$modules[] = [ $moduleInfo = self::getModuleInfo($module);
'value' => $moduleInfo['alias'], $modules[] = [
'title' => $moduleInfo['name'], 'value' => $moduleInfo['alias'],
]; 'title' => $moduleInfo['name'],
];
}
} else {
foreach (self::getModulesDirectory() as $module) {
$moduleInfo = self::getModuleInfo($module);
$modules[$moduleInfo['alias']] = $moduleInfo['name'];
}
} }
return $modules; return $modules;

12
extend/catcher/CatchResponse.php
View File

@ -18,13 +18,11 @@ class CatchResponse
*/ */
public static function success($data = [], $msg = 'success', $code = 10000): \think\response\Json public static function success($data = [], $msg = 'success', $code = 10000): \think\response\Json
{ {
if (request()->isAjax()) { return json([
return json([ 'code' => $code,
'code' => $code, 'msg' => $msg,
'msg' => $msg, 'data' => $data,
'data' => $data, ]);
]);
}
} }
/** /**