修改安装命令

This commit is contained in:
JaguarJack 2020-05-17 15:49:42 +08:00
parent db2aba9b1a
commit 3f814116de

View File

@ -193,7 +193,7 @@ class InstallProjectCommand extends Command
{ {
foreach (CatchAdmin::getModulesDirectory() as $directory) { foreach (CatchAdmin::getModulesDirectory() as $directory) {
$moduleInfo = CatchAdmin::getModuleInfo($directory); $moduleInfo = CatchAdmin::getModuleInfo($directory);
if (is_dir(CatchAdmin::moduleMigrationsDirectory($moduleInfo['alias']))) { if (!empty($moduleInfo) && is_dir(CatchAdmin::moduleMigrationsDirectory($moduleInfo['alias']))) {
$output = Console::call('catch-migrate:run', [$moduleInfo['alias']]); $output = Console::call('catch-migrate:run', [$moduleInfo['alias']]);
$this->output->info(sprintf('module [%s] migrations %s', $moduleInfo['alias'], $output->fetch())); $this->output->info(sprintf('module [%s] migrations %s', $moduleInfo['alias'], $output->fetch()));
@ -207,7 +207,7 @@ class InstallProjectCommand extends Command
{ {
foreach (CatchAdmin::getModulesDirectory() as $directory) { foreach (CatchAdmin::getModulesDirectory() as $directory) {
$moduleInfo = CatchAdmin::getModuleInfo($directory); $moduleInfo = CatchAdmin::getModuleInfo($directory);
if (is_dir(CatchAdmin::moduleMigrationsDirectory($moduleInfo['alias']))) { if (!empty($moduleInfo) && is_dir(CatchAdmin::moduleMigrationsDirectory($moduleInfo['alias']))) {
$rollbackOut = Console::call('catch-migrate:rollback', [$moduleInfo['alias'], '-f']); $rollbackOut = Console::call('catch-migrate:rollback', [$moduleInfo['alias'], '-f']);
// $this->output->info(sprintf('module [%s] [%s] rollback %s', $moduleInfo['alias'], basename($migration), $rollbackOut->fetch())); // $this->output->info(sprintf('module [%s] [%s] rollback %s', $moduleInfo['alias'], basename($migration), $rollbackOut->fetch()));
} }