fix: correct match_type default value and reset it for IP/PORT type custom_services

Author: ZhengYa-0110

server/controller/db/metadb/migrator/schema/const.go

@@ -20,5 +20,5 @@ const (
 	RAW_SQL_ROOT_DIR = "/etc/metadb/schema/rawsql"
 
 	DB_VERSION_TABLE    = "db_version"
-	DB_VERSION_EXPECTED = "6.6.1.69"
+	DB_VERSION_EXPECTED = "6.6.1.70"
 )

server/controller/db/metadb/migrator/schema/rawsql/mysql/ddl_create_table.sql

@@ -1277,7 +1277,7 @@ CREATE TABLE IF NOT EXISTS custom_service (
     id                  INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
     name                VARCHAR(128) NOT NULL,
     type                INTEGER DEFAULT 0 COMMENT '0: unknown 1: IP 2: PORT 3: chost 4: pod_service 5: pod_group 6:pod 7: host',
-    match_type          INTEGER DEFAULT 1 COMMENT '0: unkonwn 1: name match 2: uid match',
+    match_type          INTEGER DEFAULT 0 COMMENT '0: none 1: name match 2: uid match',
     epc_ids             TEXT COMMENT 'separated by ,',
     pod_cluster_ids     TEXT COMMENT 'separated by ,',
     pod_namespace_ids   TEXT COMMENT 'separated by ,',

server/controller/db/metadb/migrator/schema/rawsql/mysql/issu/6.6.1.70.sql

@@ -0,0 +1,8 @@
+
+-- Fix match_type default value and reset it for IP/PORT type custom_services
+ALTER TABLE custom_service MODIFY COLUMN match_type INTEGER DEFAULT 0 COMMENT '0: none 1: name match 2: uid match';
+
+UPDATE custom_service SET match_type = 0 WHERE type IN (1, 2);
+
+-- Update DB version
+UPDATE db_version SET version='6.6.1.70';

server/controller/db/metadb/model/platform_rsc_model.go

@@ -1090,7 +1090,7 @@ type CustomService struct {
 	OperatedTime     `gorm:"embedded" mapstructure:",squash"`
 	Name             string          `gorm:"column:name;type:varchar(128);default:''" json:"NAME" mapstructure:"NAME"`
 	Type             int             `gorm:"column:type;type:int;default:0" json:"TYPE" mapstructure:"TYPE"`
-	MatchType        int             `gorm:"column:match_type;type:int;default:1" json:"MATCH_TYPE" mapstructure:"MATCH_TYPE"`
+	MatchType        int             `gorm:"column:match_type;type:int;default:0" json:"MATCH_TYPE" mapstructure:"MATCH_TYPE"`
 	VPCIDs           AutoSplitedInts `gorm:"column:epc_ids;type:text;default:''" json:"EPC_IDS" mapstructure:"EPC_IDS"`
 	PodClusterIDs    AutoSplitedInts `gorm:"column:pod_cluster_ids;type:text;default:''" json:"POD_CLUSTER_IDS" mapstructure:"POD_CLUSTER_IDS"`
 	PodNamespaceIDs  AutoSplitedInts `gorm:"column:pod_namespace_ids;type:text;default:''" json:"POD_NAMESPACE_IDS" mapstructure:"POD_NAMESPACE_IDS"`