diff --git a/app/common/command/admin/Update.php b/app/common/command/admin/Update.php index 197a762..c770fa9 100644 --- a/app/common/command/admin/Update.php +++ b/app/common/command/admin/Update.php @@ -209,12 +209,17 @@ class Update extends Command // 检测now的composer依赖和最新的composer依赖 + $last_composer_json = file_get_contents($last_version_dir . '/composer.json'); + + $output->writeln($last_composer_json); + $output->writeln('请参考以上最新composer文件调整您的依赖'); + // 分析出最新需要的但now没有的 // 为用户整理出要手动调整的composer命令 + $this->cleanWorkpaceDir(); $output->writeln('更新完成'); - // 更新完成 } diff --git a/app/common/command/admin/Version.php b/app/common/command/admin/Version.php index e2eebc6..43475e9 100644 --- a/app/common/command/admin/Version.php +++ b/app/common/command/admin/Version.php @@ -14,12 +14,12 @@ use think\facade\App; class Version extends Command { - public const VERSION = 'v2.0.31-dev'; + public const VERSION = 'v2.0.31'; public const LAYUI_VERSION = '2.8.16'; public const COMMENT = [ - '完成更新的基本流程', + '完善更新流程', ]; protected function configure()