ws and push update

pkg/proto/relay/relay.pb.go

@@ -37,7 +37,7 @@ func (m *OnlinePushMsgReq) Reset()         { *m = OnlinePushMsgReq{} }
 func (m *OnlinePushMsgReq) String() string { return proto.CompactTextString(m) }
 func (*OnlinePushMsgReq) ProtoMessage()    {}
 func (*OnlinePushMsgReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{0}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{0}
 }
 func (m *OnlinePushMsgReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlinePushMsgReq.Unmarshal(m, b)
@@ -79,7 +79,7 @@ func (m *OnlinePushMsgReq) GetPushToUserID() string {
 }
 
 type OnlinePushMsgResp struct {
-	Resp                 []*SingleMsgToUser `protobuf:"bytes,1,rep,name=resp" json:"resp,omitempty"`
+	Resp                 []*SingleMsgToUserPlatform `protobuf:"bytes,1,rep,name=resp" json:"resp,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
 	XXX_unrecognized     []byte                     `json:"-"`
 	XXX_sizecache        int32                      `json:"-"`
@@ -89,7 +89,7 @@ func (m *OnlinePushMsgResp) Reset()         { *m = OnlinePushMsgResp{} }
 func (m *OnlinePushMsgResp) String() string { return proto.CompactTextString(m) }
 func (*OnlinePushMsgResp) ProtoMessage()    {}
 func (*OnlinePushMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{1}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{1}
 }
 func (m *OnlinePushMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OnlinePushMsgResp.Unmarshal(m, b)
@@ -109,14 +109,152 @@ func (m *OnlinePushMsgResp) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_OnlinePushMsgResp proto.InternalMessageInfo
 
-func (m *OnlinePushMsgResp) GetResp() []*SingleMsgToUser {
+func (m *OnlinePushMsgResp) GetResp() []*SingleMsgToUserPlatform {
 	if m != nil {
 		return m.Resp
 	}
 	return nil
 }
 
-type SingleMsgToUser struct {
+type SingelMsgToUserResultList struct {
+	UserID               string                     `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"`
+	Resp                 []*SingleMsgToUserPlatform `protobuf:"bytes,2,rep,name=resp" json:"resp,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
+	XXX_unrecognized     []byte                     `json:"-"`
+	XXX_sizecache        int32                      `json:"-"`
+}
+
+func (m *SingelMsgToUserResultList) Reset()         { *m = SingelMsgToUserResultList{} }
+func (m *SingelMsgToUserResultList) String() string { return proto.CompactTextString(m) }
+func (*SingelMsgToUserResultList) ProtoMessage()    {}
+func (*SingelMsgToUserResultList) Descriptor() ([]byte, []int) {
+	return fileDescriptor_relay_72b82cfd7861903a, []int{2}
+}
+func (m *SingelMsgToUserResultList) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SingelMsgToUserResultList.Unmarshal(m, b)
+}
+func (m *SingelMsgToUserResultList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SingelMsgToUserResultList.Marshal(b, m, deterministic)
+}
+func (dst *SingelMsgToUserResultList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SingelMsgToUserResultList.Merge(dst, src)
+}
+func (m *SingelMsgToUserResultList) XXX_Size() int {
+	return xxx_messageInfo_SingelMsgToUserResultList.Size(m)
+}
+func (m *SingelMsgToUserResultList) XXX_DiscardUnknown() {
+	xxx_messageInfo_SingelMsgToUserResultList.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SingelMsgToUserResultList proto.InternalMessageInfo
+
+func (m *SingelMsgToUserResultList) GetUserID() string {
+	if m != nil {
+		return m.UserID
+	}
+	return ""
+}
+
+func (m *SingelMsgToUserResultList) GetResp() []*SingleMsgToUserPlatform {
+	if m != nil {
+		return m.Resp
+	}
+	return nil
+}
+
+type OnlineBatchPushOneMsgReq struct {
+	OperationID          string          `protobuf:"bytes,1,opt,name=OperationID" json:"OperationID,omitempty"`
+	MsgData              *sdk_ws.MsgData `protobuf:"bytes,2,opt,name=msgData" json:"msgData,omitempty"`
+	PushToUserIDList     []string        `protobuf:"bytes,3,rep,name=pushToUserIDList" json:"pushToUserIDList,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *OnlineBatchPushOneMsgReq) Reset()         { *m = OnlineBatchPushOneMsgReq{} }
+func (m *OnlineBatchPushOneMsgReq) String() string { return proto.CompactTextString(m) }
+func (*OnlineBatchPushOneMsgReq) ProtoMessage()    {}
+func (*OnlineBatchPushOneMsgReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_relay_72b82cfd7861903a, []int{3}
+}
+func (m *OnlineBatchPushOneMsgReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OnlineBatchPushOneMsgReq.Unmarshal(m, b)
+}
+func (m *OnlineBatchPushOneMsgReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OnlineBatchPushOneMsgReq.Marshal(b, m, deterministic)
+}
+func (dst *OnlineBatchPushOneMsgReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OnlineBatchPushOneMsgReq.Merge(dst, src)
+}
+func (m *OnlineBatchPushOneMsgReq) XXX_Size() int {
+	return xxx_messageInfo_OnlineBatchPushOneMsgReq.Size(m)
+}
+func (m *OnlineBatchPushOneMsgReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_OnlineBatchPushOneMsgReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OnlineBatchPushOneMsgReq proto.InternalMessageInfo
+
+func (m *OnlineBatchPushOneMsgReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+func (m *OnlineBatchPushOneMsgReq) GetMsgData() *sdk_ws.MsgData {
+	if m != nil {
+		return m.MsgData
+	}
+	return nil
+}
+
+func (m *OnlineBatchPushOneMsgReq) GetPushToUserIDList() []string {
+	if m != nil {
+		return m.PushToUserIDList
+	}
+	return nil
+}
+
+type OnlineBatchPushOneMsgResp struct {
+	SinglePushResult     []*SingelMsgToUserResultList `protobuf:"bytes,1,rep,name=singlePushResult" json:"singlePushResult,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
+	XXX_unrecognized     []byte                       `json:"-"`
+	XXX_sizecache        int32                        `json:"-"`
+}
+
+func (m *OnlineBatchPushOneMsgResp) Reset()         { *m = OnlineBatchPushOneMsgResp{} }
+func (m *OnlineBatchPushOneMsgResp) String() string { return proto.CompactTextString(m) }
+func (*OnlineBatchPushOneMsgResp) ProtoMessage()    {}
+func (*OnlineBatchPushOneMsgResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_relay_72b82cfd7861903a, []int{4}
+}
+func (m *OnlineBatchPushOneMsgResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OnlineBatchPushOneMsgResp.Unmarshal(m, b)
+}
+func (m *OnlineBatchPushOneMsgResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_OnlineBatchPushOneMsgResp.Marshal(b, m, deterministic)
+}
+func (dst *OnlineBatchPushOneMsgResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OnlineBatchPushOneMsgResp.Merge(dst, src)
+}
+func (m *OnlineBatchPushOneMsgResp) XXX_Size() int {
+	return xxx_messageInfo_OnlineBatchPushOneMsgResp.Size(m)
+}
+func (m *OnlineBatchPushOneMsgResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_OnlineBatchPushOneMsgResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OnlineBatchPushOneMsgResp proto.InternalMessageInfo
+
+func (m *OnlineBatchPushOneMsgResp) GetSinglePushResult() []*SingelMsgToUserResultList {
+	if m != nil {
+		return m.SinglePushResult
+	}
+	return nil
+}
+
+type SingleMsgToUserPlatform struct {
 	ResultCode           int64    `protobuf:"varint,1,opt,name=ResultCode" json:"ResultCode,omitempty"`
 	RecvID               string   `protobuf:"bytes,2,opt,name=RecvID" json:"RecvID,omitempty"`
 	RecvPlatFormID       int32    `protobuf:"varint,3,opt,name=RecvPlatFormID" json:"RecvPlatFormID,omitempty"`
@@ -125,45 +263,45 @@ type SingleMsgToUser struct {
 	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *SingleMsgToUser) Reset()         { *m = SingleMsgToUser{} }
+func (m *SingleMsgToUserPlatform) Reset()         { *m = SingleMsgToUserPlatform{} }
-func (m *SingleMsgToUser) String() string { return proto.CompactTextString(m) }
+func (m *SingleMsgToUserPlatform) String() string { return proto.CompactTextString(m) }
-func (*SingleMsgToUser) ProtoMessage()    {}
+func (*SingleMsgToUserPlatform) ProtoMessage()    {}
-func (*SingleMsgToUser) Descriptor() ([]byte, []int) {
+func (*SingleMsgToUserPlatform) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{2}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{5}
 }
-func (m *SingleMsgToUser) XXX_Unmarshal(b []byte) error {
+func (m *SingleMsgToUserPlatform) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SingleMsgToUser.Unmarshal(m, b)
+	return xxx_messageInfo_SingleMsgToUserPlatform.Unmarshal(m, b)
 }
-func (m *SingleMsgToUser) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *SingleMsgToUserPlatform) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SingleMsgToUser.Marshal(b, m, deterministic)
+	return xxx_messageInfo_SingleMsgToUserPlatform.Marshal(b, m, deterministic)
 }
-func (dst *SingleMsgToUser) XXX_Merge(src proto.Message) {
+func (dst *SingleMsgToUserPlatform) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SingleMsgToUser.Merge(dst, src)
+	xxx_messageInfo_SingleMsgToUserPlatform.Merge(dst, src)
 }
-func (m *SingleMsgToUser) XXX_Size() int {
+func (m *SingleMsgToUserPlatform) XXX_Size() int {
-	return xxx_messageInfo_SingleMsgToUser.Size(m)
+	return xxx_messageInfo_SingleMsgToUserPlatform.Size(m)
 }
-func (m *SingleMsgToUser) XXX_DiscardUnknown() {
+func (m *SingleMsgToUserPlatform) XXX_DiscardUnknown() {
-	xxx_messageInfo_SingleMsgToUser.DiscardUnknown(m)
+	xxx_messageInfo_SingleMsgToUserPlatform.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_SingleMsgToUser proto.InternalMessageInfo
+var xxx_messageInfo_SingleMsgToUserPlatform proto.InternalMessageInfo
 
-func (m *SingleMsgToUser) GetResultCode() int64 {
+func (m *SingleMsgToUserPlatform) GetResultCode() int64 {
 	if m != nil {
 		return m.ResultCode
 	}
 	return 0
 }
 
-func (m *SingleMsgToUser) GetRecvID() string {
+func (m *SingleMsgToUserPlatform) GetRecvID() string {
 	if m != nil {
 		return m.RecvID
 	}
 	return ""
 }
 
-func (m *SingleMsgToUser) GetRecvPlatFormID() int32 {
+func (m *SingleMsgToUserPlatform) GetRecvPlatFormID() int32 {
 	if m != nil {
 		return m.RecvPlatFormID
 	}
@@ -183,7 +321,7 @@ func (m *GetUsersOnlineStatusReq) Reset()         { *m = GetUsersOnlineStatusReq
 func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusReq) ProtoMessage()    {}
 func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{3}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{6}
 }
 func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b)
@@ -238,7 +376,7 @@ func (m *GetUsersOnlineStatusResp) Reset()         { *m = GetUsersOnlineStatusRe
 func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{4}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{7}
 }
 func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b)
@@ -300,7 +438,7 @@ func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() {
 func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{4, 0}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{7, 0}
 }
 func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b)
@@ -347,7 +485,7 @@ func (m *GetUsersOnlineStatusResp_FailedDetail) Reset()         { *m = GetUsersO
 func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{4, 1}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{7, 1}
 }
 func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b)
@@ -403,7 +541,7 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() {
 func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) }
 func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage()    {}
 func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_relay_34094e5333f6005a, []int{4, 2}
+	return fileDescriptor_relay_72b82cfd7861903a, []int{7, 2}
 }
 func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b)
@@ -447,7 +585,10 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) GetDetailPlatformStatus() []*Ge
 func init() {
 	proto.RegisterType((*OnlinePushMsgReq)(nil), "relay.OnlinePushMsgReq")
 	proto.RegisterType((*OnlinePushMsgResp)(nil), "relay.OnlinePushMsgResp")
-	proto.RegisterType((*SingleMsgToUser)(nil), "relay.SingleMsgToUser")
+	proto.RegisterType((*SingelMsgToUserResultList)(nil), "relay.SingelMsgToUserResultList")
+	proto.RegisterType((*OnlineBatchPushOneMsgReq)(nil), "relay.OnlineBatchPushOneMsgReq")
+	proto.RegisterType((*OnlineBatchPushOneMsgResp)(nil), "relay.OnlineBatchPushOneMsgResp")
+	proto.RegisterType((*SingleMsgToUserPlatform)(nil), "relay.SingleMsgToUserPlatform")
 	proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "relay.GetUsersOnlineStatusReq")
 	proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "relay.GetUsersOnlineStatusResp")
 	proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "relay.GetUsersOnlineStatusResp.SuccessDetail")
@@ -468,6 +609,7 @@ const _ = grpc.SupportPackageIsVersion4
 type OnlineMessageRelayServiceClient interface {
 	OnlinePushMsg(ctx context.Context, in *OnlinePushMsgReq, opts ...grpc.CallOption) (*OnlinePushMsgResp, error)
 	GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error)
+	OnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error)
 }
 
 type onlineMessageRelayServiceClient struct {
@@ -496,11 +638,21 @@ func (c *onlineMessageRelayServiceClient) GetUsersOnlineStatus(ctx context.Conte
 	return out, nil
 }
 
+func (c *onlineMessageRelayServiceClient) OnlineBatchPushOneMsg(ctx context.Context, in *OnlineBatchPushOneMsgReq, opts ...grpc.CallOption) (*OnlineBatchPushOneMsgResp, error) {
+	out := new(OnlineBatchPushOneMsgResp)
+	err := grpc.Invoke(ctx, "/relay.OnlineMessageRelayService/OnlineBatchPushOneMsg", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for OnlineMessageRelayService service
 
 type OnlineMessageRelayServiceServer interface {
 	OnlinePushMsg(context.Context, *OnlinePushMsgReq) (*OnlinePushMsgResp, error)
 	GetUsersOnlineStatus(context.Context, *GetUsersOnlineStatusReq) (*GetUsersOnlineStatusResp, error)
+	OnlineBatchPushOneMsg(context.Context, *OnlineBatchPushOneMsgReq) (*OnlineBatchPushOneMsgResp, error)
 }
 
 func RegisterOnlineMessageRelayServiceServer(s *grpc.Server, srv OnlineMessageRelayServiceServer) {
@@ -543,6 +695,24 @@ func _OnlineMessageRelayService_GetUsersOnlineStatus_Handler(srv interface{}, ct
 	return interceptor(ctx, in, info, handler)
 }
 
+func _OnlineMessageRelayService_OnlineBatchPushOneMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(OnlineBatchPushOneMsgReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OnlineMessageRelayServiceServer).OnlineBatchPushOneMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/relay.OnlineMessageRelayService/OnlineBatchPushOneMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OnlineMessageRelayServiceServer).OnlineBatchPushOneMsg(ctx, req.(*OnlineBatchPushOneMsgReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "relay.OnlineMessageRelayService",
 	HandlerType: (*OnlineMessageRelayServiceServer)(nil),
@@ -555,48 +725,58 @@ var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetUsersOnlineStatus",
 			Handler:    _OnlineMessageRelayService_GetUsersOnlineStatus_Handler,
 		},
+		{
+			MethodName: "OnlineBatchPushOneMsg",
+			Handler:    _OnlineMessageRelayService_OnlineBatchPushOneMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "relay/relay.proto",
 }
 
-func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_34094e5333f6005a) }
+func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_72b82cfd7861903a) }
-
+
-var fileDescriptor_relay_34094e5333f6005a = []byte{
+var fileDescriptor_relay_72b82cfd7861903a = []byte{
-	// 554 bytes of a gzipped FileDescriptorProto
+	// 656 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5d, 0x8f, 0xd2, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x4f, 0xdb, 0x4e,
-	0x14, 0x4d, 0x65, 0x3f, 0xdc, 0x0b, 0xb8, 0x32, 0xd9, 0xec, 0xd6, 0x3e, 0x20, 0xf6, 0xc1, 0x10,
+	0x10, 0x95, 0x31, 0x7f, 0x7e, 0x0c, 0xf0, 0x2b, 0xac, 0x68, 0x31, 0x3e, 0x04, 0xd7, 0x87, 0x2a,
-	0xa3, 0x25, 0x41, 0xdf, 0x7c, 0x30, 0xd9, 0x25, 0x6b, 0x48, 0x6c, 0x20, 0x83, 0x46, 0xe3, 0x0b,
+	0xaa, 0xda, 0x44, 0x4a, 0x7b, 0xeb, 0x0d, 0x22, 0x50, 0x24, 0xa2, 0xa0, 0x4d, 0xab, 0x56, 0x5c,
-	0x99, 0x85, 0xbb, 0xdd, 0x66, 0x0b, 0x1d, 0xe6, 0xb6, 0x10, 0xff, 0x84, 0x3f, 0xc2, 0x3f, 0xa1,
+	0xa2, 0x25, 0x59, 0x8c, 0x85, 0x13, 0x2f, 0x3b, 0x36, 0x88, 0x2f, 0xd1, 0x53, 0xcf, 0x3d, 0xf4,
-	0x3f, 0xcf, 0x74, 0xa6, 0x60, 0x4b, 0x58, 0x37, 0xfb, 0x42, 0x38, 0x77, 0xee, 0x3d, 0xf7, 0x9c,
+	0x4b, 0xf4, 0xeb, 0x55, 0xfb, 0x27, 0xa9, 0x0d, 0x0e, 0x28, 0x87, 0x5e, 0xa2, 0xcc, 0xec, 0xec,
-	0xd3, 0x76, 0xa0, 0xa1, 0x30, 0x12, 0x3f, 0x3a, 0xfa, 0xd7, 0x93, 0x2a, 0x4e, 0x62, 0xb6, 0xaf,
+	0x9b, 0xf7, 0xde, 0xec, 0xae, 0x61, 0x47, 0xf2, 0x84, 0xdd, 0x37, 0xf5, 0x6f, 0x43, 0xc8, 0x34,
-	0x81, 0xf3, 0x62, 0x20, 0x71, 0x3e, 0xee, 0xfb, 0x1d, 0x79, 0x1b, 0x74, 0xf4, 0x49, 0x87, 0xa6,
+	0x4b, 0xc9, 0x8a, 0x0e, 0xfc, 0xd7, 0x3d, 0xc1, 0x27, 0x83, 0x4e, 0xb7, 0x29, 0xae, 0xa3, 0xa6,
-	0xb7, 0xe3, 0x15, 0x75, 0x56, 0x64, 0x3a, 0xdd, 0x9f, 0x16, 0x3c, 0x1d, 0xcc, 0xa3, 0x70, 0x8e,
+	0x5e, 0x69, 0xe2, 0xe8, 0x7a, 0x70, 0x87, 0xcd, 0x3b, 0x34, 0x95, 0xe1, 0x77, 0x07, 0xb6, 0x7b,
-	0xc3, 0x94, 0x6e, 0x7c, 0x0a, 0x38, 0x2e, 0x58, 0x0b, 0xaa, 0x03, 0x89, 0x4a, 0x24, 0x61, 0x3c,
+	0x93, 0x24, 0x9e, 0xf0, 0xb3, 0x1c, 0xaf, 0xba, 0x18, 0x51, 0x7e, 0x43, 0x02, 0xd8, 0xe8, 0x09,
-	0xef, 0xf7, 0x6c, 0xab, 0x65, 0xb5, 0x8f, 0x78, 0xb1, 0xc4, 0xde, 0xc1, 0xe1, 0x8c, 0x82, 0x9e,
+	0x2e, 0x59, 0x16, 0xa7, 0x93, 0x4e, 0xdb, 0x73, 0x02, 0xa7, 0xbe, 0x4e, 0x8b, 0x29, 0xf2, 0x11,
-	0x48, 0x84, 0xfd, 0xa8, 0x65, 0xb5, 0xab, 0x5d, 0xc7, 0x23, 0x54, 0x4b, 0x54, 0x63, 0x21, 0xc3,
+	0xd6, 0xc6, 0x18, 0xb5, 0x59, 0xc6, 0xbc, 0xa5, 0xc0, 0xa9, 0x6f, 0xb4, 0xfc, 0x06, 0x72, 0x79,
-	0xb1, 0x14, 0x4a, 0xcc, 0xc8, 0xf3, 0x4d, 0x07, 0x5f, 0xb7, 0x32, 0x17, 0x6a, 0x32, 0xa5, 0x9b,
+	0xcb, 0xe5, 0x80, 0x89, 0x78, 0x20, 0x98, 0x64, 0x63, 0x6c, 0x74, 0x4d, 0x05, 0x9d, 0x96, 0x92,
-	0xcf, 0xf1, 0x17, 0x42, 0xd5, 0xef, 0xd9, 0x15, 0x4d, 0x5c, 0xaa, 0xb9, 0x1f, 0xa0, 0xb1, 0xa5,
+	0x10, 0x36, 0x45, 0x8e, 0x57, 0x9f, 0xd3, 0x2f, 0xc8, 0x65, 0xa7, 0xed, 0xb9, 0x1a, 0xb8, 0x94,
-	0x87, 0x24, 0x7b, 0x05, 0x7b, 0x0a, 0x49, 0xda, 0x56, 0xab, 0xd2, 0xae, 0x76, 0x4f, 0x3d, 0xe3,
+	0x0b, 0x4f, 0x60, 0xe7, 0x01, 0x1f, 0x14, 0xa4, 0x05, 0xcb, 0x92, 0xa3, 0xf0, 0x9c, 0xc0, 0xad,
-	0x75, 0x14, 0xce, 0x83, 0x08, 0x7d, 0x0a, 0xcc, 0x30, 0xd7, 0x3d, 0xee, 0x02, 0x8e, 0xb7, 0x0e,
+	0x6f, 0xb4, 0x6a, 0x0d, 0xa3, 0xb5, 0x1f, 0x4f, 0xa2, 0x84, 0x77, 0x31, 0x32, 0x9b, 0xcf, 0x12,
-	0x58, 0x13, 0x80, 0x23, 0xa5, 0x51, 0x72, 0x11, 0x4f, 0x51, 0xdb, 0xa9, 0xf0, 0x42, 0x85, 0x9d,
+	0x96, 0x5d, 0xa6, 0x72, 0x4c, 0x75, 0x6d, 0x18, 0xc1, 0xbe, 0x2a, 0xe0, 0xc9, 0xac, 0x80, 0x72,
-	0xc2, 0x01, 0xc7, 0xc9, 0xb2, 0xdf, 0xd3, 0x66, 0x8e, 0x78, 0x8e, 0xd8, 0x4b, 0x78, 0x92, 0xfd,
+	0xcc, 0x93, 0xec, 0x34, 0xc6, 0x8c, 0xbc, 0x82, 0xd5, 0xdc, 0x70, 0x30, 0xe2, 0x6c, 0x34, 0x6b,
-	0x1b, 0x46, 0x22, 0xb9, 0x8c, 0xd5, 0x2c, 0x57, 0xbc, 0xcf, 0xb7, 0xaa, 0xee, 0x0a, 0xce, 0x3e,
+	0xb4, 0xb4, 0x40, 0xa3, 0x9f, 0x0e, 0x78, 0x86, 0xf2, 0x21, 0xcb, 0x86, 0x57, 0x8a, 0x77, 0x6f,
-	0x62, 0x92, 0xad, 0x22, 0xa3, 0x7d, 0x94, 0x88, 0x24, 0xa5, 0x2c, 0xca, 0x26, 0x40, 0xaa, 0x8d,
+	0xc2, 0xff, 0xb1, 0x95, 0x6f, 0x61, 0xbb, 0x68, 0x9b, 0x12, 0xe5, 0xb9, 0x81, 0x5b, 0x5f, 0xa7,
-	0x7d, 0x0a, 0x29, 0xd1, 0xfa, 0x8f, 0x78, 0xa1, 0x92, 0x45, 0x1d, 0x17, 0xa2, 0x36, 0xfb, 0x8b,
+	0x8f, 0xf2, 0x61, 0x0c, 0xfb, 0x73, 0xf8, 0xa1, 0x20, 0xa7, 0xb0, 0x8d, 0x5a, 0x9e, 0xca, 0x1b,
-	0x25, 0xe6, 0xc0, 0xe3, 0x58, 0x96, 0x02, 0xdb, 0x60, 0xf7, 0xf7, 0x1e, 0xd8, 0xbb, 0x37, 0x93,
+	0x87, 0xac, 0xcd, 0x41, 0x41, 0x7d, 0xa5, 0x8b, 0xf4, 0xd1, 0xce, 0xf0, 0x1e, 0xf6, 0xe6, 0x98,
-	0x64, 0x36, 0x1c, 0xa2, 0x52, 0x1b, 0xcb, 0xfb, 0x7c, 0x0d, 0x33, 0xbf, 0xa8, 0x94, 0x4f, 0xc1,
+	0x45, 0x6a, 0x00, 0xa6, 0xe8, 0x28, 0x1d, 0x71, 0x6d, 0x84, 0x4b, 0x0b, 0x19, 0x35, 0x12, 0xca,
-	0xda, 0xaf, 0x41, 0x6c, 0x04, 0x75, 0x4a, 0x27, 0x13, 0x24, 0x32, 0xe1, 0xd8, 0x15, 0x9d, 0xf7,
+	0x87, 0xb7, 0x9d, 0xb6, 0xb6, 0x61, 0x9d, 0xda, 0x88, 0xbc, 0x81, 0xff, 0xd5, 0x3f, 0x85, 0x73,
-	0x9b, 0x3c, 0xef, 0xbb, 0x36, 0x79, 0xa3, 0xe2, 0x10, 0x2f, 0x73, 0xb0, 0x21, 0xd4, 0xae, 0x45,
+	0x9c, 0xca, 0xb1, 0x3d, 0x36, 0x2b, 0xf4, 0x41, 0x36, 0xbc, 0x83, 0xbd, 0x13, 0x9e, 0xa9, 0x96,
-	0x18, 0xe1, 0x34, 0xe7, 0xdc, 0xd3, 0x9c, 0xaf, 0xef, 0xe3, 0xbc, 0xd4, 0x33, 0x3d, 0x4c, 0x44,
+	0x68, 0xd4, 0xf6, 0x33, 0x96, 0xe5, 0xa8, 0x86, 0x50, 0x03, 0xc8, 0xff, 0xda, 0xe4, 0x68, 0x9b,
-	0x18, 0xf1, 0x12, 0x83, 0x73, 0x01, 0xf5, 0x7c, 0xa3, 0x39, 0xce, 0x22, 0x92, 0x91, 0x48, 0xae,
+	0x0a, 0x19, 0x35, 0xa4, 0xb4, 0x30, 0x24, 0xd3, 0xbf, 0x98, 0x22, 0x3e, 0xfc, 0x97, 0x8a, 0xd2,
-	0x63, 0x35, 0xcb, 0x5f, 0xd6, 0x0d, 0xce, 0xbc, 0x92, 0x66, 0x5d, 0x7b, 0x35, 0xc8, 0xf9, 0x06,
+	0xa9, 0x9d, 0xc5, 0xe1, 0xef, 0x65, 0xf0, 0xaa, 0x3b, 0xa3, 0x20, 0x1e, 0xac, 0x71, 0x29, 0x67,
-	0xb5, 0xe2, 0x8a, 0xac, 0x2f, 0x2d, 0x86, 0x9c, 0xa3, 0x87, 0xa7, 0xe8, 0xfc, 0xb2, 0x36, 0xfa,
+	0x92, 0x57, 0xe8, 0x34, 0x54, 0x7a, 0xb9, 0x94, 0x5d, 0x8c, 0xa6, 0x7a, 0x4d, 0x44, 0xfa, 0xb0,
-	0xf2, 0x08, 0xfe, 0x71, 0x5b, 0x25, 0xee, 0x3b, 0xb4, 0x31, 0x01, 0x27, 0x53, 0xad, 0x6a, 0x98,
+	0x85, 0xf9, 0x70, 0xc8, 0x11, 0xed, 0x34, 0x5c, 0x3d, 0x8d, 0xf7, 0x76, 0x1a, 0xf3, 0x3a, 0x35,
-	0xbb, 0x30, 0xb9, 0x3c, 0xf0, 0x71, 0xe4, 0xd9, 0xed, 0xa4, 0xea, 0xfe, 0xb1, 0xe0, 0x99, 0x19,
+	0xfa, 0xc5, 0x4d, 0xb4, 0x8c, 0x41, 0xce, 0x60, 0xf3, 0x92, 0xc5, 0x09, 0x1f, 0x59, 0xcc, 0x65,
-	0xf4, 0x91, 0x48, 0x04, 0xc8, 0x33, 0xce, 0x11, 0xaa, 0x65, 0x38, 0x41, 0x76, 0x0e, 0xf5, 0xd2,
+	0x8d, 0xf9, 0xee, 0x39, 0xcc, 0x63, 0xbd, 0xa7, 0xcd, 0x33, 0x16, 0x27, 0xb4, 0x84, 0xe0, 0x1f,
-	0x47, 0xc8, 0xce, 0xf2, 0x9d, 0xdb, 0x57, 0x85, 0x63, 0xef, 0x3e, 0x20, 0xc9, 0xbe, 0xc2, 0xc9,
+	0xc1, 0x96, 0xed, 0x68, 0x96, 0x95, 0x45, 0xc2, 0xce, 0xda, 0x1e, 0xf3, 0x59, 0xac, 0xb4, 0xa2,
-	0x2e, 0x85, 0xac, 0xf9, 0x5f, 0xf9, 0x0b, 0xe7, 0xf9, 0x3d, 0xf6, 0xce, 0x1b, 0xdf, 0x8f, 0x3d,
+	0x46, 0x9d, 0x6a, 0x35, 0x91, 0xff, 0x0d, 0x36, 0x8b, 0x2d, 0x0a, 0xd7, 0xd2, 0x2d, 0x5d, 0xcb,
-	0x73, 0xdb, 0xbd, 0x97, 0x57, 0x5a, 0xf6, 0xd5, 0x81, 0xbe, 0xcc, 0xde, 0xfe, 0x0d, 0x00, 0x00,
+	0x85, 0x5d, 0xf4, 0x7f, 0x39, 0x33, 0x7e, 0xd6, 0x82, 0x79, 0x57, 0x7e, 0x0e, 0x37, 0xc2, 0x60,
-	0xff, 0xff, 0x8e, 0xdc, 0xcc, 0x70, 0x0b, 0x05, 0x00, 0x00,
+	0x77, 0xa4, 0x59, 0x4d, 0x4f, 0xb0, 0xf1, 0x65, 0xc1, 0x71, 0x58, 0xef, 0x2a, 0xa1, 0x5a, 0x3f,
+	0x96, 0xa6, 0x37, 0xb3, 0xcb, 0x11, 0x59, 0xc4, 0xa9, 0xc2, 0xec, 0x73, 0x79, 0x1b, 0x0f, 0x39,
+	0x39, 0x84, 0xad, 0xd2, 0x4b, 0x48, 0xf6, 0x6c, 0xcf, 0x87, 0xef, 0xb5, 0xef, 0x55, 0x2f, 0xa0,
+	0x20, 0x5f, 0x61, 0xb7, 0x8a, 0x21, 0xa9, 0x3d, 0x49, 0xff, 0xc6, 0x3f, 0x78, 0x46, 0x1e, 0x39,
+	0x87, 0x97, 0x95, 0x6f, 0x0a, 0x39, 0x28, 0x71, 0x79, 0xfc, 0x22, 0xfa, 0xc1, 0xd3, 0x05, 0x28,
+	0x0e, 0x77, 0xce, 0x5f, 0x34, 0xcc, 0xe7, 0xec, 0x93, 0xb8, 0xd0, 0x96, 0x5c, 0xac, 0xea, 0xaf,
+	0xd5, 0x87, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x04, 0x75, 0xfe, 0xf6, 0xec, 0x06, 0x00, 0x00,
 }