From e0750adade82930c98234d2e1c2bff02798afe61 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Sun, 19 Nov 2023 21:43:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=81=B0=E5=BA=A6=E5=8F=91=E5=B8=83=E7=9A=84=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E9=A2=98=E5=91=BD=E5=90=8D=20(#93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/v1/config_manage/config_file.proto | 3 +- api/v1/model/model.proto | 24 +- api/v1/service_manage/contract.proto | 4 +- .../go/api/v1/config_manage/config_file.pb.go | 213 +++++++++--------- source/go/api/v1/model/model.pb.go | 187 ++++++--------- .../go/api/v1/service_manage/contract.pb.go | 88 ++++---- 6 files changed, 232 insertions(+), 287 deletions(-) diff --git a/api/v1/config_manage/config_file.proto b/api/v1/config_manage/config_file.proto index deaa42e..de50ad8 100644 --- a/api/v1/config_manage/config_file.proto +++ b/api/v1/config_manage/config_file.proto @@ -85,7 +85,8 @@ message ConfigFileRelease { google.protobuf.StringValue format = 16; google.protobuf.StringValue release_description = 17; google.protobuf.UInt32Value type = 18; - MatchTerm gray_rule = 19; + // 配置灰度发布时需要匹配的客户端标签信息 + repeated ClientLabel beta_labels = 19; } message ConfigFileReleaseHistory { diff --git a/api/v1/model/model.proto b/api/v1/model/model.proto index 922c8b9..6677db2 100644 --- a/api/v1/model/model.proto +++ b/api/v1/model/model.proto @@ -39,31 +39,23 @@ message MatchString { MatchStringType type = 1; google.protobuf.StringValue value = 2; - ValueType value_type = 3 [json_name = "value_type"]; + ValueType value_type = 3 [ json_name = "value_type" ]; } - -message StringList { - repeated string values = 1; -} +message StringList { repeated string values = 1; } // 汇总查询数据 message Summary { // 服务总数 - uint32 total_service_count = 1 [json_name = "total_service_count"]; + uint32 total_service_count = 1 [ json_name = "total_service_count" ]; // 健康实例总数 - uint32 total_health_instance_count = 2 [json_name = "total_health_instance_count"]; + uint32 total_health_instance_count = 2 + [ json_name = "total_health_instance_count" ]; // 实例总数 - uint32 total_instance_count = 3 [json_name = "total_instance_count"]; + uint32 total_instance_count = 3 [ json_name = "total_instance_count" ]; } -// 匹配规则 -message MatchTerm { - google.protobuf.StringValue key = 1; +message ClientLabel { + string key = 1; MatchString value = 2; } - -message Tag { - google.protobuf.StringValue key = 1; - google.protobuf.StringValue value = 2; -} diff --git a/api/v1/service_manage/contract.proto b/api/v1/service_manage/contract.proto index 9ff8742..d50e04e 100644 --- a/api/v1/service_manage/contract.proto +++ b/api/v1/service_manage/contract.proto @@ -29,6 +29,8 @@ message ServiceContract { string ctime = 10; // 更新时间 string mtime = 11; + // 接口状态，Offline/Online + string status = 12; } message InterfaceDescriptor { @@ -54,6 +56,4 @@ message InterfaceDescriptor { string ctime = 7; // 更新时间 string mtime = 8; - // 接口状态，Offline/Online - string status = 9; } diff --git a/source/go/api/v1/config_manage/config_file.pb.go b/source/go/api/v1/config_manage/config_file.pb.go index cc613d4..81f25af 100644 --- a/source/go/api/v1/config_manage/config_file.pb.go +++ b/source/go/api/v1/config_manage/config_file.pb.go @@ -48,7 +48,7 @@ func (m *ConfigFileGroup) Reset() { *m = ConfigFileGroup{} } func (m *ConfigFileGroup) String() string { return proto.CompactTextString(m) } func (*ConfigFileGroup) ProtoMessage() {} func (*ConfigFileGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{0} + return fileDescriptor_config_file_9388dc925a618a09, []int{0} } func (m *ConfigFileGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileGroup.Unmarshal(m, b) @@ -223,7 +223,7 @@ func (m *ConfigFile) Reset() { *m = ConfigFile{} } func (m *ConfigFile) String() string { return proto.CompactTextString(m) } func (*ConfigFile) ProtoMessage() {} func (*ConfigFile) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{1} + return fileDescriptor_config_file_9388dc925a618a09, []int{1} } func (m *ConfigFile) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFile.Unmarshal(m, b) @@ -374,7 +374,7 @@ func (m *ConfigFileTag) Reset() { *m = ConfigFileTag{} } func (m *ConfigFileTag) String() string { return proto.CompactTextString(m) } func (*ConfigFileTag) ProtoMessage() {} func (*ConfigFileTag) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{2} + return fileDescriptor_config_file_9388dc925a618a09, []int{2} } func (m *ConfigFileTag) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileTag.Unmarshal(m, b) @@ -424,21 +424,22 @@ type ConfigFileRelease struct { ModifyBy *wrapperspb.StringValue `protobuf:"bytes,13,opt,name=modify_by,json=modifyBy,proto3" json:"modify_by,omitempty"` Tags []*ConfigFileTag `protobuf:"bytes,14,rep,name=tags,proto3" json:"tags,omitempty"` // 当前生效配置 - Active *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=active,proto3" json:"active,omitempty"` - Format *wrapperspb.StringValue `protobuf:"bytes,16,opt,name=format,proto3" json:"format,omitempty"` - ReleaseDescription *wrapperspb.StringValue `protobuf:"bytes,17,opt,name=release_description,json=releaseDescription,proto3" json:"release_description,omitempty"` - Type *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=type,proto3" json:"type,omitempty"` - GrayRule *model.MatchTerm `protobuf:"bytes,19,opt,name=gray_rule,json=grayRule,proto3" json:"gray_rule,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Active *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=active,proto3" json:"active,omitempty"` + Format *wrapperspb.StringValue `protobuf:"bytes,16,opt,name=format,proto3" json:"format,omitempty"` + ReleaseDescription *wrapperspb.StringValue `protobuf:"bytes,17,opt,name=release_description,json=releaseDescription,proto3" json:"release_description,omitempty"` + Type *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=type,proto3" json:"type,omitempty"` + // 配置灰度发布时需要匹配的客户端标签信息 + BetaLabels []*model.ClientLabel `protobuf:"bytes,19,rep,name=beta_labels,json=betaLabels,proto3" json:"beta_labels,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ConfigFileRelease) Reset() { *m = ConfigFileRelease{} } func (m *ConfigFileRelease) String() string { return proto.CompactTextString(m) } func (*ConfigFileRelease) ProtoMessage() {} func (*ConfigFileRelease) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{3} + return fileDescriptor_config_file_9388dc925a618a09, []int{3} } func (m *ConfigFileRelease) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileRelease.Unmarshal(m, b) @@ -584,9 +585,9 @@ func (m *ConfigFileRelease) GetType() *wrapperspb.UInt32Value { return nil } -func (m *ConfigFileRelease) GetGrayRule() *model.MatchTerm { +func (m *ConfigFileRelease) GetBetaLabels() []*model.ClientLabel { if m != nil { - return m.GrayRule + return m.BetaLabels } return nil } @@ -620,7 +621,7 @@ func (m *ConfigFileReleaseHistory) Reset() { *m = ConfigFileReleaseHisto func (m *ConfigFileReleaseHistory) String() string { return proto.CompactTextString(m) } func (*ConfigFileReleaseHistory) ProtoMessage() {} func (*ConfigFileReleaseHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{4} + return fileDescriptor_config_file_9388dc925a618a09, []int{4} } func (m *ConfigFileReleaseHistory) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileReleaseHistory.Unmarshal(m, b) @@ -785,7 +786,7 @@ func (m *ConfigFileTemplate) Reset() { *m = ConfigFileTemplate{} } func (m *ConfigFileTemplate) String() string { return proto.CompactTextString(m) } func (*ConfigFileTemplate) ProtoMessage() {} func (*ConfigFileTemplate) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{5} + return fileDescriptor_config_file_9388dc925a618a09, []int{5} } func (m *ConfigFileTemplate) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileTemplate.Unmarshal(m, b) @@ -893,7 +894,7 @@ func (m *ClientConfigFileInfo) Reset() { *m = ClientConfigFileInfo{} } func (m *ClientConfigFileInfo) String() string { return proto.CompactTextString(m) } func (*ClientConfigFileInfo) ProtoMessage() {} func (*ClientConfigFileInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{6} + return fileDescriptor_config_file_9388dc925a618a09, []int{6} } func (m *ClientConfigFileInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClientConfigFileInfo.Unmarshal(m, b) @@ -1003,7 +1004,7 @@ func (m *ClientWatchConfigFileRequest) Reset() { *m = ClientWatchConfigF func (m *ClientWatchConfigFileRequest) String() string { return proto.CompactTextString(m) } func (*ClientWatchConfigFileRequest) ProtoMessage() {} func (*ClientWatchConfigFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{7} + return fileDescriptor_config_file_9388dc925a618a09, []int{7} } func (m *ClientWatchConfigFileRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClientWatchConfigFileRequest.Unmarshal(m, b) @@ -1057,7 +1058,7 @@ func (m *ConfigFileExportRequest) Reset() { *m = ConfigFileExportRequest func (m *ConfigFileExportRequest) String() string { return proto.CompactTextString(m) } func (*ConfigFileExportRequest) ProtoMessage() {} func (*ConfigFileExportRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{8} + return fileDescriptor_config_file_9388dc925a618a09, []int{8} } func (m *ConfigFileExportRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileExportRequest.Unmarshal(m, b) @@ -1119,7 +1120,7 @@ func (m *ConfigFilePublishInfo) Reset() { *m = ConfigFilePublishInfo{} } func (m *ConfigFilePublishInfo) String() string { return proto.CompactTextString(m) } func (*ConfigFilePublishInfo) ProtoMessage() {} func (*ConfigFilePublishInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{9} + return fileDescriptor_config_file_9388dc925a618a09, []int{9} } func (m *ConfigFilePublishInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFilePublishInfo.Unmarshal(m, b) @@ -1228,7 +1229,7 @@ func (m *ConfigFileGroupRequest) Reset() { *m = ConfigFileGroupRequest{} func (m *ConfigFileGroupRequest) String() string { return proto.CompactTextString(m) } func (*ConfigFileGroupRequest) ProtoMessage() {} func (*ConfigFileGroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_config_file_60a1466ad2757f9a, []int{10} + return fileDescriptor_config_file_9388dc925a618a09, []int{10} } func (m *ConfigFileGroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConfigFileGroupRequest.Unmarshal(m, b) @@ -1277,92 +1278,92 @@ func init() { proto.RegisterType((*ConfigFileGroupRequest)(nil), "v1.ConfigFileGroupRequest") } -func init() { proto.RegisterFile("config_file.proto", fileDescriptor_config_file_60a1466ad2757f9a) } +func init() { proto.RegisterFile("config_file.proto", fileDescriptor_config_file_9388dc925a618a09) } -var fileDescriptor_config_file_60a1466ad2757f9a = []byte{ +var fileDescriptor_config_file_9388dc925a618a09 = []byte{ // 1331 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x99, 0xdd, 0x8e, 0xdc, 0x34, - 0x14, 0xc7, 0x35, 0xdf, 0x99, 0x33, 0xdd, 0x2f, 0x6f, 0x81, 0x68, 0x55, 0xa1, 0x32, 0x12, 0x12, - 0x42, 0x28, 0x43, 0xb7, 0xcb, 0x6a, 0xdb, 0x52, 0x15, 0x76, 0x69, 0x69, 0x85, 0x5a, 0x55, 0x43, - 0x01, 0x89, 0x9b, 0x91, 0x27, 0xe3, 0x99, 0xb5, 0x48, 0xe2, 0x60, 0x3b, 0x53, 0x72, 0xcd, 0x7d, - 0x6f, 0xb8, 0xe3, 0x09, 0x78, 0x0b, 0x5e, 0x80, 0x5b, 0x9e, 0x84, 0x6b, 0x24, 0x64, 0xc7, 0x69, - 0x66, 0x76, 0xb7, 0x5d, 0x27, 0x11, 0x12, 0x02, 0xae, 0x76, 0x93, 0xfc, 0xcf, 0x39, 0x89, 0x7d, - 0xce, 0xcf, 0xc7, 0x1e, 0xd8, 0xf1, 0x59, 0x34, 0xa7, 0x8b, 0xc9, 0x9c, 0x06, 0xc4, 0x8b, 0x39, - 0x93, 0x0c, 0x35, 0x97, 0x37, 0xf6, 0xde, 0x5e, 0x30, 0xb6, 0x08, 0xc8, 0x48, 0xdf, 0x99, 0x26, - 0xf3, 0xd1, 0x73, 0x8e, 0xe3, 0x98, 0x70, 0x91, 0x69, 0xf6, 0x06, 0x21, 0x9b, 0x91, 0x20, 0xbb, - 0x18, 0xfe, 0xe9, 0xc0, 0xd6, 0x89, 0x76, 0xf3, 0x80, 0x06, 0xe4, 0x73, 0xce, 0x92, 0x18, 0x7d, - 0x00, 0x4d, 0x3a, 0x73, 0x1b, 0xd7, 0x1b, 0xef, 0x0d, 0xf6, 0xaf, 0x79, 0x99, 0x37, 0x2f, 0xf7, - 0xe6, 0x7d, 0xf5, 0x28, 0x92, 0x87, 0x07, 0x5f, 0xe3, 0x20, 0x21, 0xe3, 0x26, 0x9d, 0xa1, 0x0f, - 0xa1, 0x1d, 0xe1, 0x90, 0xb8, 0xcd, 0x57, 0xe8, 0xbf, 0x94, 0x9c, 0x46, 0x8b, 0x4c, 0xaf, 0x95, - 0xe8, 0x36, 0xf4, 0xd5, 0x5f, 0x11, 0x63, 0x9f, 0xb8, 0x2d, 0x0b, 0xb3, 0x42, 0x8e, 0x0e, 0xa1, - 0xe7, 0xb3, 0x30, 0x24, 0x91, 0x74, 0xdb, 0x16, 0x96, 0xb9, 0x18, 0xdd, 0x85, 0x81, 0xcf, 0x09, - 0x96, 0x64, 0x22, 0x69, 0x48, 0xdc, 0x8e, 0x85, 0x2d, 0x64, 0x06, 0xcf, 0x68, 0x48, 0xd0, 0x2d, - 0xe8, 0x1b, 0xf3, 0x69, 0xea, 0x76, 0x2d, 0x8c, 0x9d, 0x4c, 0x7e, 0x9c, 0xaa, 0xc8, 0x21, 0x9b, - 0xd1, 0x79, 0x9a, 0x45, 0xee, 0xd9, 0x44, 0xce, 0x0c, 0xf2, 0xc8, 0xc6, 0x7c, 0x9a, 0xba, 0x8e, - 0x4d, 0xe4, 0x4c, 0x7e, 0x9c, 0xaa, 0x71, 0x56, 0xa9, 0x71, 0xc2, 0x92, 0x48, 0xba, 0x7d, 0x8b, - 0xe9, 0x2c, 0xe4, 0xe8, 0x08, 0x9c, 0x44, 0x10, 0x3e, 0xa1, 0x33, 0xe1, 0xc2, 0xf5, 0xd6, 0xe5, - 0x51, 0x73, 0xb5, 0x8a, 0xba, 0x50, 0x69, 0xa4, 0x4d, 0x07, 0x16, 0xa6, 0x85, 0x1c, 0x3d, 0x80, - 0x2d, 0x4e, 0x42, 0xb6, 0x24, 0x93, 0x97, 0xc1, 0x37, 0x2c, 0x3c, 0x9c, 0x35, 0x42, 0x0f, 0x61, - 0xdb, 0xdc, 0x2a, 0x5e, 0x65, 0xd3, 0xc2, 0xd1, 0x39, 0x2b, 0x74, 0x08, 0x0e, 0x99, 0x51, 0x89, - 0xa7, 0x01, 0x71, 0xb7, 0xf4, 0x10, 0xee, 0x9d, 0xf3, 0x70, 0xcc, 0x58, 0x60, 0x46, 0x21, 0xd7, - 0xa2, 0x7d, 0xe8, 0xb0, 0xe7, 0x11, 0xe1, 0xee, 0xb6, 0xc5, 0x94, 0x65, 0x52, 0x35, 0xe6, 0xd3, - 0x44, 0xd0, 0x88, 0x08, 0xe1, 0xee, 0xd8, 0xcc, 0x74, 0xae, 0x46, 0x1f, 0x03, 0xcc, 0x48, 0x8c, - 0xb9, 0xd4, 0x85, 0x81, 0x6c, 0x52, 0xac, 0xd0, 0xa3, 0xbb, 0xe0, 0x84, 0x44, 0xe2, 0x19, 0x96, - 0xd8, 0xdd, 0xd5, 0xa3, 0xf4, 0x8e, 0xb7, 0xbc, 0xe1, 0x9d, 0xc1, 0x82, 0xf7, 0xd8, 0x68, 0xee, - 0x47, 0x92, 0xa7, 0xe3, 0x97, 0x26, 0x7b, 0x77, 0x60, 0x63, 0xed, 0x11, 0xda, 0x86, 0xd6, 0x77, - 0x24, 0xd5, 0x00, 0xe9, 0x8f, 0xd5, 0xbf, 0xe8, 0x2a, 0x74, 0x96, 0x2a, 0xac, 0x86, 0x44, 0x7f, - 0x9c, 0x5d, 0xdc, 0x6e, 0x1e, 0x35, 0x86, 0xbf, 0xf5, 0x00, 0x8a, 0x40, 0xff, 0x68, 0xf4, 0xec, - 0x43, 0x47, 0xe7, 0x85, 0x15, 0x78, 0x32, 0x69, 0x86, 0xab, 0x48, 0xaa, 0x59, 0xe9, 0xd8, 0xe1, - 0x4a, 0x8b, 0xd1, 0x01, 0x74, 0xe7, 0x8c, 0x87, 0x58, 0x5a, 0xc1, 0xc6, 0x68, 0x57, 0xe1, 0xd8, - 0x2b, 0x03, 0xc7, 0x03, 0xe8, 0x0a, 0x89, 0x65, 0x22, 0xac, 0x00, 0x63, 0xb4, 0xe8, 0x5d, 0x68, - 0x4b, 0xbc, 0x10, 0x6e, 0x5f, 0xa7, 0xcc, 0xce, 0x7a, 0xca, 0x3c, 0xc3, 0x8b, 0xb1, 0x7e, 0x7c, - 0x96, 0xbc, 0x50, 0x87, 0xbc, 0x83, 0x3a, 0xe4, 0xbd, 0x52, 0x87, 0xbc, 0x1b, 0xa5, 0xc8, 0x7b, - 0x0f, 0xae, 0x70, 0x12, 0x10, 0x2c, 0xcc, 0x47, 0x6f, 0x5a, 0x58, 0x0f, 0x8c, 0x85, 0x8e, 0x7d, - 0x07, 0x20, 0x77, 0x30, 0x4d, 0x0d, 0x78, 0x2e, 0x49, 0x54, 0xa3, 0x3f, 0x4e, 0xd1, 0x11, 0xf4, - 0x49, 0xe4, 0xf3, 0x34, 0x96, 0x64, 0x66, 0xf8, 0xf3, 0x3a, 0x68, 0x15, 0x62, 0xf5, 0xde, 0xe6, - 0x62, 0x82, 0x83, 0x05, 0xb3, 0xa2, 0xd0, 0xc0, 0x58, 0x7c, 0x1a, 0x2c, 0xd8, 0x50, 0xc0, 0xc6, - 0x5a, 0x0e, 0x20, 0xaf, 0x60, 0xc1, 0x65, 0x8e, 0x34, 0x29, 0xf6, 0x57, 0x49, 0x71, 0x69, 0x91, - 0x69, 0xe9, 0xf0, 0x17, 0x07, 0x76, 0x8a, 0xa8, 0xe3, 0x6c, 0x1c, 0xfe, 0x75, 0x28, 0xb9, 0x95, - 0xad, 0xe6, 0x13, 0xfd, 0x9a, 0x36, 0x30, 0x71, 0x94, 0xfc, 0x89, 0x7a, 0xd5, 0x15, 0x0a, 0x75, - 0xcb, 0x50, 0xa8, 0x2a, 0x4f, 0x3c, 0x68, 0x85, 0xb3, 0x8f, 0xac, 0x60, 0xa2, 0x84, 0x2a, 0xce, - 0x92, 0x70, 0x41, 0x59, 0x64, 0xd5, 0xa6, 0xe4, 0xe2, 0xff, 0x24, 0x5a, 0x72, 0xea, 0x6e, 0xbe, - 0x9e, 0xba, 0xfb, 0xd0, 0xc5, 0xbe, 0xa4, 0x4b, 0x9b, 0xae, 0xc5, 0x28, 0x57, 0x16, 0x9d, 0xed, - 0x12, 0x8b, 0xce, 0x63, 0xd8, 0xcd, 0x51, 0x35, 0x23, 0xc2, 0xe7, 0x34, 0x96, 0x6a, 0x22, 0x6d, - 0xd0, 0x81, 0x8c, 0xe1, 0x67, 0x85, 0x9d, 0x2a, 0x44, 0x99, 0xc6, 0xe4, 0x95, 0x4d, 0x8c, 0x4a, - 0x84, 0x9b, 0xfb, 0xa6, 0x10, 0x95, 0x12, 0xbd, 0xaf, 0x1a, 0x4e, 0x9c, 0x4e, 0x78, 0x12, 0x10, - 0x77, 0x57, 0x9b, 0x6d, 0xa8, 0x61, 0x79, 0x8c, 0xa5, 0x7f, 0xfa, 0x8c, 0xf0, 0x70, 0xec, 0xa8, - 0xe7, 0xe3, 0x24, 0x20, 0xc3, 0x1f, 0x1d, 0x70, 0xcf, 0xa1, 0xe2, 0x21, 0x15, 0x92, 0xf1, 0xf4, - 0x7f, 0x62, 0xd4, 0x27, 0x46, 0x91, 0x42, 0xbd, 0x6a, 0x7d, 0x8b, 0x53, 0x81, 0x33, 0x7d, 0x5b, - 0xce, 0xe4, 0xb9, 0x65, 0x03, 0x8a, 0x2c, 0xb7, 0x8a, 0xce, 0x68, 0x50, 0xa1, 0x33, 0xba, 0x52, - 0xaa, 0x33, 0xda, 0xa8, 0x83, 0xaf, 0xcd, 0x3a, 0xf8, 0xda, 0xaa, 0x83, 0xaf, 0xed, 0x52, 0xf8, - 0x3a, 0x80, 0x2e, 0x27, 0x58, 0x58, 0x02, 0xc2, 0x68, 0x5f, 0xc5, 0x18, 0x54, 0x8d, 0x31, 0xc3, - 0x17, 0x6d, 0x40, 0x2b, 0x13, 0x42, 0xc2, 0x38, 0xc0, 0xf2, 0xef, 0xef, 0x18, 0x56, 0x8a, 0xaa, - 0x55, 0xad, 0xa8, 0xda, 0xd5, 0x8a, 0xaa, 0x53, 0xe3, 0xa4, 0xa4, 0x5b, 0x27, 0x2b, 0x7b, 0x75, - 0xb2, 0xd2, 0xa9, 0x93, 0x95, 0xfd, 0x32, 0x59, 0x39, 0xfc, 0xa3, 0x0d, 0x57, 0x4f, 0x02, 0x4a, - 0x22, 0x59, 0xa4, 0xc5, 0xa3, 0x68, 0xce, 0xd6, 0x91, 0xdd, 0xa8, 0x88, 0xec, 0x66, 0x45, 0x64, - 0xb7, 0xaa, 0x22, 0xbb, 0x5d, 0xb2, 0xc9, 0xcb, 0x9b, 0xaf, 0x4e, 0x99, 0xe6, 0xcb, 0xc0, 0xb7, - 0x6b, 0x0b, 0xdf, 0x1c, 0x8a, 0xbd, 0xd7, 0x43, 0x71, 0x6d, 0xf3, 0xe2, 0x94, 0xd9, 0xbc, 0xdc, - 0x01, 0x88, 0x93, 0x69, 0x40, 0xfd, 0x89, 0xda, 0x71, 0xd8, 0x24, 0x40, 0x3f, 0xd3, 0x7f, 0x41, - 0xd2, 0x97, 0xd5, 0x0c, 0xd6, 0xd5, 0xfc, 0xc9, 0x99, 0x3d, 0x9e, 0xcd, 0x02, 0xb1, 0x66, 0x31, - 0xfc, 0xbd, 0x01, 0xd7, 0xb2, 0xac, 0xfb, 0x46, 0xb5, 0x2a, 0xab, 0x7d, 0xc9, 0xf7, 0x09, 0x11, - 0x52, 0xd7, 0x92, 0x7e, 0x3e, 0xa1, 0xb1, 0x55, 0xf6, 0x39, 0x99, 0xfc, 0x51, 0xac, 0x76, 0x72, - 0x82, 0xf0, 0x25, 0xf5, 0x4d, 0x2e, 0xd9, 0xe4, 0xe0, 0xc0, 0x58, 0xe8, 0x74, 0xba, 0x05, 0x83, - 0xe7, 0xea, 0xad, 0xf4, 0xe9, 0xb2, 0x70, 0x5b, 0x7a, 0xd6, 0x5c, 0x3d, 0x6b, 0x17, 0x14, 0xca, - 0x18, 0xb4, 0x58, 0x5d, 0x8a, 0xe1, 0xaf, 0x0d, 0x78, 0xab, 0x78, 0x7c, 0xff, 0x87, 0x98, 0x71, - 0x99, 0x7f, 0x52, 0x9d, 0x82, 0x3a, 0x80, 0xae, 0xae, 0x12, 0xe1, 0x36, 0x2d, 0xce, 0xf2, 0x8c, - 0x56, 0x95, 0xa1, 0x76, 0x61, 0x3e, 0xe1, 0x92, 0x32, 0xd4, 0xd2, 0xe1, 0xcf, 0x1d, 0x78, 0xa3, - 0xf8, 0x82, 0xa7, 0x2a, 0x4b, 0xc4, 0xa9, 0x06, 0xc2, 0xca, 0xac, 0xeb, 0x71, 0x6d, 0x94, 0x99, - 0xf5, 0xf3, 0x5d, 0x60, 0xb3, 0x22, 0x52, 0x5a, 0xf6, 0x48, 0xb9, 0xbd, 0x8a, 0x14, 0x1b, 0x32, - 0x14, 0xf2, 0xca, 0xc7, 0x57, 0x2b, 0x6b, 0x4f, 0xb7, 0xe4, 0x41, 0x54, 0x85, 0xf6, 0xf1, 0xc9, - 0xc5, 0xdd, 0x81, 0xcd, 0xfa, 0x71, 0x91, 0xa1, 0x1a, 0xb1, 0x72, 0xfb, 0xc2, 0x42, 0xae, 0x6c, - 0xcb, 0xed, 0xec, 0x0a, 0xb9, 0xe5, 0xd6, 0x6e, 0xf8, 0x53, 0x03, 0xde, 0x3c, 0x73, 0x36, 0x9b, - 0x57, 0xd7, 0x11, 0x38, 0x9c, 0x2c, 0xa9, 0x86, 0xb9, 0x15, 0x2f, 0x72, 0x35, 0xba, 0xb7, 0xf6, - 0x6b, 0xd2, 0x64, 0x75, 0xe1, 0xda, 0xbd, 0xe0, 0x30, 0x78, 0xbc, 0xe5, 0xaf, 0xdf, 0x38, 0x7e, - 0xd1, 0x80, 0x43, 0x9f, 0x85, 0x9e, 0x24, 0x91, 0x4f, 0x22, 0xe9, 0xc5, 0x2c, 0xc0, 0x9c, 0x0a, - 0x4f, 0xc4, 0xc4, 0xa7, 0x73, 0xea, 0x63, 0x35, 0xb4, 0x1e, 0x8e, 0xa9, 0xf2, 0x96, 0x19, 0x7b, - 0x21, 0x8e, 0xf0, 0x82, 0x1c, 0xaf, 0xfc, 0x00, 0xf5, 0x54, 0xbd, 0xe5, 0xb7, 0x27, 0x0b, 0x2a, - 0x4f, 0x93, 0xa9, 0xe7, 0xb3, 0x70, 0x64, 0xfc, 0x84, 0x44, 0x9c, 0x8e, 0xd6, 0x7c, 0x8d, 0x04, - 0x4b, 0xb8, 0x4f, 0x46, 0x0b, 0x36, 0xc2, 0x31, 0x1d, 0x2d, 0x6f, 0x8c, 0xcc, 0x07, 0x64, 0x5e, - 0xa7, 0x5d, 0xfd, 0xc5, 0x37, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x7d, 0x83, 0x22, 0x26, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x99, 0xdf, 0x8e, 0xdb, 0xc4, + 0x17, 0xc7, 0x95, 0xff, 0xce, 0x49, 0x77, 0xb3, 0x3b, 0xed, 0xef, 0x87, 0xb5, 0xaa, 0x50, 0x89, + 0x84, 0xc4, 0x05, 0x72, 0xda, 0x74, 0x59, 0x6d, 0x5b, 0xaa, 0x42, 0x4a, 0x4b, 0x2b, 0x68, 0x55, + 0x85, 0x02, 0x12, 0x37, 0xd1, 0xc4, 0x99, 0x78, 0x47, 0xd8, 0x1e, 0xe3, 0x99, 0xa4, 0xf8, 0x9a, + 0xfb, 0xde, 0x70, 0xc7, 0x43, 0xf0, 0x0a, 0xbc, 0x00, 0xb7, 0x3c, 0x09, 0xd7, 0x48, 0x68, 0xc6, + 0xe3, 0xda, 0xd9, 0x6d, 0x77, 0xc7, 0xb6, 0x90, 0x10, 0x70, 0xb5, 0x6b, 0xfb, 0x7b, 0xce, 0xb1, + 0x67, 0xce, 0xf9, 0xcc, 0x99, 0x09, 0xec, 0xbb, 0x2c, 0x5c, 0x51, 0x6f, 0xbe, 0xa2, 0x3e, 0x71, + 0xa2, 0x98, 0x09, 0x86, 0x9a, 0x9b, 0x1b, 0x07, 0x6f, 0x7b, 0x8c, 0x79, 0x3e, 0x19, 0xab, 0x3b, + 0x8b, 0xf5, 0x6a, 0xfc, 0x22, 0xc6, 0x51, 0x44, 0x62, 0x9e, 0x6a, 0x0e, 0x06, 0x01, 0x5b, 0x12, + 0x3f, 0xbd, 0x18, 0xfd, 0x61, 0xc1, 0xf0, 0xbe, 0x72, 0xf3, 0x90, 0xfa, 0xe4, 0xd3, 0x98, 0xad, + 0x23, 0xf4, 0x3e, 0x34, 0xe9, 0xd2, 0x6e, 0x5c, 0x6b, 0xbc, 0x37, 0x98, 0x5c, 0x75, 0x52, 0x6f, + 0x4e, 0xe6, 0xcd, 0xf9, 0xf2, 0x71, 0x28, 0x8e, 0x0e, 0xbf, 0xc2, 0xfe, 0x9a, 0xcc, 0x9a, 0x74, + 0x89, 0xae, 0x43, 0x3b, 0xc4, 0x01, 0xb1, 0x9b, 0x6f, 0xd0, 0x7f, 0x21, 0x62, 0x1a, 0x7a, 0xa9, + 0x5e, 0x29, 0xd1, 0x6d, 0xe8, 0xcb, 0xbf, 0x3c, 0xc2, 0x2e, 0xb1, 0x5b, 0x06, 0x66, 0xb9, 0x1c, + 0x1d, 0x41, 0xcf, 0x65, 0x41, 0x40, 0x42, 0x61, 0xb7, 0x0d, 0x2c, 0x33, 0x31, 0xba, 0x0b, 0x03, + 0x37, 0x26, 0x58, 0x90, 0xb9, 0xa0, 0x01, 0xb1, 0x3b, 0x06, 0xb6, 0x90, 0x1a, 0x3c, 0xa7, 0x01, + 0x41, 0xb7, 0xa0, 0xaf, 0xcd, 0x17, 0x89, 0xdd, 0x35, 0x30, 0xb6, 0x52, 0xf9, 0x34, 0x91, 0x91, + 0x03, 0xb6, 0xa4, 0xab, 0x24, 0x8d, 0xdc, 0x33, 0x89, 0x9c, 0x1a, 0x64, 0x91, 0xb5, 0xf9, 0x22, + 0xb1, 0x2d, 0x93, 0xc8, 0xa9, 0x7c, 0x9a, 0xc8, 0x71, 0x96, 0xa9, 0x71, 0x9f, 0xad, 0x43, 0x61, + 0xf7, 0x0d, 0xa6, 0x33, 0x97, 0xa3, 0x63, 0xb0, 0xd6, 0x9c, 0xc4, 0x73, 0xba, 0xe4, 0x36, 0x5c, + 0x6b, 0x5d, 0x1c, 0x35, 0x53, 0xcb, 0xa8, 0x9e, 0x4c, 0x23, 0x65, 0x3a, 0x30, 0x30, 0xcd, 0xe5, + 0xe8, 0x21, 0x0c, 0x63, 0x12, 0xb0, 0x0d, 0x99, 0xbf, 0x0a, 0xbe, 0x63, 0xe0, 0xe1, 0xb4, 0x11, + 0x7a, 0x04, 0x7b, 0xfa, 0x56, 0xfe, 0x2a, 0xbb, 0x06, 0x8e, 0xce, 0x58, 0xa1, 0x23, 0xb0, 0xc8, + 0x92, 0x0a, 0xbc, 0xf0, 0x89, 0x3d, 0x54, 0x43, 0x78, 0x70, 0xc6, 0xc3, 0x94, 0x31, 0x5f, 0x8f, + 0x42, 0xa6, 0x45, 0x13, 0xe8, 0xb0, 0x17, 0x21, 0x89, 0xed, 0x3d, 0x83, 0x29, 0x4b, 0xa5, 0x72, + 0xcc, 0x17, 0x6b, 0x4e, 0x43, 0xc2, 0xb9, 0xbd, 0x6f, 0x32, 0xd3, 0x99, 0x1a, 0x7d, 0x08, 0xb0, + 0x24, 0x11, 0x8e, 0x85, 0x2a, 0x0c, 0x64, 0x92, 0x62, 0xb9, 0x1e, 0xdd, 0x05, 0x2b, 0x20, 0x02, + 0x2f, 0xb1, 0xc0, 0xf6, 0x65, 0x35, 0x4a, 0xef, 0x38, 0x9b, 0x1b, 0xce, 0x29, 0x2c, 0x38, 0x4f, + 0xb4, 0xe6, 0x41, 0x28, 0xe2, 0x64, 0xf6, 0xca, 0xe4, 0xe0, 0x0e, 0xec, 0x6c, 0x3d, 0x42, 0x7b, + 0xd0, 0xfa, 0x96, 0x24, 0x0a, 0x20, 0xfd, 0x99, 0xfc, 0x17, 0x5d, 0x81, 0xce, 0x46, 0x86, 0x55, + 0x90, 0xe8, 0xcf, 0xd2, 0x8b, 0xdb, 0xcd, 0xe3, 0xc6, 0xe8, 0xd7, 0x1e, 0x40, 0x1e, 0xe8, 0x6f, + 0x8d, 0x9e, 0x09, 0x74, 0x54, 0x5e, 0x18, 0x81, 0x27, 0x95, 0xa6, 0xb8, 0x0a, 0x85, 0x9c, 0x95, + 0x8e, 0x19, 0xae, 0x94, 0x18, 0x1d, 0x42, 0x77, 0xc5, 0xe2, 0x00, 0x0b, 0x23, 0xd8, 0x68, 0x6d, + 0x11, 0x8e, 0xbd, 0x32, 0x70, 0x3c, 0x84, 0x2e, 0x17, 0x58, 0xac, 0xb9, 0x11, 0x60, 0xb4, 0x16, + 0xbd, 0x0b, 0x6d, 0x81, 0x3d, 0x6e, 0xf7, 0x55, 0xca, 0xec, 0x6f, 0xa7, 0xcc, 0x73, 0xec, 0xcd, + 0xd4, 0xe3, 0xd3, 0xe4, 0x85, 0x3a, 0xe4, 0x1d, 0xd4, 0x21, 0xef, 0xa5, 0x3a, 0xe4, 0xdd, 0x29, + 0x45, 0xde, 0x7b, 0x70, 0x29, 0x26, 0x3e, 0xc1, 0x5c, 0x7f, 0xf4, 0xae, 0x81, 0xf5, 0x40, 0x5b, + 0xa8, 0xd8, 0x77, 0x00, 0x32, 0x07, 0x8b, 0x44, 0x83, 0xe7, 0x82, 0x44, 0xd5, 0xfa, 0x69, 0x82, + 0x8e, 0xa1, 0x4f, 0x42, 0x37, 0x4e, 0x22, 0x41, 0x96, 0x9a, 0x3f, 0xe7, 0x41, 0x2b, 0x17, 0xcb, + 0xf7, 0xd6, 0x17, 0x73, 0xec, 0x7b, 0xcc, 0x88, 0x42, 0x03, 0x6d, 0xf1, 0xb1, 0xef, 0xb1, 0x11, + 0x87, 0x9d, 0xad, 0x1c, 0x40, 0x4e, 0xce, 0x82, 0x8b, 0x1c, 0x29, 0x52, 0x4c, 0x8a, 0xa4, 0xb8, + 0xb0, 0xc8, 0x94, 0x74, 0xf4, 0xb3, 0x05, 0xfb, 0x79, 0xd4, 0x59, 0x3a, 0x0e, 0xff, 0x38, 0x94, + 0xdc, 0x4a, 0x57, 0xf3, 0xb9, 0x7a, 0x4d, 0x13, 0x98, 0x58, 0x52, 0xfe, 0x54, 0xbe, 0x6a, 0x81, + 0x42, 0xdd, 0x32, 0x14, 0xaa, 0xca, 0x13, 0x07, 0x5a, 0xc1, 0xf2, 0x03, 0x23, 0x98, 0x48, 0xa1, + 0x8c, 0xb3, 0x21, 0x31, 0xa7, 0x2c, 0x34, 0x6a, 0x53, 0x32, 0xf1, 0xbf, 0x12, 0x2d, 0x19, 0x75, + 0x77, 0xcf, 0xa7, 0xee, 0x04, 0xba, 0xd8, 0x15, 0x74, 0x63, 0xd2, 0xb5, 0x68, 0x65, 0x61, 0xd1, + 0xd9, 0x2b, 0xb1, 0xe8, 0x3c, 0x81, 0xcb, 0x19, 0xaa, 0x96, 0x84, 0xbb, 0x31, 0x8d, 0x84, 0x9c, + 0x48, 0x13, 0x74, 0x20, 0x6d, 0xf8, 0x49, 0x6e, 0x27, 0x0b, 0x51, 0x24, 0x11, 0x79, 0x63, 0x13, + 0x23, 0x13, 0xe1, 0xe6, 0x44, 0x17, 0xa2, 0x54, 0xa2, 0xeb, 0x30, 0x58, 0x10, 0x81, 0xe7, 0x3e, + 0x5e, 0x10, 0x9f, 0xeb, 0x0e, 0x66, 0xa8, 0x06, 0xc6, 0xa7, 0x24, 0x14, 0x9f, 0xcb, 0xfb, 0x33, + 0x90, 0x1a, 0xf5, 0x2f, 0x1f, 0xfd, 0x60, 0x81, 0x7d, 0x06, 0x18, 0x8f, 0x28, 0x17, 0x2c, 0x4e, + 0xfe, 0xe3, 0x46, 0x7d, 0x6e, 0xe4, 0x89, 0xd4, 0xab, 0xd6, 0xbd, 0x58, 0x15, 0x68, 0xd3, 0x37, + 0xa5, 0x4d, 0x96, 0x61, 0x26, 0xb8, 0x48, 0x33, 0x2c, 0xef, 0x8f, 0x06, 0x15, 0xfa, 0xa3, 0x4b, + 0xa5, 0xfa, 0xa3, 0x9d, 0x3a, 0x10, 0xdb, 0xad, 0x03, 0xb1, 0x61, 0x1d, 0x88, 0xed, 0x95, 0x82, + 0xd8, 0x21, 0x74, 0x63, 0x82, 0xb9, 0x21, 0x26, 0xb4, 0xf6, 0x4d, 0xa4, 0x41, 0xd5, 0x48, 0x33, + 0x7a, 0xd9, 0x06, 0x54, 0x98, 0x10, 0x12, 0x44, 0x3e, 0x16, 0x7f, 0x7d, 0xdf, 0x50, 0x28, 0xaa, + 0x56, 0xb5, 0xa2, 0x6a, 0x57, 0x2b, 0xaa, 0x4e, 0x8d, 0xf3, 0x92, 0x6e, 0x9d, 0xac, 0xec, 0xd5, + 0xc9, 0x4a, 0xab, 0x4e, 0x56, 0xf6, 0xcb, 0x64, 0xe5, 0xe8, 0xf7, 0x36, 0x5c, 0x49, 0x97, 0x8c, + 0x3c, 0x2d, 0x1e, 0x87, 0x2b, 0xb6, 0x8d, 0xec, 0x46, 0x45, 0x64, 0x37, 0x2b, 0x22, 0xbb, 0x55, + 0x15, 0xd9, 0xed, 0x92, 0xad, 0x5e, 0xd6, 0x82, 0x75, 0xca, 0xb4, 0x60, 0x1a, 0xbe, 0x5d, 0x53, + 0xf8, 0x66, 0x50, 0xec, 0x9d, 0x0f, 0xc5, 0xad, 0x2d, 0x8c, 0x55, 0x66, 0x0b, 0x73, 0x07, 0x20, + 0x5a, 0x2f, 0x7c, 0xea, 0xce, 0xe5, 0xbe, 0xc3, 0x24, 0x01, 0xfa, 0xa9, 0xfe, 0x33, 0x92, 0xbc, + 0xaa, 0x66, 0x30, 0xae, 0xe6, 0x8f, 0x4e, 0xed, 0xf4, 0x4c, 0x16, 0x88, 0x2d, 0x8b, 0xd1, 0x6f, + 0x0d, 0xb8, 0x9a, 0x66, 0xdd, 0xd7, 0x58, 0xb8, 0x27, 0xc5, 0xbe, 0xe4, 0xbb, 0x35, 0xe1, 0x42, + 0xd5, 0x92, 0x7a, 0x3e, 0xa7, 0x91, 0x51, 0xf6, 0x59, 0xa9, 0xfc, 0x71, 0x24, 0xf7, 0x73, 0x9c, + 0xc4, 0x1b, 0xea, 0xea, 0x5c, 0x32, 0xc9, 0xc1, 0x81, 0xb6, 0x50, 0xe9, 0x74, 0x0b, 0x06, 0x2f, + 0xe4, 0x5b, 0xa9, 0x33, 0x66, 0x6e, 0xb7, 0xd4, 0xac, 0xd9, 0x79, 0x6f, 0xb5, 0x5d, 0x28, 0x33, + 0x50, 0x62, 0x79, 0xc9, 0x47, 0xbf, 0x34, 0xe0, 0xad, 0xfc, 0xf1, 0x83, 0xef, 0x23, 0x16, 0x8b, + 0xec, 0x93, 0xea, 0x14, 0xd4, 0x21, 0x74, 0x55, 0x95, 0x70, 0xbb, 0x69, 0x70, 0xa2, 0xa7, 0xb5, + 0xb2, 0x0c, 0x95, 0x0b, 0xfd, 0x09, 0x17, 0x94, 0xa1, 0x92, 0x8e, 0x7e, 0xea, 0xc0, 0xff, 0xf2, + 0x2f, 0x78, 0x26, 0xb3, 0x84, 0x9f, 0x28, 0x20, 0x14, 0x66, 0x5d, 0x8d, 0x6b, 0xa3, 0xcc, 0xac, + 0x9f, 0xed, 0x02, 0x9b, 0x15, 0x91, 0xd2, 0x32, 0x47, 0xca, 0xed, 0x22, 0x52, 0x4c, 0xc8, 0x90, + 0xcb, 0x2b, 0x1f, 0x62, 0x15, 0xd6, 0x9e, 0x6e, 0xc9, 0xe3, 0xa8, 0x0a, 0xed, 0xe3, 0xd3, 0xd7, + 0x77, 0x07, 0x26, 0xeb, 0xc7, 0xeb, 0x0c, 0xe5, 0x88, 0x95, 0xdb, 0x1d, 0xe6, 0x72, 0x69, 0x5b, + 0x6e, 0x7f, 0x97, 0xcb, 0x0d, 0x37, 0x78, 0xa3, 0x1f, 0x1b, 0xf0, 0xff, 0x53, 0x27, 0xb4, 0x59, + 0x75, 0x1d, 0x83, 0x15, 0x93, 0x0d, 0x55, 0x30, 0x37, 0xe2, 0x45, 0xa6, 0x46, 0xf7, 0xb6, 0x7e, + 0x53, 0x9a, 0x17, 0x17, 0xae, 0xcb, 0xaf, 0x39, 0x12, 0x9e, 0x0d, 0xdd, 0xed, 0x1b, 0xd3, 0x97, + 0x0d, 0x38, 0x72, 0x59, 0xe0, 0x08, 0x12, 0xba, 0x24, 0x14, 0x4e, 0xc4, 0x7c, 0x1c, 0x53, 0xee, + 0xf0, 0x88, 0xb8, 0x74, 0x45, 0x5d, 0x2c, 0x87, 0xd6, 0xc1, 0x11, 0x95, 0xde, 0x52, 0x63, 0x27, + 0xc0, 0x21, 0xf6, 0xc8, 0xb4, 0xf0, 0x33, 0xd4, 0x33, 0xf9, 0x96, 0xdf, 0xdc, 0xf7, 0xa8, 0x38, + 0x59, 0x2f, 0x1c, 0x97, 0x05, 0x63, 0xed, 0x27, 0x20, 0xfc, 0x64, 0xbc, 0xe5, 0x6b, 0xcc, 0xd9, + 0x3a, 0x76, 0xc9, 0xd8, 0x63, 0x63, 0x1c, 0xd1, 0xf1, 0xe6, 0xc6, 0x58, 0x7f, 0x40, 0xea, 0x75, + 0xd1, 0x55, 0x5f, 0x7c, 0xf3, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x09, 0xc1, 0x12, 0x2c, 0x1b, 0x00, 0x00, } diff --git a/source/go/api/v1/model/model.pb.go b/source/go/api/v1/model/model.pb.go index 0073b37..33923c5 100644 --- a/source/go/api/v1/model/model.pb.go +++ b/source/go/api/v1/model/model.pb.go @@ -57,7 +57,7 @@ func (x MatchString_MatchStringType) String() string { return proto.EnumName(MatchString_MatchStringType_name, int32(x)) } func (MatchString_MatchStringType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{1, 0} + return fileDescriptor_model_89bde6c9fe109cf9, []int{1, 0} } type MatchString_ValueType int32 @@ -83,7 +83,7 @@ func (x MatchString_ValueType) String() string { return proto.EnumName(MatchString_ValueType_name, int32(x)) } func (MatchString_ValueType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{1, 1} + return fileDescriptor_model_89bde6c9fe109cf9, []int{1, 1} } type Location struct { @@ -99,7 +99,7 @@ func (m *Location) Reset() { *m = Location{} } func (m *Location) String() string { return proto.CompactTextString(m) } func (*Location) ProtoMessage() {} func (*Location) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{0} + return fileDescriptor_model_89bde6c9fe109cf9, []int{0} } func (m *Location) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Location.Unmarshal(m, b) @@ -153,7 +153,7 @@ func (m *MatchString) Reset() { *m = MatchString{} } func (m *MatchString) String() string { return proto.CompactTextString(m) } func (*MatchString) ProtoMessage() {} func (*MatchString) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{1} + return fileDescriptor_model_89bde6c9fe109cf9, []int{1} } func (m *MatchString) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MatchString.Unmarshal(m, b) @@ -205,7 +205,7 @@ func (m *StringList) Reset() { *m = StringList{} } func (m *StringList) String() string { return proto.CompactTextString(m) } func (*StringList) ProtoMessage() {} func (*StringList) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{2} + return fileDescriptor_model_89bde6c9fe109cf9, []int{2} } func (m *StringList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StringList.Unmarshal(m, b) @@ -249,7 +249,7 @@ func (m *Summary) Reset() { *m = Summary{} } func (m *Summary) String() string { return proto.CompactTextString(m) } func (*Summary) ProtoMessage() {} func (*Summary) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{3} + return fileDescriptor_model_89bde6c9fe109cf9, []int{3} } func (m *Summary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Summary.Unmarshal(m, b) @@ -290,93 +290,46 @@ func (m *Summary) GetTotalInstanceCount() uint32 { return 0 } -// 匹配规则 -type MatchTerm struct { - Key *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value *MatchString `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type ClientLabel struct { + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value *MatchString `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *MatchTerm) Reset() { *m = MatchTerm{} } -func (m *MatchTerm) String() string { return proto.CompactTextString(m) } -func (*MatchTerm) ProtoMessage() {} -func (*MatchTerm) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{4} +func (m *ClientLabel) Reset() { *m = ClientLabel{} } +func (m *ClientLabel) String() string { return proto.CompactTextString(m) } +func (*ClientLabel) ProtoMessage() {} +func (*ClientLabel) Descriptor() ([]byte, []int) { + return fileDescriptor_model_89bde6c9fe109cf9, []int{4} } -func (m *MatchTerm) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_MatchTerm.Unmarshal(m, b) +func (m *ClientLabel) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ClientLabel.Unmarshal(m, b) } -func (m *MatchTerm) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_MatchTerm.Marshal(b, m, deterministic) +func (m *ClientLabel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ClientLabel.Marshal(b, m, deterministic) } -func (dst *MatchTerm) XXX_Merge(src proto.Message) { - xxx_messageInfo_MatchTerm.Merge(dst, src) +func (dst *ClientLabel) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClientLabel.Merge(dst, src) } -func (m *MatchTerm) XXX_Size() int { - return xxx_messageInfo_MatchTerm.Size(m) +func (m *ClientLabel) XXX_Size() int { + return xxx_messageInfo_ClientLabel.Size(m) } -func (m *MatchTerm) XXX_DiscardUnknown() { - xxx_messageInfo_MatchTerm.DiscardUnknown(m) +func (m *ClientLabel) XXX_DiscardUnknown() { + xxx_messageInfo_ClientLabel.DiscardUnknown(m) } -var xxx_messageInfo_MatchTerm proto.InternalMessageInfo +var xxx_messageInfo_ClientLabel proto.InternalMessageInfo -func (m *MatchTerm) GetKey() *wrapperspb.StringValue { +func (m *ClientLabel) GetKey() string { if m != nil { return m.Key } - return nil -} - -func (m *MatchTerm) GetValue() *MatchString { - if m != nil { - return m.Value - } - return nil -} - -type Tag struct { - Key *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Tag) Reset() { *m = Tag{} } -func (m *Tag) String() string { return proto.CompactTextString(m) } -func (*Tag) ProtoMessage() {} -func (*Tag) Descriptor() ([]byte, []int) { - return fileDescriptor_model_1b9fad32d4340535, []int{5} -} -func (m *Tag) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Tag.Unmarshal(m, b) -} -func (m *Tag) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Tag.Marshal(b, m, deterministic) -} -func (dst *Tag) XXX_Merge(src proto.Message) { - xxx_messageInfo_Tag.Merge(dst, src) -} -func (m *Tag) XXX_Size() int { - return xxx_messageInfo_Tag.Size(m) -} -func (m *Tag) XXX_DiscardUnknown() { - xxx_messageInfo_Tag.DiscardUnknown(m) -} - -var xxx_messageInfo_Tag proto.InternalMessageInfo - -func (m *Tag) GetKey() *wrapperspb.StringValue { - if m != nil { - return m.Key - } - return nil + return "" } -func (m *Tag) GetValue() *wrapperspb.StringValue { +func (m *ClientLabel) GetValue() *MatchString { if m != nil { return m.Value } @@ -388,48 +341,46 @@ func init() { proto.RegisterType((*MatchString)(nil), "v1.MatchString") proto.RegisterType((*StringList)(nil), "v1.StringList") proto.RegisterType((*Summary)(nil), "v1.Summary") - proto.RegisterType((*MatchTerm)(nil), "v1.MatchTerm") - proto.RegisterType((*Tag)(nil), "v1.Tag") + proto.RegisterType((*ClientLabel)(nil), "v1.ClientLabel") proto.RegisterEnum("v1.MatchString_MatchStringType", MatchString_MatchStringType_name, MatchString_MatchStringType_value) proto.RegisterEnum("v1.MatchString_ValueType", MatchString_ValueType_name, MatchString_ValueType_value) } -func init() { proto.RegisterFile("model.proto", fileDescriptor_model_1b9fad32d4340535) } - -var fileDescriptor_model_1b9fad32d4340535 = []byte{ - // 530 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xdd, 0x8a, 0xd3, 0x4e, - 0x14, 0xff, 0x27, 0x69, 0xfb, 0x6f, 0x4f, 0xdd, 0xdd, 0x30, 0x8a, 0xd4, 0x0f, 0x74, 0x09, 0x0a, - 0x7b, 0x35, 0xd9, 0x76, 0xbd, 0x11, 0x6f, 0x4c, 0x25, 0x2c, 0x85, 0xb6, 0xae, 0x69, 0x2c, 0xc5, - 0x9b, 0x32, 0x8d, 0xb3, 0xe9, 0x60, 0x92, 0x09, 0x99, 0x49, 0x25, 0x3e, 0x91, 0xb7, 0x3e, 0x80, - 0xef, 0x26, 0x33, 0xa9, 0x4b, 0xb7, 0x2c, 0x52, 0xbd, 0xca, 0xc9, 0x39, 0xbf, 0x2f, 0x66, 0xce, - 0x40, 0x37, 0xe5, 0x9f, 0x69, 0x82, 0xf3, 0x82, 0x4b, 0x8e, 0xcc, 0x4d, 0xff, 0xf1, 0xb3, 0x98, - 0xf3, 0x38, 0xa1, 0xae, 0xee, 0xac, 0xca, 0x6b, 0xf7, 0x6b, 0x41, 0xf2, 0x9c, 0x16, 0xa2, 0xc6, - 0x38, 0xdf, 0x0d, 0x68, 0x8f, 0x79, 0x44, 0x24, 0xe3, 0x19, 0x7a, 0x05, 0xad, 0x82, 0xc6, 0x8c, - 0x67, 0x3d, 0xe3, 0xd4, 0x38, 0xeb, 0x0e, 0x9e, 0xe2, 0x9a, 0x8d, 0x7f, 0xb3, 0xf1, 0x4c, 0x16, - 0x2c, 0x8b, 0xe7, 0x24, 0x29, 0x69, 0xb0, 0xc5, 0xa2, 0x73, 0x68, 0x7c, 0xe3, 0x19, 0xed, 0x99, - 0x07, 0x70, 0x34, 0x52, 0xf9, 0x44, 0x24, 0xcd, 0x4b, 0xd1, 0xb3, 0x0e, 0xf1, 0xa9, 0xb1, 0xce, - 0x4f, 0x13, 0xba, 0x13, 0x22, 0xa3, 0x75, 0x3d, 0x44, 0x17, 0xd0, 0x90, 0x55, 0x4e, 0x75, 0xd6, - 0xe3, 0xc1, 0x73, 0xbc, 0xe9, 0xe3, 0x9d, 0xf1, 0x6e, 0x1d, 0x56, 0x39, 0x0d, 0x34, 0x18, 0x0d, - 0xa0, 0xb9, 0x51, 0xaa, 0x07, 0xa5, 0xad, 0xa1, 0xe8, 0x35, 0x80, 0x2e, 0x96, 0xda, 0xce, 0xd2, - 0x76, 0x8f, 0xf6, 0xed, 0x34, 0x43, 0x1b, 0xed, 0x80, 0x9d, 0x39, 0x9c, 0xec, 0xe5, 0x40, 0x1d, - 0x68, 0xfa, 0x0b, 0xef, 0x5d, 0x68, 0xff, 0xa7, 0xca, 0xc0, 0xbf, 0xf4, 0x17, 0xb6, 0x81, 0x8e, - 0x01, 0xa6, 0xef, 0xc3, 0xa5, 0xff, 0xe1, 0xa3, 0x37, 0x9e, 0xd9, 0x26, 0x6a, 0x81, 0x39, 0x9a, - 0xda, 0x16, 0x02, 0x68, 0xa9, 0xfe, 0x68, 0x6a, 0x37, 0x34, 0xdc, 0x9b, 0x5e, 0xfa, 0x76, 0xd3, - 0x19, 0x40, 0xe7, 0xc6, 0x10, 0xb5, 0xa1, 0x11, 0xfa, 0x0b, 0x25, 0x78, 0x04, 0x9d, 0x2b, 0x2f, - 0xf0, 0x26, 0x7e, 0xe8, 0x07, 0xb6, 0x81, 0xee, 0x41, 0x7b, 0xee, 0x05, 0x23, 0x6f, 0x38, 0xf6, - 0x6d, 0xd3, 0x79, 0x01, 0x50, 0xc7, 0x18, 0x33, 0x21, 0xd1, 0x43, 0x68, 0xe9, 0x9c, 0xa2, 0x67, - 0x9c, 0x5a, 0x67, 0x9d, 0x60, 0xfb, 0xe7, 0xfc, 0x30, 0xe0, 0xff, 0x59, 0x99, 0xa6, 0xa4, 0xa8, - 0xd0, 0x39, 0xdc, 0x97, 0x5c, 0x92, 0x64, 0x29, 0x68, 0xb1, 0x61, 0x11, 0x5d, 0x46, 0xbc, 0xcc, - 0xa4, 0x3e, 0xf0, 0xa3, 0xe0, 0xae, 0x11, 0x7a, 0x0b, 0x4f, 0xea, 0xf6, 0x9a, 0x92, 0x44, 0xae, - 0x97, 0x2c, 0x13, 0x92, 0x64, 0x37, 0x4c, 0x53, 0x33, 0xff, 0x04, 0x41, 0x03, 0x78, 0x50, 0x8f, - 0xf7, 0xa8, 0x96, 0xa6, 0xde, 0x39, 0x73, 0x56, 0xd0, 0xd1, 0xa7, 0x1c, 0xd2, 0x22, 0x45, 0x18, - 0xac, 0x2f, 0xb4, 0x3a, 0x68, 0x83, 0x15, 0x10, 0xbd, 0xbc, 0xbd, 0x11, 0x27, 0x7b, 0x17, 0xbb, - 0x5d, 0x02, 0x87, 0x81, 0x15, 0x92, 0xf8, 0xaf, 0xd5, 0xff, 0x61, 0xdf, 0x86, 0x15, 0xe0, 0x88, - 0xa7, 0x58, 0xd2, 0x2c, 0xa2, 0x99, 0xc4, 0x39, 0x4f, 0x48, 0xc1, 0x04, 0x16, 0x39, 0x8d, 0xd8, - 0x35, 0xab, 0xdf, 0x2a, 0x26, 0x39, 0x53, 0x49, 0xf5, 0x7b, 0x1f, 0xc2, 0x44, 0x7d, 0xae, 0x94, - 0xe6, 0xa7, 0x37, 0x31, 0x93, 0xeb, 0x72, 0xa5, 0x24, 0xdc, 0x2d, 0x35, 0xa5, 0x62, 0xed, 0xde, - 0xa2, 0xbb, 0x82, 0x97, 0x45, 0x44, 0xdd, 0x98, 0xbb, 0x24, 0x67, 0xee, 0xa6, 0xef, 0x6a, 0xa1, - 0x55, 0x4b, 0xe7, 0xba, 0xf8, 0x15, 0x00, 0x00, 0xff, 0xff, 0x81, 0x68, 0xb3, 0x26, 0x48, 0x04, - 0x00, 0x00, +func init() { proto.RegisterFile("model.proto", fileDescriptor_model_89bde6c9fe109cf9) } + +var fileDescriptor_model_89bde6c9fe109cf9 = []byte{ + // 526 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x5f, 0x8f, 0xd2, 0x4c, + 0x14, 0xc6, 0xdf, 0xb6, 0xc0, 0x0b, 0x07, 0x77, 0xb7, 0x19, 0x8d, 0xc1, 0x3f, 0xd1, 0x4d, 0xa3, + 0xc9, 0x5e, 0x4d, 0x17, 0xd6, 0x1b, 0xe3, 0x8d, 0x65, 0x53, 0x37, 0x24, 0x80, 0x6b, 0x41, 0x42, + 0xbc, 0x21, 0x43, 0x9d, 0x2d, 0x13, 0xdb, 0xce, 0xa4, 0x33, 0xc5, 0xe0, 0x27, 0xf2, 0xd6, 0x0f, + 0xe0, 0x77, 0x33, 0x33, 0xc5, 0x0d, 0x4b, 0x36, 0x86, 0x2b, 0x0e, 0x73, 0x9e, 0xdf, 0x79, 0x9e, + 0xf4, 0xcc, 0x40, 0x3b, 0xe3, 0x5f, 0x69, 0x8a, 0x45, 0xc1, 0x15, 0x47, 0xf6, 0xba, 0xfb, 0xf4, + 0x45, 0xc2, 0x79, 0x92, 0x52, 0xdf, 0x9c, 0x2c, 0xcb, 0x1b, 0xff, 0x7b, 0x41, 0x84, 0xa0, 0x85, + 0xac, 0x34, 0xde, 0x4f, 0x0b, 0x9a, 0x43, 0x1e, 0x13, 0xc5, 0x78, 0x8e, 0xde, 0x40, 0xa3, 0xa0, + 0x09, 0xe3, 0x79, 0xc7, 0x3a, 0xb5, 0xce, 0xda, 0xbd, 0xe7, 0xb8, 0xa2, 0xf1, 0x5f, 0x1a, 0x4f, + 0x54, 0xc1, 0xf2, 0x64, 0x46, 0xd2, 0x92, 0x46, 0x5b, 0x2d, 0x3a, 0x87, 0xda, 0x0f, 0x9e, 0xd3, + 0x8e, 0x7d, 0x00, 0x63, 0x94, 0xda, 0x27, 0x26, 0x99, 0x28, 0x65, 0xc7, 0x39, 0xc4, 0xa7, 0xd2, + 0x7a, 0xbf, 0x6d, 0x68, 0x8f, 0x88, 0x8a, 0x57, 0x55, 0x13, 0x5d, 0x40, 0x4d, 0x6d, 0x04, 0x35, + 0x59, 0x8f, 0x7b, 0x2f, 0xf1, 0xba, 0x8b, 0x77, 0xda, 0xbb, 0xf5, 0x74, 0x23, 0x68, 0x64, 0xc4, + 0xa8, 0x07, 0xf5, 0xb5, 0x9e, 0x7a, 0x50, 0xda, 0x4a, 0x8a, 0xde, 0x02, 0x98, 0x62, 0x61, 0xec, + 0x1c, 0x63, 0xf7, 0x64, 0xdf, 0xce, 0x10, 0xc6, 0x68, 0x47, 0xec, 0xcd, 0xe0, 0x64, 0x2f, 0x07, + 0x6a, 0x41, 0x3d, 0x9c, 0x07, 0x97, 0x53, 0xf7, 0x3f, 0x5d, 0x46, 0xe1, 0x55, 0x38, 0x77, 0x2d, + 0x74, 0x0c, 0x30, 0xfe, 0x38, 0x5d, 0x84, 0x9f, 0x3e, 0x07, 0xc3, 0x89, 0x6b, 0xa3, 0x06, 0xd8, + 0x83, 0xb1, 0xeb, 0x20, 0x80, 0x86, 0x3e, 0x1f, 0x8c, 0xdd, 0x9a, 0x91, 0x07, 0xe3, 0xab, 0xd0, + 0xad, 0x7b, 0x3d, 0x68, 0xdd, 0x1a, 0xa2, 0x26, 0xd4, 0xa6, 0xe1, 0x5c, 0x0f, 0x3c, 0x82, 0xd6, + 0x75, 0x10, 0x05, 0xa3, 0x70, 0x1a, 0x46, 0xae, 0x85, 0x1e, 0x40, 0x73, 0x16, 0x44, 0x83, 0xa0, + 0x3f, 0x0c, 0x5d, 0xdb, 0x7b, 0x05, 0x50, 0xc5, 0x18, 0x32, 0xa9, 0xd0, 0x63, 0x68, 0x98, 0x9c, + 0xb2, 0x63, 0x9d, 0x3a, 0x67, 0xad, 0x68, 0xfb, 0xcf, 0xfb, 0x65, 0xc1, 0xff, 0x93, 0x32, 0xcb, + 0x48, 0xb1, 0x41, 0xe7, 0xf0, 0x50, 0x71, 0x45, 0xd2, 0x85, 0xa4, 0xc5, 0x9a, 0xc5, 0x74, 0x11, + 0xf3, 0x32, 0x57, 0xe6, 0x83, 0x1f, 0x45, 0xf7, 0xb5, 0xd0, 0x7b, 0x78, 0x56, 0x1d, 0xaf, 0x28, + 0x49, 0xd5, 0x6a, 0xc1, 0x72, 0xa9, 0x48, 0x7e, 0x4b, 0xda, 0x86, 0xfc, 0x97, 0x04, 0xf5, 0xe0, + 0x51, 0xd5, 0xde, 0x43, 0x1d, 0x83, 0xde, 0xdb, 0xf3, 0x3e, 0x40, 0xfb, 0x32, 0x65, 0x34, 0x57, + 0x43, 0xb2, 0xa4, 0x29, 0x72, 0xc1, 0xf9, 0x46, 0x37, 0x26, 0x66, 0x2b, 0xd2, 0x25, 0x7a, 0x7d, + 0x77, 0xeb, 0x27, 0x7b, 0xcb, 0xdb, 0x2e, 0xba, 0xbf, 0x01, 0x1c, 0xf3, 0x0c, 0x2b, 0x9a, 0xc7, + 0x34, 0x57, 0x58, 0xf0, 0x94, 0x14, 0x4c, 0x62, 0x29, 0x68, 0xcc, 0x6e, 0x58, 0xf5, 0x48, 0x30, + 0x11, 0x4c, 0xe3, 0xe6, 0xa1, 0xf5, 0x61, 0xa4, 0x7f, 0xae, 0xf5, 0xe5, 0xf9, 0xf2, 0x2e, 0x61, + 0x6a, 0x55, 0x2e, 0xf5, 0x08, 0x7f, 0x8b, 0x66, 0x54, 0xae, 0xfc, 0x3b, 0xb8, 0x2f, 0x79, 0x59, + 0xc4, 0xd4, 0x4f, 0xb8, 0x4f, 0x04, 0xf3, 0xd7, 0x5d, 0xdf, 0x0c, 0x5a, 0x36, 0xcc, 0x05, 0xbc, + 0xf8, 0x13, 0x00, 0x00, 0xff, 0xff, 0x33, 0xbc, 0xe4, 0x5b, 0xc1, 0x03, 0x00, 0x00, } diff --git a/source/go/api/v1/service_manage/contract.pb.go b/source/go/api/v1/service_manage/contract.pb.go index d1ab35a..440d50d 100644 --- a/source/go/api/v1/service_manage/contract.pb.go +++ b/source/go/api/v1/service_manage/contract.pb.go @@ -41,7 +41,7 @@ func (x InterfaceDescriptor_Source) String() string { return proto.EnumName(InterfaceDescriptor_Source_name, int32(x)) } func (InterfaceDescriptor_Source) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_contract_1ba849808bab54f1, []int{1, 0} + return fileDescriptor_contract_cc22240765a28406, []int{1, 0} } type ServiceContract struct { @@ -66,7 +66,9 @@ type ServiceContract struct { // 创建时间 Ctime string `protobuf:"bytes,10,opt,name=ctime,proto3" json:"ctime,omitempty"` // 更新时间 - Mtime string `protobuf:"bytes,11,opt,name=mtime,proto3" json:"mtime,omitempty"` + Mtime string `protobuf:"bytes,11,opt,name=mtime,proto3" json:"mtime,omitempty"` + // 接口状态，Offline/Online + Status string `protobuf:"bytes,12,opt,name=status,proto3" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -76,7 +78,7 @@ func (m *ServiceContract) Reset() { *m = ServiceContract{} } func (m *ServiceContract) String() string { return proto.CompactTextString(m) } func (*ServiceContract) ProtoMessage() {} func (*ServiceContract) Descriptor() ([]byte, []int) { - return fileDescriptor_contract_1ba849808bab54f1, []int{0} + return fileDescriptor_contract_cc22240765a28406, []int{0} } func (m *ServiceContract) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceContract.Unmarshal(m, b) @@ -173,6 +175,13 @@ func (m *ServiceContract) GetMtime() string { return "" } +func (m *ServiceContract) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + type InterfaceDescriptor struct { // 接口ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -189,9 +198,7 @@ type InterfaceDescriptor struct { // 创建时间 Ctime string `protobuf:"bytes,7,opt,name=ctime,proto3" json:"ctime,omitempty"` // 更新时间 - Mtime string `protobuf:"bytes,8,opt,name=mtime,proto3" json:"mtime,omitempty"` - // 接口状态，Offline/Online - Status string `protobuf:"bytes,9,opt,name=status,proto3" json:"status,omitempty"` + Mtime string `protobuf:"bytes,8,opt,name=mtime,proto3" json:"mtime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -201,7 +208,7 @@ func (m *InterfaceDescriptor) Reset() { *m = InterfaceDescriptor{} } func (m *InterfaceDescriptor) String() string { return proto.CompactTextString(m) } func (*InterfaceDescriptor) ProtoMessage() {} func (*InterfaceDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_contract_1ba849808bab54f1, []int{1} + return fileDescriptor_contract_cc22240765a28406, []int{1} } func (m *InterfaceDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InterfaceDescriptor.Unmarshal(m, b) @@ -277,49 +284,42 @@ func (m *InterfaceDescriptor) GetMtime() string { return "" } -func (m *InterfaceDescriptor) GetStatus() string { - if m != nil { - return m.Status - } - return "" -} - func init() { proto.RegisterType((*ServiceContract)(nil), "v1.ServiceContract") proto.RegisterType((*InterfaceDescriptor)(nil), "v1.InterfaceDescriptor") proto.RegisterEnum("v1.InterfaceDescriptor_Source", InterfaceDescriptor_Source_name, InterfaceDescriptor_Source_value) } -func init() { proto.RegisterFile("contract.proto", fileDescriptor_contract_1ba849808bab54f1) } +func init() { proto.RegisterFile("contract.proto", fileDescriptor_contract_cc22240765a28406) } -var fileDescriptor_contract_1ba849808bab54f1 = []byte{ - // 436 bytes of a gzipped FileDescriptorProto +var fileDescriptor_contract_cc22240765a28406 = []byte{ + // 437 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x5d, 0x6b, 0x13, 0x41, - 0x14, 0x35, 0xdb, 0x74, 0x93, 0xdc, 0x40, 0x0c, 0x63, 0xd1, 0x41, 0x44, 0x4a, 0x9e, 0xfa, 0xe2, - 0x2c, 0xa9, 0x60, 0xdf, 0xdb, 0xbe, 0x88, 0x18, 0x25, 0x45, 0x04, 0x5f, 0x64, 0x3a, 0xb9, 0x4d, - 0x06, 0xb2, 0x33, 0xcb, 0xcc, 0xdd, 0xfd, 0x27, 0xfe, 0x11, 0x7f, 0x80, 0xbf, 0x4d, 0xe6, 0x23, - 0x35, 0xa9, 0xed, 0xd3, 0xce, 0x39, 0xf7, 0x9e, 0xb3, 0x9c, 0xc3, 0x85, 0x89, 0xb2, 0x86, 0x9c, - 0x54, 0x24, 0x1a, 0x67, 0xc9, 0xb2, 0xa2, 0x9b, 0xcf, 0xfe, 0x14, 0xf0, 0xfc, 0x06, 0x5d, 0xa7, - 0x15, 0x5e, 0xe5, 0x29, 0x9b, 0x40, 0xa1, 0x57, 0xbc, 0x77, 0xda, 0x3b, 0x1b, 0x2d, 0x0b, 0xbd, - 0x62, 0x0c, 0xfa, 0x46, 0xd6, 0xc8, 0x8b, 0xc8, 0xc4, 0x37, 0x7b, 0x03, 0xa3, 0xf0, 0xf5, 0x8d, - 0x54, 0xc8, 0x8f, 0xe2, 0xe0, 0x1f, 0xc1, 0x38, 0x0c, 0x7c, 0x32, 0xe5, 0xfd, 0x38, 0xdb, 0x41, - 0xf6, 0x1a, 0x86, 0xf1, 0xe7, 0xca, 0x6e, 0xf9, 0x71, 0x1c, 0xdd, 0xe3, 0xa0, 0xea, 0xd0, 0x79, - 0x6d, 0x0d, 0x2f, 0x93, 0x2a, 0xc3, 0xa0, 0x72, 0xd8, 0xe9, 0x38, 0x1a, 0x24, 0xd5, 0x0e, 0x07, - 0x55, 0xc8, 0x85, 0x86, 0xf8, 0x30, 0xa9, 0x32, 0x64, 0x17, 0x00, 0xda, 0x10, 0xba, 0x3b, 0xa9, - 0xd0, 0xf3, 0xd1, 0xe9, 0xd1, 0xd9, 0xf8, 0xfc, 0x95, 0xe8, 0xe6, 0xe2, 0xe3, 0x8e, 0xbd, 0x46, - 0xaf, 0x9c, 0x6e, 0xc8, 0xba, 0xe5, 0xde, 0x2a, 0x3b, 0x81, 0x63, 0x45, 0xba, 0x46, 0x0e, 0xd1, - 0x30, 0x81, 0xc0, 0xd6, 0x91, 0x1d, 0x27, 0x36, 0x82, 0xd9, 0xef, 0x02, 0x5e, 0x3c, 0xe2, 0xf7, - 0x5f, 0x89, 0x2f, 0xa1, 0xac, 0x91, 0x36, 0x76, 0x95, 0x6b, 0xcc, 0x28, 0x94, 0xdb, 0x48, 0xda, - 0xe4, 0x0e, 0xe3, 0x7b, 0x3f, 0x52, 0xff, 0x30, 0xd2, 0x07, 0x28, 0xbd, 0x6d, 0x9d, 0xc2, 0x58, - 0xde, 0xe4, 0xfc, 0xed, 0x13, 0x71, 0xc4, 0x4d, 0xdc, 0x5a, 0xe6, 0xed, 0x83, 0x02, 0xcb, 0x07, - 0x05, 0xde, 0xa7, 0x1d, 0x3c, 0x9a, 0x76, 0xb8, 0x97, 0x36, 0xa4, 0xf0, 0x24, 0xa9, 0x0d, 0x75, - 0xc6, 0x14, 0x09, 0xcd, 0xde, 0x41, 0x99, 0xfe, 0xc8, 0xc6, 0x30, 0xf8, 0xb6, 0xf8, 0xb4, 0xf8, - 0xf2, 0x7d, 0x31, 0x7d, 0xc6, 0x00, 0xca, 0xcf, 0xd2, 0xb4, 0x72, 0x3b, 0xed, 0x85, 0xf7, 0xd5, - 0x56, 0xa3, 0xa1, 0x69, 0x71, 0xf9, 0xab, 0x07, 0x17, 0xca, 0xd6, 0x82, 0xd0, 0x28, 0x34, 0x24, - 0x1a, 0xbb, 0x95, 0x4e, 0x7b, 0xe1, 0x1b, 0x54, 0xfa, 0x4e, 0x2b, 0x49, 0xda, 0x1a, 0x21, 0x1b, - 0x1d, 0xe2, 0xe5, 0xd3, 0x11, 0xb5, 0x34, 0x72, 0x8d, 0x97, 0x27, 0x0f, 0xce, 0xf5, 0x6b, 0x38, - 0x9f, 0x1f, 0xd7, 0x6b, 0x4d, 0x9b, 0xf6, 0x56, 0x28, 0x5b, 0x57, 0xd9, 0xad, 0x46, 0xbf, 0xa9, - 0x0e, 0x1c, 0xab, 0xd4, 0x46, 0xb5, 0xb6, 0x95, 0x6c, 0x74, 0xd5, 0xcd, 0xab, 0xec, 0xfd, 0x33, - 0x79, 0xdf, 0x96, 0xf1, 0x16, 0xdf, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x84, 0x4a, 0xf0, 0x43, - 0x2a, 0x03, 0x00, 0x00, + 0x14, 0x35, 0xdb, 0x74, 0x93, 0xdc, 0x48, 0x0c, 0x63, 0xa9, 0x83, 0x88, 0x94, 0x3c, 0xf5, 0xc5, + 0x59, 0x52, 0xc1, 0xbe, 0xb7, 0x7d, 0x11, 0x31, 0x4a, 0x8a, 0x08, 0xbe, 0xc8, 0x74, 0x72, 0x9b, + 0x0c, 0x64, 0x67, 0x96, 0x99, 0x9b, 0xfd, 0x27, 0xbe, 0xf8, 0xc3, 0xfc, 0x3d, 0x32, 0x1f, 0xa9, + 0x49, 0x4d, 0x9f, 0x76, 0xce, 0xb9, 0xf7, 0x9c, 0xe5, 0x1c, 0x2e, 0x8c, 0x94, 0x35, 0xe4, 0xa4, + 0x22, 0xd1, 0x38, 0x4b, 0x96, 0x15, 0xed, 0x74, 0xf2, 0xa7, 0x80, 0x17, 0xb7, 0xe8, 0x5a, 0xad, + 0xf0, 0x3a, 0x4f, 0xd9, 0x08, 0x0a, 0xbd, 0xe0, 0x9d, 0xb3, 0xce, 0xf9, 0x60, 0x5e, 0xe8, 0x05, + 0x63, 0xd0, 0x35, 0xb2, 0x46, 0x5e, 0x44, 0x26, 0xbe, 0xd9, 0x1b, 0x18, 0x84, 0xaf, 0x6f, 0xa4, + 0x42, 0x7e, 0x14, 0x07, 0xff, 0x08, 0xc6, 0xa1, 0xe7, 0x93, 0x29, 0xef, 0xc6, 0xd9, 0x16, 0xb2, + 0xd7, 0xd0, 0x8f, 0x3f, 0x57, 0x76, 0xcd, 0x8f, 0xe3, 0xe8, 0x01, 0x07, 0x55, 0x8b, 0xce, 0x6b, + 0x6b, 0x78, 0x99, 0x54, 0x19, 0x06, 0x95, 0xc3, 0x56, 0xc7, 0x51, 0x2f, 0xa9, 0xb6, 0x38, 0xa8, + 0x42, 0x2e, 0x34, 0xc4, 0xfb, 0x49, 0x95, 0x21, 0xbb, 0x04, 0xd0, 0x86, 0xd0, 0xdd, 0x4b, 0x85, + 0x9e, 0x0f, 0xce, 0x8e, 0xce, 0x87, 0x17, 0xaf, 0x44, 0x3b, 0x15, 0x1f, 0xb7, 0xec, 0x0d, 0x7a, + 0xe5, 0x74, 0x43, 0xd6, 0xcd, 0x77, 0x56, 0xd9, 0x09, 0x1c, 0x2b, 0xd2, 0x35, 0x72, 0x88, 0x86, + 0x09, 0x04, 0xb6, 0x8e, 0xec, 0x30, 0xb1, 0x11, 0xb0, 0x53, 0x28, 0x3d, 0x49, 0xda, 0x78, 0xfe, + 0x3c, 0xd2, 0x19, 0x4d, 0x7e, 0x17, 0xf0, 0xf2, 0xc0, 0x7f, 0xfe, 0x2b, 0xf7, 0x14, 0xca, 0x1a, + 0x69, 0x65, 0x17, 0xb9, 0xde, 0x8c, 0x42, 0xe9, 0x8d, 0xa4, 0x55, 0xee, 0x36, 0xbe, 0x77, 0xa3, + 0x76, 0xf7, 0xa3, 0x7e, 0x80, 0xd2, 0xdb, 0x8d, 0x53, 0x18, 0x4b, 0x1d, 0x5d, 0xbc, 0x7d, 0x22, + 0xa6, 0xb8, 0x8d, 0x5b, 0xf3, 0xbc, 0xbd, 0x57, 0x6c, 0xf9, 0xa8, 0xd8, 0x87, 0x16, 0x7a, 0x07, + 0x5b, 0xe8, 0xef, 0xb4, 0x30, 0x79, 0x07, 0x65, 0x72, 0x66, 0x43, 0xe8, 0x7d, 0x9b, 0x7d, 0x9a, + 0x7d, 0xf9, 0x3e, 0x1b, 0x3f, 0x63, 0x00, 0xe5, 0x67, 0x69, 0x36, 0x72, 0x3d, 0xee, 0x84, 0xf7, + 0xf5, 0x5a, 0xa3, 0xa1, 0x71, 0x71, 0xf5, 0xab, 0x03, 0x97, 0xca, 0xd6, 0x82, 0xd0, 0x28, 0x34, + 0x24, 0x1a, 0xbb, 0x96, 0x4e, 0x7b, 0xe1, 0x1b, 0x54, 0xfa, 0x5e, 0x2b, 0x49, 0xda, 0x1a, 0x21, + 0x1b, 0x1d, 0x62, 0xe4, 0xd3, 0x11, 0xb5, 0x34, 0x72, 0x89, 0x57, 0x27, 0x8f, 0xce, 0xf5, 0x6b, + 0x38, 0x9f, 0x1f, 0x37, 0x4b, 0x4d, 0xab, 0xcd, 0x9d, 0x50, 0xb6, 0xae, 0xb2, 0x5b, 0x8d, 0x7e, + 0x55, 0xed, 0x39, 0x56, 0x29, 0x75, 0xb5, 0xb4, 0x95, 0x6c, 0x74, 0xd5, 0x4e, 0xab, 0xec, 0xfd, + 0x33, 0x79, 0xdf, 0x95, 0xf1, 0x16, 0xdf, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x53, 0x77, 0x70, + 0xdc, 0x2a, 0x03, 0x00, 0x00, }