ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-08 02:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

安装命令增加强制覆盖参数

Browse Source
This commit is contained in:
augushong
2021-12-24 23:13:01 +08:00
parent 6afd1e8d62
commit a093169650
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/common/command/Install.php
View File

@@ -25,6 +25,7 @@ class Install extends Command
$this->setName('install') $this->setName('install')
->addOption('adminname', 'u', Option::VALUE_OPTIONAL, '管理员账号') ->addOption('adminname', 'u', Option::VALUE_OPTIONAL, '管理员账号')
->addOption('password', 'p', Option::VALUE_OPTIONAL, '管理员密码') ->addOption('password', 'p', Option::VALUE_OPTIONAL, '管理员密码')
->addOption('force', 'f', Option::VALUE_OPTIONAL, '强制安装')
->setDescription('安装数据库'); ->setDescription('安装数据库');
$this->installLockPath = App::getRootPath() . '/config/install/lock/install.lock'; $this->installLockPath = App::getRootPath() . '/config/install/lock/install.lock';
@@ -36,15 +37,18 @@ class Install extends Command
{ {
// 指令输出 // 指令输出
$install_lock_path = $this->installLockPath; $force = $input->getOption('force');
if (is_file($install_lock_path)) { if (is_null($force)) {
$errorInfo = '已安装系统，如需重新安装请删除文件：/config/install/lock/install.lock'; $install_lock_path = $this->installLockPath;
$output->writeln($errorInfo);
return false; if (is_file($install_lock_path)) {
$errorInfo = '已安装系统，如需重新安装,可以添加 -f 1 参数或删除文件：/config/install/lock/install.lock';
$output->writeln($errorInfo);
return false;
}
} }
if (!$this->checkConnect()) { if (!$this->checkConnect()) {
$output->writeln('数据库连接失败,请检查数据库配置'); $output->writeln('数据库连接失败,请检查数据库配置');
} }