diff --git a/sqle/api/controller/v2/instance.go b/sqle/api/controller/v2/instance.go index 8b075100f..f45cab8f2 100644 --- a/sqle/api/controller/v2/instance.go +++ b/sqle/api/controller/v2/instance.go @@ -31,17 +31,20 @@ type RuleTemplateV2 struct { } type InstanceResV2 struct { - Name string `json:"instance_name"` - DBType string `json:"db_type" example:"mysql"` - Host string `json:"db_host" example:"10.10.10.10"` - Port string `json:"db_port" example:"3306"` - User string `json:"db_user" example:"root"` - Desc string `json:"desc" example:"this is a instance"` - MaintenanceTimes []*v1.MaintenanceTimeResV1 `json:"maintenance_times" from:"maintenance_times"` - RuleTemplate *RuleTemplateV2 `json:"rule_template,omitempty"` - AdditionalParams []*v1.InstanceAdditionalParamResV1 `json:"additional_params"` - SQLQueryConfig *v1.SQLQueryConfigResV1 `json:"sql_query_config"` - Source string `json:"source" example:"SQLE"` + Name string `json:"instance_name"` + DBType string `json:"db_type" example:"mysql"` + Host string `json:"db_host" example:"10.10.10.10"` + Port string `json:"db_port" example:"3306"` + User string `json:"db_user" example:"root"` + Desc string `json:"desc" example:"this is a instance"` + MaintenanceTimes []*v1.MaintenanceTimeResV1 `json:"maintenance_times" from:"maintenance_times"` + RuleTemplate *RuleTemplateV2 `json:"rule_template,omitempty"` + AdditionalParams []*v1.InstanceAdditionalParamResV1 `json:"additional_params"` + SQLQueryConfig *v1.SQLQueryConfigResV1 `json:"sql_query_config"` + Source string `json:"source" example:"SQLE"` + EnvironmentTagName string `json:"environment_tag_name"` + EnvironmentTagUID string `json:"environment_tag_uid"` + EnvironmentTagColor string `json:"environment_tag_color,omitempty"` } type GetInstanceResV2 struct { @@ -99,7 +102,10 @@ func convertInstanceToRes(ctx context.Context, instance *model.Instance) Instanc AuditEnabled: instance.SqlQueryConfig.AuditEnabled, AllowQueryWhenLessThanAuditLevel: instance.SqlQueryConfig.AllowQueryWhenLessThanAuditLevel, }, - Source: instance.Source, + Source: instance.Source, + EnvironmentTagName: instance.EnvironmentTagName, + EnvironmentTagUID: instance.EnvironmentTagUID, + EnvironmentTagColor: instance.EnvironmentTagColor, } if len(instance.RuleTemplates) != 0 { diff --git a/sqle/api/controller/v2/instance_audit_plan.go b/sqle/api/controller/v2/instance_audit_plan.go index 8f07f30ae..1010808de 100644 --- a/sqle/api/controller/v2/instance_audit_plan.go +++ b/sqle/api/controller/v2/instance_audit_plan.go @@ -46,6 +46,7 @@ type InstanceTipResV2 struct { BackupMaxRows uint64 `json:"backup_max_rows"` EnvironmentTagName string `json:"environment_tag_name"` EnvironmentTagUID string `json:"environment_tag_uid"` + EnvironmentTagColor string `json:"environment_tag_color,omitempty"` } // GetInstanceTips get instance tip list @@ -132,6 +133,7 @@ func GetInstanceTips(c echo.Context) error { SupportedBackupStrategy: svc.SupportedBackupStrategy(inst.DbType), EnvironmentTagName: inst.EnvironmentTagName, EnvironmentTagUID: inst.EnvironmentTagUID, + EnvironmentTagColor: inst.EnvironmentTagColor, } instanceTipsResV1 = append(instanceTipsResV1, instanceTipRes) } diff --git a/sqle/dms/instance.go b/sqle/dms/instance.go index e1e3b31cc..94ea978c9 100644 --- a/sqle/dms/instance.go +++ b/sqle/dms/instance.go @@ -128,34 +128,36 @@ func convertInstance(instance *dmsV2.ListDBService) (*model.Instance, error) { AllowQueryWhenLessThanAuditLevel: string(instance.SQLEConfig.SQLQueryConfig.AllowQueryWhenLessThanAuditLevel), } } - var environmentTagName, environmentTagUID string + var environmentTagName, environmentTagUID, environmentTagColor string if instance.EnvironmentTag != nil { environmentTagUID = instance.EnvironmentTag.UID environmentTagName = instance.EnvironmentTag.Name + environmentTagColor = instance.EnvironmentTag.Color } var ruleTemplateName string if instance.SQLEConfig != nil { ruleTemplateName = instance.SQLEConfig.RuleTemplateName } return &model.Instance{ - ID: uint64(instanceId), - Name: instance.Name, - DbType: instance.DBType, - RuleTemplateId: uint64(ruleTemplateId), - RuleTemplateName: ruleTemplateName, - ProjectId: instance.ProjectUID, - MaintenancePeriod: maintenancePeriod, - Host: instance.Host, - Port: instance.Port, - User: instance.User, - Password: decryptPassword, - Desc: instance.Desc, - AdditionalParams: additionalParams, - SqlQueryConfig: sqlQueryConfig, - EnvironmentTagName: environmentTagName, - EnvironmentTagUID: environmentTagUID, - EnableBackup: instance.EnableBackup, - BackupMaxRows: instance.BackupMaxRows, + ID: uint64(instanceId), + Name: instance.Name, + DbType: instance.DBType, + RuleTemplateId: uint64(ruleTemplateId), + RuleTemplateName: ruleTemplateName, + ProjectId: instance.ProjectUID, + MaintenancePeriod: maintenancePeriod, + Host: instance.Host, + Port: instance.Port, + User: instance.User, + Password: decryptPassword, + Desc: instance.Desc, + AdditionalParams: additionalParams, + SqlQueryConfig: sqlQueryConfig, + EnvironmentTagName: environmentTagName, + EnvironmentTagUID: environmentTagUID, + EnvironmentTagColor: environmentTagColor, + EnableBackup: instance.EnableBackup, + BackupMaxRows: instance.BackupMaxRows, }, nil } diff --git a/sqle/docs/docs.go b/sqle/docs/docs.go index 9e990882d..ef79662ab 100644 --- a/sqle/docs/docs.go +++ b/sqle/docs/docs.go @@ -13983,6 +13983,10 @@ var doc = `{ "dashboard.GlobalWorkflowListItem": { "type": "object", "properties": { + "assignee": { + "description": "当前处理人姓名", + "type": "string" + }, "create_user_name": { "type": "string" }, @@ -16345,6 +16349,9 @@ var doc = `{ "db_type": { "type": "string" }, + "default_port": { + "type": "integer" + }, "params": { "type": "array", "items": { @@ -24592,6 +24599,15 @@ var doc = `{ "type": "string", "example": "this is a instance" }, + "environment_tag_color": { + "type": "string" + }, + "environment_tag_name": { + "type": "string" + }, + "environment_tag_uid": { + "type": "string" + }, "instance_name": { "type": "string" }, @@ -24624,6 +24640,9 @@ var doc = `{ "enable_backup": { "type": "boolean" }, + "environment_tag_color": { + "type": "string" + }, "environment_tag_name": { "type": "string" }, diff --git a/sqle/docs/swagger.json b/sqle/docs/swagger.json index bc7dc526a..8b957f9c3 100644 --- a/sqle/docs/swagger.json +++ b/sqle/docs/swagger.json @@ -13967,6 +13967,10 @@ "dashboard.GlobalWorkflowListItem": { "type": "object", "properties": { + "assignee": { + "description": "当前处理人姓名", + "type": "string" + }, "create_user_name": { "type": "string" }, @@ -16329,6 +16333,9 @@ "db_type": { "type": "string" }, + "default_port": { + "type": "integer" + }, "params": { "type": "array", "items": { @@ -24576,6 +24583,15 @@ "type": "string", "example": "this is a instance" }, + "environment_tag_color": { + "type": "string" + }, + "environment_tag_name": { + "type": "string" + }, + "environment_tag_uid": { + "type": "string" + }, "instance_name": { "type": "string" }, @@ -24608,6 +24624,9 @@ "enable_backup": { "type": "boolean" }, + "environment_tag_color": { + "type": "string" + }, "environment_tag_name": { "type": "string" }, diff --git a/sqle/docs/swagger.yaml b/sqle/docs/swagger.yaml index 039a69bb2..7224eedd3 100644 --- a/sqle/docs/swagger.yaml +++ b/sqle/docs/swagger.yaml @@ -184,6 +184,9 @@ definitions: type: object dashboard.GlobalWorkflowListItem: properties: + assignee: + description: 当前处理人姓名 + type: string create_user_name: type: string created_at: @@ -1809,6 +1812,8 @@ definitions: properties: db_type: type: string + default_port: + type: integer params: items: $ref: '#/definitions/v1.InstanceAdditionalParamResV1' @@ -7482,6 +7487,12 @@ definitions: desc: example: this is a instance type: string + environment_tag_color: + type: string + environment_tag_name: + type: string + environment_tag_uid: + type: string instance_name: type: string maintenance_times: @@ -7504,6 +7515,8 @@ definitions: type: integer enable_backup: type: boolean + environment_tag_color: + type: string environment_tag_name: type: string environment_tag_uid: diff --git a/sqle/model/instance.go b/sqle/model/instance.go index 433fad093..923a2c704 100644 --- a/sqle/model/instance.go +++ b/sqle/model/instance.go @@ -36,8 +36,9 @@ type Instance struct { Source string `json:"source" gorm:"not null"` SyncInstanceTaskID uint `json:"sync_instance_task_id"` - EnvironmentTagName string `json:"environment_tag_name"` - EnvironmentTagUID string `json:"environment_tag_uid"` + EnvironmentTagName string `json:"environment_tag_name"` + EnvironmentTagUID string `json:"environment_tag_uid"` + EnvironmentTagColor string `json:"environment_tag_color"` EnableBackup bool `json:"enable_backup"` BackupMaxRows uint64 `json:"backup_max_rows"` diff --git a/vendor/github.com/actiontech/dms/pkg/dms-common/api/dms/v1/db_service.go b/vendor/github.com/actiontech/dms/pkg/dms-common/api/dms/v1/db_service.go index e928b60e0..dcabb72ec 100644 --- a/vendor/github.com/actiontech/dms/pkg/dms-common/api/dms/v1/db_service.go +++ b/vendor/github.com/actiontech/dms/pkg/dms-common/api/dms/v1/db_service.go @@ -170,7 +170,8 @@ type ListDBService struct { type EnvironmentTag struct { UID string `json:"uid,omitempty"` // 环境属性标签最多50个字符 - Name string `json:"name" validate:"max=50"` + Name string `json:"name" validate:"max=50"` + Color string `json:"color,omitempty" validate:"omitempty,max=32"` } type SQLEConfig struct { @@ -206,7 +207,7 @@ type SQLQueryConfig struct { AllowQueryWhenLessThanAuditLevel SQLAllowQueryAuditLevel `json:"allow_query_when_less_than_audit_level" enums:"normal,notice,warn,error" valid:"omitempty,oneof=normal notice warn error " example:"error"` RuleTemplateName string `json:"rule_template_name"` RuleTemplateID string `json:"rule_template_id"` - MaintenanceTimes []*MaintenanceTime `json:"maintenance_times"` // 允许执行非 DQL 的运维时间窗口，与数据源 maintenance_times 结构一致 + MaintenanceTimes []*MaintenanceTime `json:"maintenance_times"` // 允许执行非 DQL 的运维时间窗口，与数据源 maintenance_times 结构一致 } // swagger:model ListDBServiceReply