diff --git a/client/pb/msg/msg.pb.go b/client/pb/msg/msg.pb.go index 56927931..8a67a716 100644 --- a/client/pb/msg/msg.pb.go +++ b/client/pb/msg/msg.pb.go @@ -1,18 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc v3.14.0 // source: msg.proto package msg import ( - reflect "reflect" - sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -6904,6 +6903,93 @@ func (x *PbGetOneDayRoamMsgResp) GetIsComplete() uint32 { return 0 } +type PbPushMsg struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Msg *Message `protobuf:"bytes,1,opt,name=msg" json:"msg,omitempty"` + Svrip *int32 `protobuf:"varint,2,opt,name=svrip" json:"svrip,omitempty"` + PushToken []byte `protobuf:"bytes,3,opt,name=pushToken" json:"pushToken,omitempty"` + PingFlag *uint32 `protobuf:"varint,4,opt,name=pingFlag" json:"pingFlag,omitempty"` + GeneralFlag *uint32 `protobuf:"varint,9,opt,name=generalFlag" json:"generalFlag,omitempty"` + BindUin *uint64 `protobuf:"varint,10,opt,name=bindUin" json:"bindUin,omitempty"` +} + +func (x *PbPushMsg) Reset() { + *x = PbPushMsg{} + if protoimpl.UnsafeEnabled { + mi := &file_msg_proto_msgTypes[69] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PbPushMsg) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PbPushMsg) ProtoMessage() {} + +func (x *PbPushMsg) ProtoReflect() protoreflect.Message { + mi := &file_msg_proto_msgTypes[69] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PbPushMsg.ProtoReflect.Descriptor instead. +func (*PbPushMsg) Descriptor() ([]byte, []int) { + return file_msg_proto_rawDescGZIP(), []int{69} +} + +func (x *PbPushMsg) GetMsg() *Message { + if x != nil { + return x.Msg + } + return nil +} + +func (x *PbPushMsg) GetSvrip() int32 { + if x != nil && x.Svrip != nil { + return *x.Svrip + } + return 0 +} + +func (x *PbPushMsg) GetPushToken() []byte { + if x != nil { + return x.PushToken + } + return nil +} + +func (x *PbPushMsg) GetPingFlag() uint32 { + if x != nil && x.PingFlag != nil { + return *x.PingFlag + } + return 0 +} + +func (x *PbPushMsg) GetGeneralFlag() uint32 { + if x != nil && x.GeneralFlag != nil { + return *x.GeneralFlag + } + return 0 +} + +func (x *PbPushMsg) GetBindUin() uint64 { + if x != nil && x.BindUin != nil { + return *x.BindUin + } + return 0 +} + var File_msg_proto protoreflect.FileDescriptor var file_msg_proto_rawDesc = []byte{ @@ -7967,11 +8053,22 @@ var file_msg_proto_rawDesc = []byte{ 0x64, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x2a, - 0x2e, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x09, 0x0a, 0x05, 0x53, - 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, - 0x55, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, - 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, + 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, + 0xb3, 0x01, 0x0a, 0x09, 0x50, 0x62, 0x50, 0x75, 0x73, 0x68, 0x4d, 0x73, 0x67, 0x12, 0x1a, 0x0a, + 0x03, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x76, 0x72, + 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x76, 0x72, 0x69, 0x70, 0x12, + 0x1c, 0x0a, 0x09, 0x70, 0x75, 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, + 0x08, 0x70, 0x69, 0x6e, 0x67, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x08, 0x70, 0x69, 0x6e, 0x67, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x67, 0x65, 0x6e, + 0x65, 0x72, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, + 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x62, + 0x69, 0x6e, 0x64, 0x55, 0x69, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x62, 0x69, + 0x6e, 0x64, 0x55, 0x69, 0x6e, 0x2a, 0x2e, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x46, 0x6c, 0x61, + 0x67, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, + 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x55, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x53, + 0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, } var ( @@ -7987,7 +8084,7 @@ func file_msg_proto_rawDescGZIP() []byte { } var file_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 69) +var file_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 70) var file_msg_proto_goTypes = []interface{}{ (SyncFlag)(0), // 0: SyncFlag (*GetMessageRequest)(nil), // 1: GetMessageRequest @@ -8059,6 +8156,7 @@ var file_msg_proto_goTypes = []interface{}{ (*GetGroupMsgResp)(nil), // 67: GetGroupMsgResp (*PbGetOneDayRoamMsgReq)(nil), // 68: PbGetOneDayRoamMsgReq (*PbGetOneDayRoamMsgResp)(nil), // 69: PbGetOneDayRoamMsgResp + (*PbPushMsg)(nil), // 70: PbPushMsg } var file_msg_proto_depIdxs = []int32{ 0, // 0: GetMessageRequest.syncFlag:type_name -> SyncFlag @@ -8129,11 +8227,12 @@ var file_msg_proto_depIdxs = []int32{ 64, // 65: ResvAttr.image_show:type_name -> AnimationImageShow 20, // 66: GetGroupMsgResp.msg:type_name -> Message 20, // 67: PbGetOneDayRoamMsgResp.msg:type_name -> Message - 68, // [68:68] is the sub-list for method output_type - 68, // [68:68] is the sub-list for method input_type - 68, // [68:68] is the sub-list for extension type_name - 68, // [68:68] is the sub-list for extension extendee - 0, // [0:68] is the sub-list for field type_name + 20, // 68: PbPushMsg.msg:type_name -> Message + 69, // [69:69] is the sub-list for method output_type + 69, // [69:69] is the sub-list for method input_type + 69, // [69:69] is the sub-list for extension type_name + 69, // [69:69] is the sub-list for extension extendee + 0, // [0:69] is the sub-list for field type_name } func init() { file_msg_proto_init() } @@ -8970,6 +9069,18 @@ func file_msg_proto_init() { return nil } } + file_msg_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PbPushMsg); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -8977,7 +9088,7 @@ func file_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_msg_proto_rawDesc, NumEnums: 1, - NumMessages: 69, + NumMessages: 70, NumExtensions: 0, NumServices: 0, }, diff --git a/client/pb/msg/msg.proto b/client/pb/msg/msg.proto index c7fc7d7a..70d1ecb2 100644 --- a/client/pb/msg/msg.proto +++ b/client/pb/msg/msg.proto @@ -785,4 +785,13 @@ message PbGetOneDayRoamMsgResp { optional uint64 random = 5; repeated Message msg = 6; optional uint32 isComplete = 7; +} + +message PbPushMsg { + optional Message msg = 1; + optional int32 svrip = 2; + optional bytes pushToken = 3; + optional uint32 pingFlag = 4; + optional uint32 generalFlag = 9; + optional uint64 bindUin = 10; } \ No newline at end of file diff --git a/client/pb/msg/objmsg.pb.go b/client/pb/msg/objmsg.pb.go index 2d6c6fec..67b47ff4 100644 --- a/client/pb/msg/objmsg.pb.go +++ b/client/pb/msg/objmsg.pb.go @@ -1,18 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc v3.14.0 // source: objmsg.proto package msg import ( - reflect "reflect" - sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/client/pb/msg/report.pb.go b/client/pb/msg/report.pb.go index 3fcd5456..d08004c3 100644 --- a/client/pb/msg/report.pb.go +++ b/client/pb/msg/report.pb.go @@ -1,18 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc v3.14.0 // source: report.proto package msg import ( - reflect "reflect" - sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const (