From 98b44c50bc4a230d4663a705d709bc9e89e7eb81 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 18 Oct 2023 16:29:14 +0800
Subject: [PATCH] * Adjust nexus type for database.

---
 module/instance/config.php  | 2 +-
 module/instance/control.php | 1 +
 module/instance/model.php   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/instance/config.php b/module/instance/config.php
index 3c893d7600..7c1981f13d 100644
--- a/module/instance/config.php
+++ b/module/instance/config.php
@@ -59,4 +59,4 @@ $config->instance->actions->view = array();
 $config->instance->actions->view['mainActions']   = array('visit', 'ajaxStart', 'ajaxStop', 'upgrade');
 $config->instance->actions->view['suffixActions'] = array('ajaxUninstall');
 
-$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3');
+$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3', 'nexus');
diff --git a/module/instance/control.php b/module/instance/control.php
index 27858a96e0..a22d6936b8 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -594,6 +594,7 @@ class instance extends control
                 $sharedDB = zget($pgList, $customData->dbService);
             }
             $instance = $this->instance->install($cloudApp, $sharedDB, $customData);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if(!$instance) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->notices['installFail']));
 
             unset($_GET['onlybody']);
diff --git a/module/instance/model.php b/module/instance/model.php
index 61de2a5cc4..463e34c607 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -996,6 +996,7 @@ class InstanceModel extends model
         if($result->code != 200)
         {
             $this->dao->delete()->from(TABLE_INSTANCE)->where('id')->eq($instance->id)->exec();
+            dao::$errors['server'][] = $result->message;
             return false;
         }
 
@@ -2135,7 +2136,7 @@ class InstanceModel extends model
 
         $pipeline = new stdclass();
         $instance->type        = $instance->chart;
-        $pipeline->type        = $instance->type;
+        $pipeline->type        = $instance->type == 'nexus3' ? 'nexus' : $instance->type;
         $pipeline->private     = md5(strval(rand(10,113450)));
         $pipeline->createdBy   = 'system';
         $pipeline->createdDate = helper::now();