From 423749499a2a67d0a358ee92a26d88a86be31069 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 4 Sep 2024 17:30:00 +0800 Subject: [PATCH] * [task#127411,doing,0.3h] adjust app install params for instance. --- module/instance/model.php | 10 ++++++++++ module/space/control.php | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/module/instance/model.php b/module/instance/model.php index 2d9fa5ef80..16586b2670 100644 --- a/module/instance/model.php +++ b/module/instance/model.php @@ -528,6 +528,16 @@ class instanceModel extends model $settingsMap->ci->enabled = true; } + if($instance->source == 'system') + { + $users = $this->loadModel('user')->getPairs(); + if($users) + { + $settingsMap->auth = new stdclass(); + $settingsMap->auth->username = key($users); + } + } + if(empty($customData->dbType) || $customData->dbType == 'unsharedDB' || empty($customData->dbService)) return $settingsMap; /* Set DB settings. */ diff --git a/module/space/control.php b/module/space/control.php index 97da2ce530..dbe7bae0fb 100644 --- a/module/space/control.php +++ b/module/space/control.php @@ -127,4 +127,9 @@ class space extends control echo json_encode($cloudApp); } + + public function ajaxTest() + { + $this->loadModel('upgrade')->checkAndInstallGitFox(); + } }