From 41850196d9649495d97806ae4338ad7ac7a1b4a0 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Mon, 15 Jan 2024 21:27:17 +0800 Subject: [PATCH] feat:grpc cnofig client support UpsertAndPublishConfig(for support dubbo3.x) (#101) --- VERSION | 2 +- api/v1/config_manage/grpc_config_api.proto | 3 + api/v1/service_manage/contract.proto | 2 + .../v1/config_manage/grpc_config_api.pb.go | 92 +++++++++++++------ .../go/api/v1/service_manage/contract.pb.go | 79 +++++++++------- 5 files changed, 114 insertions(+), 64 deletions(-) diff --git a/VERSION b/VERSION index e21e727..bdf120f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0 \ No newline at end of file +1.4.2-SNAPSHOT \ No newline at end of file diff --git a/api/v1/config_manage/grpc_config_api.proto b/api/v1/config_manage/grpc_config_api.proto index e91d024..c610360 100644 --- a/api/v1/config_manage/grpc_config_api.proto +++ b/api/v1/config_manage/grpc_config_api.proto @@ -23,6 +23,9 @@ service PolarisConfigGRPC { // 发布配置 rpc PublishConfigFile(ConfigFileRelease) returns (ConfigClientResponse) {} + // 发布配置 + rpc UpsertAndPublishConfigFile(ConfigFilePublishInfo) returns (ConfigClientResponse) {} + // 订阅配置变更 rpc WatchConfigFiles(ClientWatchConfigFileRequest) returns (ConfigClientResponse) {} diff --git a/api/v1/service_manage/contract.proto b/api/v1/service_manage/contract.proto index d50e04e..0a0062a 100644 --- a/api/v1/service_manage/contract.proto +++ b/api/v1/service_manage/contract.proto @@ -56,4 +56,6 @@ message InterfaceDescriptor { string ctime = 7; // 更新时间 string mtime = 8; + // 接口名称描述信息 + string name = 9; } diff --git a/source/go/api/v1/config_manage/grpc_config_api.pb.go b/source/go/api/v1/config_manage/grpc_config_api.pb.go index bcce0a2..070dc4a 100644 --- a/source/go/api/v1/config_manage/grpc_config_api.pb.go +++ b/source/go/api/v1/config_manage/grpc_config_api.pb.go @@ -43,6 +43,8 @@ type PolarisConfigGRPCClient interface { UpdateConfigFile(ctx context.Context, in *ConfigFile, opts ...grpc.CallOption) (*ConfigClientResponse, error) // 发布配置 PublishConfigFile(ctx context.Context, in *ConfigFileRelease, opts ...grpc.CallOption) (*ConfigClientResponse, error) + // 发布配置 + UpsertAndPublishConfigFile(ctx context.Context, in *ConfigFilePublishInfo, opts ...grpc.CallOption) (*ConfigClientResponse, error) // 订阅配置变更 WatchConfigFiles(ctx context.Context, in *ClientWatchConfigFileRequest, opts ...grpc.CallOption) (*ConfigClientResponse, error) // 拉取指定配置分组下的配置文件列表 @@ -95,6 +97,15 @@ func (c *polarisConfigGRPCClient) PublishConfigFile(ctx context.Context, in *Con return out, nil } +func (c *polarisConfigGRPCClient) UpsertAndPublishConfigFile(ctx context.Context, in *ConfigFilePublishInfo, opts ...grpc.CallOption) (*ConfigClientResponse, error) { + out := new(ConfigClientResponse) + err := c.cc.Invoke(ctx, "/v1.PolarisConfigGRPC/UpsertAndPublishConfigFile", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *polarisConfigGRPCClient) WatchConfigFiles(ctx context.Context, in *ClientWatchConfigFileRequest, opts ...grpc.CallOption) (*ConfigClientResponse, error) { out := new(ConfigClientResponse) err := c.cc.Invoke(ctx, "/v1.PolarisConfigGRPC/WatchConfigFiles", in, out, opts...) @@ -154,6 +165,8 @@ type PolarisConfigGRPCServer interface { UpdateConfigFile(context.Context, *ConfigFile) (*ConfigClientResponse, error) // 发布配置 PublishConfigFile(context.Context, *ConfigFileRelease) (*ConfigClientResponse, error) + // 发布配置 + UpsertAndPublishConfigFile(context.Context, *ConfigFilePublishInfo) (*ConfigClientResponse, error) // 订阅配置变更 WatchConfigFiles(context.Context, *ClientWatchConfigFileRequest) (*ConfigClientResponse, error) // 拉取指定配置分组下的配置文件列表 @@ -238,6 +251,24 @@ func _PolarisConfigGRPC_PublishConfigFile_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _PolarisConfigGRPC_UpsertAndPublishConfigFile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ConfigFilePublishInfo) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(PolarisConfigGRPCServer).UpsertAndPublishConfigFile(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/v1.PolarisConfigGRPC/UpsertAndPublishConfigFile", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(PolarisConfigGRPCServer).UpsertAndPublishConfigFile(ctx, req.(*ConfigFilePublishInfo)) + } + return interceptor(ctx, in, info, handler) +} + func _PolarisConfigGRPC_WatchConfigFiles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ClientWatchConfigFileRequest) if err := dec(in); err != nil { @@ -320,6 +351,10 @@ var _PolarisConfigGRPC_serviceDesc = grpc.ServiceDesc{ MethodName: "PublishConfigFile", Handler: _PolarisConfigGRPC_PublishConfigFile_Handler, }, + { + MethodName: "UpsertAndPublishConfigFile", + Handler: _PolarisConfigGRPC_UpsertAndPublishConfigFile_Handler, + }, { MethodName: "WatchConfigFiles", Handler: _PolarisConfigGRPC_WatchConfigFiles_Handler, @@ -341,32 +376,33 @@ var _PolarisConfigGRPC_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("grpc_config_api.proto", fileDescriptor_grpc_config_api_095e88a30555fcfa) -} - -var fileDescriptor_grpc_config_api_095e88a30555fcfa = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0x9d, 0x88, 0x48, 0x40, 0xd9, 0x0a, 0x83, 0xad, 0x78, 0x10, 0x4f, 0x9e, 0x52, 0xab, - 0xe0, 0xd1, 0xc3, 0xaa, 0x2b, 0x82, 0x42, 0xa9, 0xc8, 0xc0, 0xcb, 0xc8, 0xb2, 0xd7, 0xee, 0x41, - 0x9b, 0xc4, 0x24, 0xed, 0x47, 0xd1, 0xaf, 0x2b, 0x5b, 0x5b, 0xd6, 0x4e, 0x99, 0xe0, 0xb1, 0xbf, - 0xff, 0x7b, 0xbf, 0x86, 0xc7, 0x9f, 0x0c, 0x53, 0xad, 0xf8, 0x9c, 0x4b, 0x91, 0x60, 0x3a, 0x67, - 0x0a, 0xa9, 0xd2, 0xd2, 0x4a, 0xe7, 0xb0, 0xf4, 0xdd, 0x41, 0x4d, 0x13, 0xcc, 0xa0, 0xc2, 0xae, - 0xdb, 0x42, 0x73, 0x0d, 0x46, 0x49, 0x61, 0xea, 0xec, 0xe6, 0xf3, 0x88, 0x0c, 0x22, 0x99, 0x31, - 0x8d, 0x26, 0xd8, 0x4c, 0x85, 0x71, 0x14, 0x38, 0x8f, 0xe4, 0x34, 0x04, 0x5b, 0x81, 0x29, 0x66, - 0xe0, 0x8c, 0x68, 0xe9, 0xd3, 0x20, 0x43, 0x10, 0x2d, 0xfa, 0x24, 0x12, 0xe9, 0x56, 0xc9, 0x86, - 0x55, 0x79, 0x5c, 0xff, 0xe0, 0xf2, 0xc0, 0xb9, 0x27, 0xfd, 0x40, 0x03, 0xb3, 0xd0, 0x32, 0x9d, - 0x6d, 0xe7, 0xd7, 0xdf, 0x7f, 0xed, 0xbf, 0xa9, 0xe5, 0xff, 0xf7, 0xa7, 0x64, 0x10, 0x15, 0x8b, - 0x0c, 0xcd, 0xaa, 0x25, 0x18, 0x76, 0x05, 0x31, 0x64, 0xc0, 0xcc, 0x7e, 0x4f, 0x44, 0xfa, 0x33, - 0x66, 0x79, 0xcb, 0x62, 0x9c, 0x8b, 0xed, 0x45, 0x76, 0xb2, 0x18, 0x3e, 0x0a, 0x30, 0x76, 0xaf, - 0x71, 0x46, 0xc6, 0x9d, 0x03, 0xbf, 0x80, 0x65, 0x4b, 0x66, 0xd9, 0x33, 0x1a, 0xeb, 0xb8, 0xdd, - 0x17, 0x86, 0x5a, 0x16, 0xaa, 0x91, 0x9e, 0xef, 0x4a, 0xd7, 0x1b, 0x2d, 0x71, 0x48, 0x4e, 0x1e, - 0xd0, 0x70, 0x59, 0x82, 0x76, 0xc6, 0xdb, 0xd9, 0x86, 0x35, 0x1a, 0xf7, 0xb7, 0xa8, 0x91, 0x5c, - 0xf5, 0xae, 0x7b, 0x93, 0xaf, 0x1e, 0xb9, 0xe3, 0x32, 0xa7, 0x16, 0x04, 0x07, 0x61, 0xa9, 0xaa, - 0x4a, 0x42, 0x8d, 0x02, 0x8e, 0x09, 0x72, 0x66, 0x51, 0x0a, 0xba, 0xee, 0x5e, 0xe9, 0xd3, 0xaa, - 0x60, 0x34, 0x67, 0x82, 0xa5, 0x30, 0x19, 0xfd, 0x28, 0xd4, 0x2b, 0xe8, 0x12, 0x39, 0xbc, 0x07, - 0x29, 0xda, 0x55, 0xb1, 0xa0, 0x5c, 0xe6, 0x5e, 0x2d, 0xcc, 0xc1, 0xac, 0xbc, 0x8e, 0xd4, 0x33, - 0xb2, 0xd0, 0x1c, 0xbc, 0x54, 0x7a, 0x4c, 0xa1, 0x57, 0xfa, 0x5e, 0xdd, 0xdf, 0x4a, 0xbf, 0x38, - 0xde, 0x34, 0xf7, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x33, 0x69, 0xb6, 0xfc, 0x05, 0x03, 0x00, - 0x00, + proto.RegisterFile("grpc_config_api.proto", fileDescriptor_grpc_config_api_40388cf54be59c45) +} + +var fileDescriptor_grpc_config_api_40388cf54be59c45 = []byte{ + // 378 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xc1, 0x6a, 0xe3, 0x30, + 0x10, 0x86, 0x37, 0xcb, 0xb2, 0x2c, 0x82, 0x5d, 0x12, 0x43, 0x20, 0x31, 0x7b, 0x58, 0xf6, 0xd4, + 0x93, 0x5c, 0xb7, 0xd0, 0x63, 0xa1, 0x71, 0x1b, 0x53, 0x68, 0xc1, 0x38, 0x84, 0x40, 0x2f, 0x41, + 0x51, 0xc6, 0xce, 0x80, 0x2d, 0xa9, 0x92, 0xec, 0x57, 0xe9, 0x43, 0xf6, 0x25, 0x4a, 0x62, 0x9b, + 0xd8, 0x49, 0x49, 0xa0, 0x47, 0xff, 0xff, 0xcc, 0x67, 0x69, 0xf4, 0x0f, 0x19, 0xa6, 0x5a, 0xf1, + 0x25, 0x97, 0x22, 0xc1, 0x74, 0xc9, 0x14, 0x52, 0xa5, 0xa5, 0x95, 0xce, 0xf7, 0xd2, 0x77, 0x07, + 0xb5, 0x9a, 0x60, 0x06, 0x95, 0xec, 0xba, 0x2d, 0x69, 0xa9, 0xc1, 0x28, 0x29, 0x4c, 0xed, 0x5d, + 0xbd, 0xff, 0x20, 0x83, 0x48, 0x66, 0x4c, 0xa3, 0x09, 0x76, 0x55, 0x61, 0x1c, 0x05, 0xce, 0x03, + 0xf9, 0x1d, 0x82, 0xad, 0x84, 0x29, 0x66, 0xe0, 0x8c, 0x68, 0xe9, 0xd3, 0x20, 0x43, 0x10, 0x2d, + 0xf5, 0x51, 0x24, 0xd2, 0xad, 0x9c, 0x9d, 0x56, 0xf9, 0x71, 0xfd, 0x83, 0xff, 0xdf, 0x9c, 0x5b, + 0xd2, 0x0f, 0x34, 0x30, 0x0b, 0x2d, 0xd2, 0x9f, 0x7d, 0xfd, 0xf6, 0xfb, 0x5c, 0xff, 0x5c, 0xad, + 0xbf, 0xde, 0x3f, 0x25, 0x83, 0xa8, 0x58, 0x65, 0x68, 0x36, 0x2d, 0xc0, 0xb0, 0x0b, 0x88, 0x21, + 0x03, 0x66, 0x4e, 0x73, 0x66, 0xc4, 0x9d, 0x2b, 0x03, 0xda, 0xde, 0x89, 0xf5, 0x31, 0x70, 0xdc, + 0x05, 0xd6, 0x05, 0x67, 0x87, 0x13, 0x91, 0xfe, 0x82, 0x59, 0xde, 0x22, 0x19, 0xe7, 0xdf, 0x7e, + 0xcc, 0x07, 0x5e, 0x0c, 0xaf, 0x05, 0x18, 0x7b, 0x92, 0xb8, 0x20, 0xe3, 0xce, 0xab, 0x3d, 0x83, + 0x65, 0x6b, 0x66, 0xd9, 0x13, 0x1a, 0xeb, 0xb8, 0xdd, 0x53, 0x86, 0x5a, 0x16, 0xaa, 0x81, 0xfe, + 0x3d, 0x84, 0x6e, 0x3b, 0x5a, 0xe0, 0x90, 0xfc, 0xba, 0x47, 0xc3, 0x65, 0x09, 0xba, 0x7d, 0xdb, + 0x46, 0x6b, 0x30, 0xee, 0x67, 0x56, 0x03, 0xb9, 0xe8, 0x5d, 0xf6, 0x26, 0x6f, 0x3d, 0x72, 0xc3, + 0x65, 0x4e, 0x2d, 0x08, 0x0e, 0xc2, 0x52, 0x55, 0x25, 0x8f, 0x1a, 0x05, 0x1c, 0x13, 0xe4, 0xcc, + 0xa2, 0x14, 0x74, 0x1b, 0xe8, 0xd2, 0xa7, 0x55, 0x6a, 0x69, 0xce, 0x04, 0x4b, 0x61, 0x32, 0x3a, + 0x4a, 0xe9, 0x0c, 0x74, 0x89, 0x1c, 0x5e, 0x82, 0x14, 0xed, 0xa6, 0x58, 0x51, 0x2e, 0x73, 0xaf, + 0x06, 0xe6, 0x60, 0x36, 0x5e, 0x07, 0xea, 0x19, 0x59, 0x68, 0x0e, 0x5e, 0x2a, 0x3d, 0xa6, 0xd0, + 0x2b, 0x7d, 0xaf, 0x5e, 0x8a, 0x0a, 0xbf, 0xfa, 0xb9, 0x5b, 0x87, 0xeb, 0x8f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x1e, 0xe3, 0x11, 0x0b, 0x5a, 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 440d50d..f61f1a7 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_cc22240765a28406, []int{1, 0} + return fileDescriptor_contract_c6fbd3ddb5d28a0b, []int{1, 0} } type ServiceContract struct { @@ -78,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_cc22240765a28406, []int{0} + return fileDescriptor_contract_c6fbd3ddb5d28a0b, []int{0} } func (m *ServiceContract) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ServiceContract.Unmarshal(m, b) @@ -198,7 +198,9 @@ 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"` + Mtime string `protobuf:"bytes,8,opt,name=mtime,proto3" json:"mtime,omitempty"` + // 接口名称描述信息 + Name string `protobuf:"bytes,9,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -208,7 +210,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_cc22240765a28406, []int{1} + return fileDescriptor_contract_c6fbd3ddb5d28a0b, []int{1} } func (m *InterfaceDescriptor) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InterfaceDescriptor.Unmarshal(m, b) @@ -284,42 +286,49 @@ func (m *InterfaceDescriptor) GetMtime() string { return "" } +func (m *InterfaceDescriptor) GetName() string { + if m != nil { + return m.Name + } + 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_cc22240765a28406) } - -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, 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, +func init() { proto.RegisterFile("contract.proto", fileDescriptor_contract_c6fbd3ddb5d28a0b) } + +var fileDescriptor_contract_c6fbd3ddb5d28a0b = []byte{ + // 443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x4d, 0x6f, 0x13, 0x31, + 0x14, 0x24, 0xdb, 0x74, 0x93, 0xbc, 0xa0, 0x10, 0x99, 0xaa, 0x58, 0x08, 0xa1, 0x2a, 0xa7, 0x5e, + 0xf0, 0x2a, 0x45, 0xa2, 0xf7, 0xb6, 0x17, 0x84, 0x08, 0x28, 0x15, 0x42, 0xe2, 0x82, 0x5c, 0xe7, + 0x35, 0xb1, 0x94, 0xb5, 0x57, 0xf6, 0xcb, 0xfe, 0x13, 0xfe, 0x06, 0x3f, 0x87, 0xdf, 0x83, 0xfc, + 0x91, 0x36, 0x29, 0xe1, 0x64, 0xcf, 0x3c, 0xcf, 0x58, 0x6f, 0x34, 0x30, 0x52, 0xd6, 0x90, 0x93, + 0x8a, 0x44, 0xe3, 0x2c, 0x59, 0x56, 0xb4, 0xd3, 0xc9, 0x9f, 0x02, 0x5e, 0xdc, 0xa2, 0x6b, 0xb5, + 0xc2, 0xeb, 0x3c, 0x65, 0x23, 0x28, 0xf4, 0x82, 0x77, 0xce, 0x3a, 0xe7, 0x83, 0x79, 0xa1, 0x17, + 0x8c, 0x41, 0xd7, 0xc8, 0x1a, 0x79, 0x11, 0x99, 0x78, 0x67, 0x6f, 0x60, 0x10, 0x4e, 0xdf, 0x48, + 0x85, 0xfc, 0x28, 0x0e, 0x1e, 0x09, 0xc6, 0xa1, 0xe7, 0x93, 0x29, 0xef, 0xc6, 0xd9, 0x16, 0xb2, + 0xd7, 0xd0, 0x8f, 0x9f, 0x2b, 0xbb, 0xe6, 0xc7, 0x71, 0xf4, 0x80, 0x83, 0xaa, 0x45, 0xe7, 0xb5, + 0x35, 0xbc, 0x4c, 0xaa, 0x0c, 0x83, 0xca, 0x61, 0xab, 0xe3, 0xa8, 0x97, 0x54, 0x5b, 0x1c, 0x54, + 0x61, 0x2f, 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, + 0xe5, 0x74, 0x43, 0xd6, 0xcd, 0x77, 0x9e, 0xb2, 0x13, 0x38, 0x56, 0xa4, 0x6b, 0xe4, 0x10, 0x0d, + 0x13, 0x08, 0x6c, 0x1d, 0xd9, 0x61, 0x62, 0x23, 0x60, 0xa7, 0x50, 0x7a, 0x92, 0xb4, 0xf1, 0xfc, + 0x79, 0xa4, 0x33, 0x9a, 0xfc, 0x2e, 0xe0, 0xe5, 0x81, 0x7f, 0xfe, 0x09, 0xf7, 0x14, 0xca, 0x1a, + 0x69, 0x65, 0x17, 0x39, 0xde, 0x8c, 0x42, 0xe8, 0x8d, 0xa4, 0x55, 0xce, 0x36, 0xde, 0x77, 0x57, + 0xed, 0xee, 0xaf, 0xfa, 0x01, 0x4a, 0x6f, 0x37, 0x4e, 0x61, 0x0c, 0x75, 0x74, 0xf1, 0xf6, 0x3f, + 0x6b, 0x8a, 0xdb, 0xf8, 0x6a, 0x9e, 0x5f, 0xef, 0x05, 0x5b, 0x3e, 0x09, 0xf6, 0x21, 0x85, 0xde, + 0xc1, 0x14, 0xfa, 0xbb, 0x29, 0x6c, 0x2b, 0x32, 0x78, 0xac, 0xc8, 0xe4, 0x1d, 0x94, 0xe9, 0x37, + 0x36, 0x84, 0xde, 0xb7, 0xd9, 0xa7, 0xd9, 0x97, 0xef, 0xb3, 0xf1, 0x33, 0x06, 0x50, 0x7e, 0x96, + 0x66, 0x23, 0xd7, 0xe3, 0x4e, 0xb8, 0x5f, 0xaf, 0x35, 0x1a, 0x1a, 0x17, 0x57, 0xbf, 0x3a, 0x70, + 0xa9, 0x6c, 0x2d, 0x08, 0x8d, 0x42, 0x43, 0xa2, 0xb1, 0x6b, 0xe9, 0xb4, 0x17, 0xbe, 0x41, 0xa5, + 0xef, 0xb5, 0x92, 0xa4, 0xad, 0x11, 0xb2, 0xd1, 0x61, 0xb5, 0x5c, 0x27, 0x51, 0x4b, 0x23, 0x97, + 0x78, 0x75, 0xf2, 0xa4, 0xc2, 0x5f, 0x43, 0xa5, 0x7e, 0xdc, 0x2c, 0x35, 0xad, 0x36, 0x77, 0x42, + 0xd9, 0xba, 0xca, 0x6e, 0x35, 0xfa, 0x55, 0xb5, 0xe7, 0x58, 0xa5, 0x24, 0xaa, 0xa5, 0xad, 0x64, + 0xa3, 0xab, 0x76, 0x5a, 0x65, 0xef, 0x9f, 0xc9, 0xfb, 0xae, 0x8c, 0xfd, 0x7c, 0xff, 0x37, 0x00, + 0x00, 0xff, 0xff, 0xd9, 0x7a, 0xc4, 0xbc, 0x3e, 0x03, 0x00, 0x00, }