From 80183da185ef291a7c3cb0a488fbbbafabd5b105 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Mon, 15 Apr 2024 16:48:42 +0800 Subject: [PATCH] * Adjust install env check logic. --- module/install/control.php | 2 +- module/install/zen.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index 273d9e58ca..722c61306c 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -383,7 +383,7 @@ class install extends control $this->loadModel('metric')->updateMetricDate(); $skipApp = (string)getenv('ZT_SKIP_DEVOPS_INIT'); - $link = ($this->config->inQuickon && !$skipApp) ? inlink('app') : inlink('step6'); + $link = ($this->config->inQuickon && (!$skipApp || $skipApp == 'false')) ? inlink('app') : inlink('step6'); return $this->send(array('result' => 'success', 'load' => $link)); } diff --git a/module/install/zen.php b/module/install/zen.php index 9042ba0901..5af3f5ca62 100644 --- a/module/install/zen.php +++ b/module/install/zen.php @@ -326,7 +326,7 @@ class installZen extends install \$config->default->lang = getenv('ZT_DEFAULT_LANG'); \$hasSlaveDB = (string)getenv('ENABLE_DB_SLAVE'); -if(\$hasSlaveDB) +if(\$hasSlaveDB && \$hasSlaveDB != 'false') { \$slaveDB = new stdclass(); \$slaveDB->host = getenv('ZT_SLAVE_DB_HOST');