From 7ca5883d60f44c5704036628af35f60cfdc3a396 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 30 Dec 2022 10:18:13 +0800
Subject: [PATCH] * Fix merge issue.

---
 config/routes.php   |  2 +-
 db/update17.6.1.sql | 14 --------------
 db/update17.7.sql   | 14 --------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/config/routes.php b/config/routes.php
index 9313df92e9..a7c5e18de4 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -166,7 +166,7 @@ $routes['/modules'] = 'modules';
 
 $routes['/reports'] = 'reports';
 
-$routes['/host/heartbeat'] = 'hostHeartbeat';
+$routes['/host/heartbeat']    = 'hostHeartbeat';
 $routes['/host/submitResult'] = 'hostSubmit';
 
 $routes['/ztf/submitResult'] = 'ztfSubmit';
diff --git a/db/update17.6.1.sql b/db/update17.6.1.sql
index 4510c5f7ac..dbc088e020 100644
--- a/db/update17.6.1.sql
+++ b/db/update17.6.1.sql
@@ -1,15 +1 @@
-ALTER TABLE `zt_host` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `admin`;
-ALTER TABLE `zt_host` ADD `secret` varchar(50) NOT NULL DEFAULT '' AFTER `type`;
-ALTER TABLE `zt_host` ADD `token` varchar(50) NOT NULL DEFAULT '' AFTER `secret`;
-ALTER TABLE `zt_host` ADD `expiredDate` datetime NOT NULL AFTER `token`;
-ALTER TABLE `zt_host` ADD `virtualSoftware` varchar(30) NOT NULL DEFAULT '' AFTER `expiredDate`;
-ALTER TABLE `zt_asset` ADD `registerDate`  datetime NOT NULL AFTER `editedDate`;
-ALTER TABLE `zt_vmtemplate` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `hostID`;
-ALTER TABLE `zt_vmtemplate` ADD `imageName` varchar(50) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `createdBy` varchar(30) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `createdDate` datetime NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `editedBy` varchar(30) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `editedDate` datetime NOT NULL;
-ALTER TABLE `zt_vm` ADD `osVersion` varchar(50) NOT NULL DEFAULT '' AFTER `osCategory`;
-
 UPDATE `zt_workflowlabel` SET `label` = '全部' where `label` = '所有' AND `action` = 'browse';
diff --git a/db/update17.7.sql b/db/update17.7.sql
index e539d42cca..c091527cdf 100644
--- a/db/update17.7.sql
+++ b/db/update17.7.sql
@@ -1,17 +1,3 @@
-ALTER TABLE `zt_host` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `admin`;
-ALTER TABLE `zt_host` ADD `secret` varchar(50) NOT NULL DEFAULT '' AFTER `type`;
-ALTER TABLE `zt_host` ADD `token` varchar(50) NOT NULL DEFAULT '' AFTER `secret`;
-ALTER TABLE `zt_host` ADD `expiredDate` datetime NOT NULL AFTER `token`;
-ALTER TABLE `zt_host` ADD `virtualSoftware` varchar(30) NOT NULL DEFAULT '' AFTER `expiredDate`;
-ALTER TABLE `zt_asset` ADD `registerDate`  datetime NOT NULL AFTER `editedDate`;
-ALTER TABLE `zt_vmtemplate` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `hostID`;
-ALTER TABLE `zt_vmtemplate` ADD `imageName` varchar(50) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `createdBy` varchar(30) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `createdDate` datetime NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `editedBy` varchar(30) NOT NULL;
-ALTER TABLE `zt_vmtemplate` ADD `editedDate` datetime NOT NULL;
-ALTER TABLE `zt_vm` ADD `osVersion` varchar(50) NOT NULL DEFAULT '' AFTER `osCategory`;
-ALTER TABLE `zt_vm` ADD `unit` enum('GB','TB') NOT NULL DEFAULT 'GB' AFTER `osDisk`;
 update zt_kanban
 set
   colWidth    = if(colWidth < 200, 200, colWidth),