更新公共库

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

View File

@ -131,9 +131,10 @@ 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 = [];
if ($select) {
foreach (self::getModulesDirectory() as $module) { foreach (self::getModulesDirectory() as $module) {
$moduleInfo = self::getModuleInfo($module); $moduleInfo = self::getModuleInfo($module);
$modules[] = [ $modules[] = [
@ -141,6 +142,12 @@ class CatchAdmin
'title' => $moduleInfo['name'], 'title' => $moduleInfo['name'],
]; ];
} }
} else {
foreach (self::getModulesDirectory() as $module) {
$moduleInfo = self::getModuleInfo($module);
$modules[$moduleInfo['alias']] = $moduleInfo['name'];
}
}
return $modules; return $modules;
} }

View File

@ -18,14 +18,12 @@ 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,
]); ]);
} }
}
/** /**
* 分页 * 分页