IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 12:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

message send module changes

Browse Source
This commit is contained in:
Gordon
2021-07-02 14:24:33 +08:00
parent 0ac4dbfa34
commit 509286698f
24 changed files with 388 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/proto/auto_proto.sh
+1 -1
View File
@@ -5,7 +5,7 @@ source ./proto_dir.cfg
for ((i = 0; i < ${#all_proto[*]}; i++)); do
proto=${all_proto[$i]}
protoc --go_out=plugins=grpc:. $proto
s=$(echo $proto | sed 's/ //g')
s=`echo $proto | sed 's/ //g'`
v=${s//proto/pb.go}
protoc-go-inject-tag -input=./$v
echo "protoc --go_out=plugins=grpc:." $proto
src/proto/chat/chat.pb.go
+170 -100
View File
@@ -30,15 +30,18 @@ type WSToMsgSvrChatMsg struct {
Content string `protobuf:"bytes,3,opt,name=Content,proto3" json:"Content,omitempty"`
SendTime int64 `protobuf:"varint,4,opt,name=SendTime,proto3" json:"SendTime,omitempty"`
MsgFrom int32 `protobuf:"varint,5,opt,name=MsgFrom,proto3" json:"MsgFrom,omitempty"`
ContentType int32 `protobuf:"varint,6,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
SessionType int32 `protobuf:"varint,7,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
OperationID string `protobuf:"bytes,8,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
MsgID string `protobuf:"bytes,9,opt,name=MsgID,proto3" json:"MsgID,omitempty"`
Token string `protobuf:"bytes,10,opt,name=Token,proto3" json:"Token,omitempty"`
OfflineInfo string `protobuf:"bytes,11,opt,name=OfflineInfo,proto3" json:"OfflineInfo,omitempty"`
Options string `protobuf:"bytes,12,opt,name=Options,proto3" json:"Options,omitempty"`
PlatformID int32 `protobuf:"varint,13,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
ForceList []string `protobuf:"bytes,14,rep,name=ForceList,proto3" json:"ForceList,omitempty"`
SenderNickName string `protobuf:"bytes,6,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"`
SenderFaceURL string `protobuf:"bytes,7,opt,name=SenderFaceURL,proto3" json:"SenderFaceURL,omitempty"`
ContentType int32 `protobuf:"varint,8,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
SessionType int32 `protobuf:"varint,9,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
OperationID string `protobuf:"bytes,10,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
MsgID string `protobuf:"bytes,11,opt,name=MsgID,proto3" json:"MsgID,omitempty"`
Token string `protobuf:"bytes,12,opt,name=Token,proto3" json:"Token,omitempty"`
OfflineInfo string `protobuf:"bytes,13,opt,name=OfflineInfo,proto3" json:"OfflineInfo,omitempty"`
Options string `protobuf:"bytes,14,opt,name=Options,proto3" json:"Options,omitempty"`
PlatformID int32 `protobuf:"varint,15,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
ForceList []string `protobuf:"bytes,16,rep,name=ForceList,proto3" json:"ForceList,omitempty"`
ClientMsgID string `protobuf:"bytes,17,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -104,6 +107,20 @@ func (m *WSToMsgSvrChatMsg) GetMsgFrom() int32 {
return 0
}
func (m *WSToMsgSvrChatMsg) GetSenderNickName() string {
if m != nil {
return m.SenderNickName
}
return ""
}
func (m *WSToMsgSvrChatMsg) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *WSToMsgSvrChatMsg) GetContentType() int32 {
if m != nil {
return m.ContentType
@@ -167,6 +184,13 @@ func (m *WSToMsgSvrChatMsg) GetForceList() []string {
return nil
}
func (m *WSToMsgSvrChatMsg) GetClientMsgID() string {
if m != nil {
return m.ClientMsgID
}
return ""
}
type MsgSvrToPushSvrChatMsg struct {
SendID string `protobuf:"bytes,1,opt,name=SendID,proto3" json:"SendID,omitempty"`
RecvID string `protobuf:"bytes,2,opt,name=RecvID,proto3" json:"RecvID,omitempty"`
@@ -174,14 +198,16 @@ type MsgSvrToPushSvrChatMsg struct {
RecvSeq int64 `protobuf:"varint,4,opt,name=RecvSeq,proto3" json:"RecvSeq,omitempty"`
SendTime int64 `protobuf:"varint,5,opt,name=SendTime,proto3" json:"SendTime,omitempty"`
MsgFrom int32 `protobuf:"varint,6,opt,name=MsgFrom,proto3" json:"MsgFrom,omitempty"`
ContentType int32 `protobuf:"varint,7,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
SessionType int32 `protobuf:"varint,8,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
OperationID string `protobuf:"bytes,9,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
MsgID string `protobuf:"bytes,10,opt,name=MsgID,proto3" json:"MsgID,omitempty"`
OfflineInfo string `protobuf:"bytes,11,opt,name=OfflineInfo,proto3" json:"OfflineInfo,omitempty"`
Options string `protobuf:"bytes,12,opt,name=Options,proto3" json:"Options,omitempty"`
PlatformID int32 `protobuf:"varint,13,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
IsEmphasize bool `protobuf:"varint,14,opt,name=IsEmphasize,proto3" json:"IsEmphasize,omitempty"`
SenderNickName string `protobuf:"bytes,7,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"`
SenderFaceURL string `protobuf:"bytes,8,opt,name=SenderFaceURL,proto3" json:"SenderFaceURL,omitempty"`
ContentType int32 `protobuf:"varint,9,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
SessionType int32 `protobuf:"varint,10,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
OperationID string `protobuf:"bytes,11,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
MsgID string `protobuf:"bytes,12,opt,name=MsgID,proto3" json:"MsgID,omitempty"`
OfflineInfo string `protobuf:"bytes,13,opt,name=OfflineInfo,proto3" json:"OfflineInfo,omitempty"`
Options string `protobuf:"bytes,14,opt,name=Options,proto3" json:"Options,omitempty"`
PlatformID int32 `protobuf:"varint,15,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
ClientMsgID string `protobuf:"bytes,16,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -254,6 +280,20 @@ func (m *MsgSvrToPushSvrChatMsg) GetMsgFrom() int32 {
return 0
}
func (m *MsgSvrToPushSvrChatMsg) GetSenderNickName() string {
if m != nil {
return m.SenderNickName
}
return ""
}
func (m *MsgSvrToPushSvrChatMsg) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *MsgSvrToPushSvrChatMsg) GetContentType() int32 {
if m != nil {
return m.ContentType
@@ -303,11 +343,11 @@ func (m *MsgSvrToPushSvrChatMsg) GetPlatformID() int32 {
return 0
}
func (m *MsgSvrToPushSvrChatMsg) GetIsEmphasize() bool {
func (m *MsgSvrToPushSvrChatMsg) GetClientMsgID() string {
if m != nil {
return m.IsEmphasize
return m.ClientMsgID
}
return false
return ""
}
type PullMessageReq struct {
@@ -621,7 +661,13 @@ type MsgFormat struct {
// @inject_tag: json:"sendTime"
SendTime int64 `protobuf:"varint,8,opt,name=SendTime,proto3" json:"sendTime"`
// @inject_tag: json:"senderPlatformID"
SenderPlatformID int32 `protobuf:"varint,9,opt,name=SenderPlatformID,proto3" json:"senderPlatformID"`
SenderPlatformID int32 `protobuf:"varint,9,opt,name=SenderPlatformID,proto3" json:"senderPlatformID"`
// @inject_tag: json:"senderNickName"
SenderNickName string `protobuf:"bytes,10,opt,name=SenderNickName,proto3" json:"senderNickName"`
// @inject_tag: json:"senderFaceUrl"
SenderFaceURL string `protobuf:"bytes,11,opt,name=SenderFaceURL,proto3" json:"senderFaceUrl"`
// @inject_tag: json:"clientMsgID"
ClientMsgID string `protobuf:"bytes,12,opt,name=ClientMsgID,proto3" json:"clientMsgID"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -715,23 +761,45 @@ func (m *MsgFormat) GetSenderPlatformID() int32 {
return 0
}
func (m *MsgFormat) GetSenderNickName() string {
if m != nil {
return m.SenderNickName
}
return ""
}
func (m *MsgFormat) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *MsgFormat) GetClientMsgID() string {
if m != nil {
return m.ClientMsgID
}
return ""
}
type UserSendMsgReq struct {
ReqIdentifier int32 `protobuf:"varint,1,opt,name=ReqIdentifier,proto3" json:"ReqIdentifier,omitempty"`
Token string `protobuf:"bytes,2,opt,name=Token,proto3" json:"Token,omitempty"`
SendID string `protobuf:"bytes,3,opt,name=SendID,proto3" json:"SendID,omitempty"`
OperationID string `protobuf:"bytes,4,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
MsgIncr int32 `protobuf:"varint,5,opt,name=MsgIncr,proto3" json:"MsgIncr,omitempty"`
PlatformID int32 `protobuf:"varint,6,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
SessionType int32 `protobuf:"varint,7,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
MsgFrom int32 `protobuf:"varint,8,opt,name=MsgFrom,proto3" json:"MsgFrom,omitempty"`
ContentType int32 `protobuf:"varint,9,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
RecvID string `protobuf:"bytes,10,opt,name=RecvID,proto3" json:"RecvID,omitempty"`
ForceList []string `protobuf:"bytes,11,rep,name=ForceList,proto3" json:"ForceList,omitempty"`
Content string `protobuf:"bytes,12,opt,name=Content,proto3" json:"Content,omitempty"`
Options string `protobuf:"bytes,13,opt,name=Options,proto3" json:"Options,omitempty"`
ClientMsgID string `protobuf:"bytes,14,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
OffLineInfo string `protobuf:"bytes,15,opt,name=OffLineInfo,proto3" json:"OffLineInfo,omitempty"`
Ex string `protobuf:"bytes,16,opt,name=Ex,proto3" json:"Ex,omitempty"`
SenderNickName string `protobuf:"bytes,5,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"`
SenderFaceURL string `protobuf:"bytes,6,opt,name=SenderFaceURL,proto3" json:"SenderFaceURL,omitempty"`
PlatformID int32 `protobuf:"varint,7,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
SessionType int32 `protobuf:"varint,8,opt,name=SessionType,proto3" json:"SessionType,omitempty"`
MsgFrom int32 `protobuf:"varint,9,opt,name=MsgFrom,proto3" json:"MsgFrom,omitempty"`
ContentType int32 `protobuf:"varint,10,opt,name=ContentType,proto3" json:"ContentType,omitempty"`
RecvID string `protobuf:"bytes,11,opt,name=RecvID,proto3" json:"RecvID,omitempty"`
ForceList []string `protobuf:"bytes,12,rep,name=ForceList,proto3" json:"ForceList,omitempty"`
Content string `protobuf:"bytes,13,opt,name=Content,proto3" json:"Content,omitempty"`
Options string `protobuf:"bytes,14,opt,name=Options,proto3" json:"Options,omitempty"`
ClientMsgID string `protobuf:"bytes,15,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
OffLineInfo string `protobuf:"bytes,16,opt,name=OffLineInfo,proto3" json:"OffLineInfo,omitempty"`
Ex string `protobuf:"bytes,17,opt,name=Ex,proto3" json:"Ex,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -790,11 +858,18 @@ func (m *UserSendMsgReq) GetOperationID() string {
return ""
}
func (m *UserSendMsgReq) GetMsgIncr() int32 {
func (m *UserSendMsgReq) GetSenderNickName() string {
if m != nil {
return m.MsgIncr
return m.SenderNickName
}
return 0
return ""
}
func (m *UserSendMsgReq) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *UserSendMsgReq) GetPlatformID() int32 {
@@ -878,7 +953,6 @@ type UserSendMsgResp struct {
ErrCode int32 `protobuf:"varint,1,opt,name=ErrCode,proto3" json:"ErrCode,omitempty"`
ErrMsg string `protobuf:"bytes,2,opt,name=ErrMsg,proto3" json:"ErrMsg,omitempty"`
ReqIdentifier int32 `protobuf:"varint,3,opt,name=ReqIdentifier,proto3" json:"ReqIdentifier,omitempty"`
MsgIncr int32 `protobuf:"varint,4,opt,name=MsgIncr,proto3" json:"MsgIncr,omitempty"`
SendTime int64 `protobuf:"varint,5,opt,name=SendTime,proto3" json:"SendTime,omitempty"`
ServerMsgID string `protobuf:"bytes,6,opt,name=ServerMsgID,proto3" json:"ServerMsgID,omitempty"`
ClientMsgID string `protobuf:"bytes,7,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
@@ -933,13 +1007,6 @@ func (m *UserSendMsgResp) GetReqIdentifier() int32 {
return 0
}
func (m *UserSendMsgResp) GetMsgIncr() int32 {
if m != nil {
return m.MsgIncr
}
return 0
}
func (m *UserSendMsgResp) GetSendTime() int64 {
if m != nil {
return m.SendTime
@@ -979,62 +1046,65 @@ func init() {
}
var fileDescriptor_767a49518b351716 = []byte{
// 874 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xeb, 0x44,
0x18, 0x95, 0xe3, 0xc4, 0x89, 0xbf, 0xfc, 0xf5, 0x8e, 0x2e, 0x65, 0x54, 0x21, 0x64, 0x59, 0x20,
0x45, 0x2c, 0x8a, 0x74, 0xd9, 0x5c, 0x81, 0xc4, 0xe2, 0x36, 0x69, 0xb1, 0x74, 0xcd, 0xad, 0xec,
0x20, 0x24, 0x76, 0x6e, 0x32, 0x71, 0x2c, 0x12, 0xdb, 0x99, 0x71, 0x4b, 0x61, 0xc1, 0x1b, 0xf0,
0x0c, 0xbc, 0x00, 0x0f, 0xc1, 0x83, 0xb0, 0x63, 0xc5, 0x5b, 0xa0, 0x99, 0xb1, 0xe3, 0xb1, 0x9d,
0x26, 0x52, 0xa5, 0x6e, 0xa2, 0x9c, 0x33, 0x3f, 0x99, 0x39, 0xe7, 0xfb, 0xce, 0x04, 0xc6, 0x8b,
0x75, 0x90, 0x7d, 0xc9, 0x3f, 0x2e, 0x53, 0x9a, 0x64, 0x09, 0x32, 0xd2, 0xbb, 0xab, 0x75, 0x90,
0xd9, 0x7f, 0xea, 0xf0, 0xea, 0x47, 0x7f, 0x9e, 0xb8, 0x2c, 0xf4, 0x1f, 0x28, 0xa7, 0x5c, 0x16,
0xa2, 0x73, 0x30, 0x7c, 0x12, 0x2f, 0x9d, 0x29, 0xd6, 0x2c, 0x6d, 0x62, 0x7a, 0x39, 0xe2, 0xbc,
0x47, 0x16, 0x0f, 0xce, 0x14, 0xb7, 0x24, 0x2f, 0x11, 0xc2, 0xd0, 0xbd, 0x4a, 0xe2, 0x8c, 0xc4,
0x19, 0xd6, 0xc5, 0x40, 0x01, 0xd1, 0x05, 0xf4, 0xf8, 0xda, 0x79, 0xb4, 0x25, 0xb8, 0x6d, 0x69,
0x13, 0xdd, 0xdb, 0x63, 0xbe, 0xca, 0x65, 0xe1, 0x35, 0x4d, 0xb6, 0xb8, 0x63, 0x69, 0x93, 0x8e,
0x57, 0x40, 0x64, 0x41, 0x3f, 0xdf, 0x60, 0xfe, 0x6b, 0x4a, 0xb0, 0x21, 0x46, 0x55, 0x8a, 0xcf,
0xf0, 0x09, 0x63, 0x51, 0x12, 0x8b, 0x19, 0x5d, 0x39, 0x43, 0xa1, 0xf8, 0x8c, 0x0f, 0x29, 0xa1,
0x41, 0x16, 0x25, 0xb1, 0x33, 0xc5, 0x3d, 0x71, 0x2e, 0x95, 0x42, 0xaf, 0xa1, 0xe3, 0xb2, 0xd0,
0x99, 0x62, 0x53, 0x8c, 0x49, 0xc0, 0xd9, 0x79, 0xf2, 0x33, 0x89, 0x31, 0x48, 0x56, 0x00, 0xb1,
0xdb, 0x6a, 0xb5, 0x89, 0x62, 0xe2, 0xc4, 0xab, 0x04, 0xf7, 0xf3, 0xdd, 0x4a, 0x8a, 0xdf, 0xe6,
0x43, 0xca, 0x77, 0x66, 0x78, 0x20, 0x35, 0xc8, 0x21, 0xfa, 0x14, 0xe0, 0x76, 0x13, 0x64, 0xab,
0x84, 0x6e, 0x9d, 0x29, 0x1e, 0x8a, 0xa3, 0x2a, 0x0c, 0xfa, 0x04, 0xcc, 0xeb, 0x84, 0x2e, 0xc8,
0xfb, 0x88, 0x65, 0x78, 0x64, 0xe9, 0x13, 0xd3, 0x2b, 0x09, 0xfb, 0x2f, 0x1d, 0xce, 0xa5, 0x3b,
0xf3, 0xe4, 0xf6, 0x9e, 0xad, 0x5f, 0xc4, 0x26, 0x0c, 0x5d, 0x3e, 0xc7, 0x27, 0xbb, 0xdc, 0xa5,
0x02, 0x56, 0x0c, 0xec, 0x3c, 0x6d, 0xa0, 0x71, 0xd4, 0xc0, 0xee, 0x49, 0x03, 0x7b, 0x27, 0x0d,
0x34, 0x8f, 0x18, 0x08, 0xaa, 0x81, 0x2f, 0x69, 0x95, 0x05, 0x7d, 0x87, 0xcd, 0xb6, 0xe9, 0x3a,
0x60, 0xd1, 0x6f, 0x04, 0x8f, 0x2c, 0x6d, 0xd2, 0xf3, 0x54, 0xca, 0xfe, 0x1d, 0x46, 0xb7, 0xf7,
0x9b, 0x8d, 0x4b, 0x18, 0x0b, 0x42, 0xe2, 0x91, 0x1d, 0x77, 0xe3, 0x07, 0x46, 0x68, 0xe9, 0x92,
0x44, 0x52, 0xd9, 0xdd, 0x3b, 0x12, 0x46, 0xb1, 0xf0, 0x49, 0x28, 0x2b, 0xb1, 0x74, 0x76, 0x37,
0x8b, 0x97, 0xc2, 0x28, 0xdd, 0xcb, 0x51, 0x5d, 0x93, 0x76, 0x43, 0x13, 0xfb, 0x3f, 0x0d, 0xc6,
0x95, 0x03, 0xb0, 0x94, 0xdf, 0x77, 0x46, 0xe9, 0x55, 0xb2, 0x24, 0xe2, 0x08, 0x1d, 0xaf, 0x80,
0xfc, 0x77, 0x66, 0x94, 0xba, 0x2c, 0x2c, 0x2a, 0x45, 0x22, 0xce, 0xbb, 0xc1, 0x23, 0x2f, 0x87,
0xfc, 0xf7, 0x25, 0x12, 0x7c, 0x14, 0x97, 0x65, 0x92, 0x23, 0xf4, 0x35, 0x0c, 0xfd, 0x28, 0x0e,
0x37, 0x84, 0xdf, 0x8d, 0x6f, 0xd7, 0xb1, 0xf4, 0x49, 0xff, 0xcd, 0xeb, 0x4b, 0x19, 0x33, 0x97,
0x37, 0x41, 0xb6, 0x26, 0xf4, 0x3a, 0xa1, 0xdb, 0x20, 0xf3, 0xaa, 0x53, 0xd1, 0x5b, 0x18, 0xdc,
0xd0, 0xe4, 0x3e, 0x2d, 0x96, 0x1a, 0x47, 0x96, 0x56, 0x66, 0xda, 0xdf, 0xc1, 0xe0, 0x86, 0x64,
0xdf, 0x93, 0x5f, 0x7c, 0xb2, 0x3b, 0xa6, 0x74, 0x4d, 0xb5, 0x56, 0x53, 0x35, 0x1f, 0x86, 0xca,
0x4e, 0xcf, 0x92, 0xec, 0x0c, 0xf4, 0x52, 0x2f, 0xfe, 0xd5, 0x9e, 0xc1, 0x40, 0x3d, 0x3c, 0x1a,
0x41, 0x6b, 0x7f, 0xb4, 0x96, 0x33, 0x45, 0x9f, 0x43, 0x5b, 0xb4, 0x7c, 0x4b, 0x5c, 0xf8, 0x55,
0x71, 0x61, 0xde, 0x43, 0xf2, 0xb6, 0x62, 0xd8, 0xfe, 0xa3, 0x05, 0xe6, 0x9e, 0x7b, 0x4e, 0xcf,
0x17, 0x3d, 0xaa, 0x1f, 0xed, 0xd1, 0xf6, 0x13, 0x3d, 0x4a, 0x1f, 0x84, 0xd8, 0xce, 0x54, 0xb4,
0xbf, 0xe9, 0xa9, 0x94, 0x9a, 0x28, 0x46, 0x35, 0x51, 0x72, 0x39, 0xba, 0x7b, 0x39, 0x2a, 0x49,
0xd2, 0xab, 0x25, 0xc9, 0x17, 0x70, 0xc6, 0xbf, 0x13, 0xaa, 0x74, 0x9f, 0x29, 0x0e, 0xd4, 0xe0,
0xed, 0x7f, 0x74, 0x18, 0x71, 0x63, 0xf9, 0x80, 0xcb, 0x42, 0x6e, 0xfc, 0x67, 0x30, 0xf4, 0xc8,
0xce, 0x59, 0x92, 0x38, 0x8b, 0x56, 0x11, 0xa1, 0xb9, 0x67, 0x55, 0xb2, 0x4c, 0xf6, 0x96, 0x9a,
0xec, 0xa5, 0xa0, 0x7a, 0x45, 0xd0, 0x93, 0xad, 0x96, 0x4b, 0xeb, 0xc4, 0x0b, 0xaa, 0xbc, 0x5f,
0x1c, 0xd6, 0x62, 0xc4, 0x38, 0x14, 0x23, 0x27, 0x5e, 0x2f, 0xc5, 0xb6, 0xde, 0x51, 0xdb, 0xcc,
0xa6, 0x6d, 0x65, 0x29, 0x40, 0xa5, 0x14, 0x2a, 0xef, 0x4c, 0xbf, 0xf6, 0xce, 0xa8, 0x56, 0x0e,
0x1a, 0x8f, 0x43, 0x11, 0x97, 0xc3, 0x6a, 0x5c, 0xf2, 0xb3, 0x6c, 0x22, 0x12, 0x67, 0xb2, 0x40,
0x46, 0x52, 0x23, 0x85, 0xca, 0xc3, 0xf8, 0x7d, 0x11, 0xc6, 0xe3, 0x7d, 0x18, 0x17, 0x14, 0xef,
0x8a, 0xd9, 0x23, 0x3e, 0x93, 0x5d, 0x31, 0x7b, 0xb4, 0xff, 0xd5, 0x60, 0x5c, 0xb1, 0xf7, 0x59,
0xdd, 0xd8, 0xa8, 0x08, 0xfd, 0x50, 0x45, 0x28, 0x0e, 0xb6, 0xab, 0x0e, 0x1e, 0x7b, 0xf6, 0x6a,
0x6d, 0x61, 0x34, 0xdb, 0xa2, 0xa6, 0x4b, 0xb7, 0xa1, 0xcb, 0x9b, 0xbf, 0x35, 0x68, 0xf3, 0x6e,
0x47, 0x6f, 0xc1, 0xdc, 0x27, 0x0f, 0x2a, 0x43, 0x4f, 0x89, 0xb5, 0x8b, 0x8f, 0x0e, 0xb0, 0x2c,
0x45, 0xdf, 0x42, 0x5f, 0x09, 0x7a, 0x74, 0x5e, 0xcc, 0xaa, 0x3e, 0x3f, 0x17, 0x1f, 0x1f, 0xe4,
0xe5, 0x7a, 0x45, 0xe7, 0x72, 0x7d, 0xb5, 0xb7, 0xca, 0xf5, 0x35, 0x53, 0xde, 0x0d, 0x7f, 0xea,
0xf3, 0x3f, 0x94, 0xdf, 0xc8, 0xe1, 0x3b, 0x43, 0xfc, 0xb1, 0xfc, 0xea, 0xff, 0x00, 0x00, 0x00,
0xff, 0xff, 0x1f, 0x48, 0xc5, 0x48, 0x6b, 0x0a, 0x00, 0x00,
// 919 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x5f, 0x6b, 0xe3, 0x46,
0x10, 0xc7, 0x96, 0x2d, 0x5b, 0xe3, 0xbf, 0x59, 0xae, 0xe9, 0x12, 0x4a, 0x31, 0xe6, 0x5a, 0x4c,
0x1f, 0x52, 0xb8, 0xbe, 0x1c, 0x2d, 0xf4, 0xe1, 0x62, 0x27, 0x15, 0x44, 0xb9, 0x20, 0xf9, 0x28,
0xf4, 0x4d, 0xe7, 0xac, 0x15, 0x71, 0xb6, 0x24, 0xef, 0x2a, 0x69, 0xfa, 0xd2, 0xaf, 0xd0, 0x7e,
0xa4, 0xbe, 0xf6, 0xa3, 0xf4, 0x2b, 0x14, 0x0a, 0x65, 0x77, 0x25, 0x6b, 0x57, 0x72, 0x1c, 0x13,
0xc8, 0x4b, 0xc8, 0xfc, 0x34, 0xb3, 0xbb, 0x33, 0xf3, 0x9b, 0xdf, 0x18, 0x06, 0x8b, 0x5b, 0x3f,
0xfd, 0x96, 0xff, 0x39, 0x4d, 0x68, 0x9c, 0xc6, 0xc8, 0x4c, 0x3e, 0x9e, 0xdd, 0xfa, 0xe9, 0xf8,
0x8f, 0x06, 0x1c, 0xfd, 0xec, 0xcd, 0x63, 0x87, 0x05, 0xde, 0x3d, 0xe5, 0x90, 0xc3, 0x02, 0x74,
0x0c, 0xa6, 0x47, 0xa2, 0x1b, 0x7b, 0x8a, 0x6b, 0xa3, 0xda, 0xc4, 0x72, 0x33, 0x8b, 0xe3, 0x2e,
0x59, 0xdc, 0xdb, 0x53, 0x5c, 0x97, 0xb8, 0xb4, 0x10, 0x86, 0xd6, 0x59, 0x1c, 0xa5, 0x24, 0x4a,
0xb1, 0x21, 0x3e, 0xe4, 0x26, 0x3a, 0x81, 0x36, 0x8f, 0x9d, 0x87, 0x6b, 0x82, 0x1b, 0xa3, 0xda,
0xc4, 0x70, 0xb7, 0x36, 0x8f, 0x72, 0x58, 0x70, 0x4e, 0xe3, 0x35, 0x6e, 0x8e, 0x6a, 0x93, 0xa6,
0x9b, 0x9b, 0xe8, 0x6b, 0xe8, 0x73, 0x2f, 0x42, 0xaf, 0xc2, 0xc5, 0xa7, 0x2b, 0x7f, 0x4d, 0xb0,
0x29, 0x8e, 0x2d, 0xa1, 0xe8, 0x35, 0xf4, 0x24, 0x72, 0xee, 0x2f, 0xc8, 0x07, 0xf7, 0x12, 0xb7,
0x84, 0x9b, 0x0e, 0xa2, 0x11, 0x74, 0xb2, 0xe7, 0xcc, 0x7f, 0x4b, 0x08, 0x6e, 0x8b, 0xbb, 0x54,
0x88, 0x7b, 0x78, 0x84, 0xb1, 0x30, 0x8e, 0x84, 0x87, 0x25, 0x3d, 0x14, 0x88, 0x7b, 0xbc, 0x4f,
0x08, 0xf5, 0xd3, 0x30, 0x8e, 0xec, 0x29, 0x06, 0x71, 0x8f, 0x0a, 0xa1, 0x57, 0xd0, 0x74, 0x58,
0x60, 0x4f, 0x71, 0x47, 0x7c, 0x93, 0x06, 0x47, 0xe7, 0xf1, 0x27, 0x12, 0xe1, 0xae, 0x44, 0x85,
0x21, 0x4e, 0x5b, 0x2e, 0x57, 0x61, 0x44, 0xec, 0x68, 0x19, 0xe3, 0x5e, 0x76, 0x5a, 0x01, 0xf1,
0xda, 0xbc, 0x4f, 0xf8, 0xc9, 0x0c, 0xf7, 0x65, 0x45, 0x33, 0x13, 0x7d, 0x09, 0x70, 0xbd, 0xf2,
0xd3, 0x65, 0x4c, 0xd7, 0xf6, 0x14, 0x0f, 0xc4, 0x53, 0x15, 0x04, 0x7d, 0x01, 0xd6, 0x79, 0x4c,
0x17, 0xe4, 0x32, 0x64, 0x29, 0x1e, 0x8e, 0x8c, 0x89, 0xe5, 0x16, 0x80, 0xa8, 0xc5, 0x2a, 0x24,
0x51, 0x2a, 0xdf, 0x7a, 0x24, 0x6f, 0x56, 0xa0, 0xf1, 0xbf, 0x06, 0x1c, 0x4b, 0x36, 0xcc, 0xe3,
0xeb, 0x3b, 0x76, 0xfb, 0x22, 0xb4, 0xc0, 0xd0, 0xe2, 0x3e, 0x1e, 0xd9, 0x64, 0xac, 0xc8, 0x4d,
0x8d, 0x30, 0xcd, 0xc7, 0x09, 0x63, 0x3e, 0x45, 0x98, 0xd6, 0x61, 0x84, 0x69, 0x1f, 0x40, 0x18,
0xeb, 0x49, 0xc2, 0xc0, 0x93, 0x84, 0xe9, 0xec, 0x21, 0x4c, 0x57, 0x25, 0xcc, 0x4b, 0x52, 0xa3,
0xd4, 0xfc, 0x61, 0xb5, 0xf9, 0xbf, 0x43, 0xff, 0xfa, 0x6e, 0xb5, 0x72, 0x08, 0x63, 0x7e, 0x40,
0x5c, 0xb2, 0xe1, 0xbd, 0xfd, 0xc0, 0x08, 0x2d, 0x7a, 0x2e, 0x2d, 0xd9, 0xa7, 0xcd, 0x3b, 0x12,
0x84, 0x91, 0xe8, 0xba, 0xe8, 0x93, 0xb4, 0x25, 0x4f, 0x36, 0xb3, 0xe8, 0x46, 0xb4, 0xdd, 0x70,
0x33, 0xab, 0x5c, 0x93, 0x46, 0xa5, 0x26, 0xe3, 0x7f, 0x6a, 0x30, 0xd0, 0x1e, 0xc0, 0x12, 0x9e,
0xef, 0x8c, 0xd2, 0xb3, 0xf8, 0x86, 0x88, 0x27, 0x34, 0xdd, 0xdc, 0xe4, 0xf7, 0xcc, 0x28, 0x75,
0x58, 0x90, 0xf3, 0x4e, 0x5a, 0x1c, 0x77, 0xfc, 0x07, 0x4e, 0xae, 0xec, 0x7e, 0x69, 0x09, 0x3c,
0x8c, 0x0a, 0xd2, 0x65, 0x16, 0xfa, 0x1e, 0x7a, 0x5e, 0x18, 0x05, 0x2b, 0xc2, 0x73, 0xe3, 0xc7,
0x35, 0x47, 0xc6, 0xa4, 0xf3, 0xe6, 0xd5, 0xa9, 0x14, 0xc9, 0xd3, 0x0b, 0x3f, 0xbd, 0x25, 0xf4,
0x3c, 0xa6, 0x6b, 0x3f, 0x75, 0x75, 0x57, 0xf4, 0x16, 0xba, 0x17, 0x34, 0xbe, 0x4b, 0xf2, 0x50,
0x73, 0x4f, 0xa8, 0xe6, 0x39, 0xfe, 0x09, 0xba, 0x17, 0x24, 0xbd, 0x22, 0xbf, 0x7a, 0x64, 0xb3,
0xaf, 0xd2, 0xa5, 0xaa, 0xd5, 0xab, 0x55, 0xf3, 0xa0, 0xa7, 0x9c, 0xf4, 0xac, 0x92, 0x0d, 0xc1,
0x28, 0xea, 0xc5, 0xff, 0x1d, 0xcf, 0xa0, 0xab, 0x3e, 0x1e, 0xf5, 0xa1, 0xbe, 0x7d, 0x5a, 0xdd,
0x9e, 0xa2, 0xaf, 0xa0, 0x21, 0x24, 0xa6, 0x2e, 0x12, 0x3e, 0xca, 0x13, 0xe6, 0x13, 0x29, 0xb3,
0x15, 0x9f, 0xc7, 0xff, 0xd5, 0xc1, 0xda, 0x62, 0xcf, 0x51, 0x90, 0x7c, 0xe2, 0x0d, 0x7d, 0xe2,
0x4b, 0x33, 0xda, 0x78, 0x64, 0x46, 0xe9, 0xbd, 0x28, 0xb6, 0x3d, 0x15, 0x62, 0x62, 0xb9, 0x2a,
0xa4, 0xea, 0x93, 0xa9, 0xeb, 0x53, 0x56, 0x8e, 0xd6, 0xb6, 0x1c, 0x9a, 0x2e, 0xb5, 0x4b, 0xba,
0xf4, 0x0d, 0x0c, 0xa5, 0x80, 0x28, 0xd3, 0x27, 0x45, 0xa3, 0x82, 0xef, 0x50, 0x2a, 0x38, 0x4c,
0xa9, 0x3a, 0x8f, 0x29, 0x95, 0x32, 0xd1, 0xdd, 0xea, 0x44, 0xff, 0xd9, 0x80, 0x3e, 0x27, 0x12,
0x8f, 0x73, 0x58, 0xc0, 0x89, 0xf6, 0x1a, 0x7a, 0x2e, 0xd9, 0xd8, 0x37, 0x24, 0x4a, 0xc3, 0x65,
0x48, 0x68, 0xc6, 0x11, 0x1d, 0x2c, 0x36, 0x57, 0x5d, 0xdd, 0x5c, 0x45, 0x03, 0x0d, 0xad, 0x81,
0x4f, 0x8e, 0xf6, 0x8e, 0xc4, 0x9b, 0x87, 0x25, 0x6e, 0xee, 0x4a, 0x5c, 0x97, 0xba, 0xd6, 0x2e,
0xa9, 0x53, 0x05, 0xba, 0x5d, 0x15, 0x68, 0x85, 0x5a, 0xd6, 0x5e, 0x6a, 0x41, 0x95, 0x5a, 0x05,
0x5d, 0x3b, 0x1a, 0x5d, 0xb5, 0xdd, 0xdb, 0x2d, 0xef, 0x5e, 0x85, 0x6e, 0xbd, 0xca, 0x3a, 0x7c,
0x44, 0xd2, 0x4b, 0x0d, 0x1e, 0x54, 0x1a, 0x9c, 0x2d, 0x8c, 0xcb, 0x7c, 0x61, 0x0c, 0xb7, 0x0b,
0x23, 0x87, 0xf8, 0xe4, 0xce, 0x1e, 0xb2, 0x55, 0x5f, 0x9f, 0x3d, 0x8c, 0xff, 0xae, 0xc1, 0x40,
0xa3, 0xc4, 0xb3, 0x14, 0xa3, 0xc2, 0x22, 0x63, 0x17, 0x8b, 0xf6, 0xad, 0xf3, 0xd2, 0x80, 0x9a,
0xd5, 0x01, 0x2d, 0x65, 0xdf, 0xaa, 0x64, 0xff, 0xe6, 0xaf, 0x1a, 0x34, 0xb8, 0xee, 0xa0, 0xb7,
0x60, 0x6d, 0x35, 0x10, 0x15, 0xf2, 0xab, 0x08, 0xec, 0xc9, 0x67, 0x3b, 0x50, 0x96, 0xa0, 0x1f,
0xa1, 0xa3, 0xac, 0x1c, 0x74, 0x9c, 0x7b, 0xe9, 0x8b, 0xf0, 0xe4, 0xf3, 0x9d, 0xb8, 0x8c, 0x57,
0xaa, 0x59, 0xc4, 0xeb, 0x53, 0x57, 0xc4, 0x97, 0x4a, 0xff, 0xae, 0xf7, 0x4b, 0x87, 0xff, 0x30,
0xff, 0x41, 0x7e, 0xfe, 0x68, 0x8a, 0x1f, 0xe8, 0xdf, 0xfd, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xfe,
0xa0, 0x14, 0x71, 0xb3, 0x0b, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
src/proto/chat/chat.proto
+43 -30
View File
@@ -8,15 +8,19 @@ message WSToMsgSvrChatMsg{
string Content = 3;
int64 SendTime = 4;
int32 MsgFrom = 5;
int32 ContentType = 6;
int32 SessionType = 7;
string OperationID = 8;
string MsgID = 9;
string Token = 10;
string OfflineInfo =11;
string Options = 12;
int32 PlatformID =13;
repeated string ForceList = 14;
string SenderNickName = 6;
string SenderFaceURL = 7;
int32 ContentType = 8;
int32 SessionType = 9;
string OperationID = 10;
string MsgID = 11;
string Token = 12;
string OfflineInfo =13;
string Options = 14;
int32 PlatformID =15;
repeated string ForceList = 16;
string ClientMsgID = 17;
}
@@ -27,14 +31,17 @@ message MsgSvrToPushSvrChatMsg {
int64 RecvSeq = 4;
int64 SendTime = 5;
int32 MsgFrom = 6;
int32 ContentType = 7;
int32 SessionType = 8;
string OperationID = 9;
string MsgID = 10;
string OfflineInfo = 11;
string Options =12;
int32 PlatformID =13;
bool IsEmphasize = 14;
string SenderNickName = 7;
string SenderFaceURL = 8;
int32 ContentType = 9;
int32 SessionType = 10;
string OperationID = 11;
string MsgID = 12;
string OfflineInfo = 13;
string Options =14;
int32 PlatformID =15;
string ClientMsgID = 16;
}
message PullMessageReq {
@@ -86,6 +93,12 @@ message MsgFormat{
int64 SendTime = 8;
// @inject_tag: json:"senderPlatformID"
int32 SenderPlatformID = 9;
// @inject_tag: json:"senderNickName"
string SenderNickName = 10;
// @inject_tag: json:"senderFaceUrl"
string SenderFaceURL = 11;
// @inject_tag: json:"clientMsgID"
string ClientMsgID = 12;
}
message UserSendMsgReq {
@@ -94,18 +107,19 @@ message UserSendMsgReq {
string Token = 2;
string SendID = 3;
string OperationID = 4;
int32 MsgIncr = 5;
int32 PlatformID = 6;
int32 SessionType = 7;
int32 MsgFrom = 8;
int32 ContentType = 9;
string RecvID = 10;
repeated string ForceList = 11;
string Content = 12;
string Options = 13;
string ClientMsgID = 14;
string OffLineInfo = 15;
string Ex = 16;
string SenderNickName = 5;
string SenderFaceURL = 6;
int32 PlatformID = 7;
int32 SessionType = 8;
int32 MsgFrom = 9;
int32 ContentType = 10;
string RecvID = 11;
repeated string ForceList = 12;
string Content = 13;
string Options = 14;
string ClientMsgID = 15;
string OffLineInfo = 16;
string Ex = 17;
}
@@ -114,7 +128,6 @@ message UserSendMsgResp {
int32 ErrCode = 1;
string ErrMsg = 2;
int32 ReqIdentifier = 3;
int32 MsgIncr = 4;
int64 SendTime = 5;
string ServerMsgID = 6;
string ClientMsgID = 7;
src/proto/push/push.pb.go
+45 -27
View File
@@ -38,7 +38,9 @@ type PushMsgReq struct {
OfflineInfo string `protobuf:"bytes,11,opt,name=OfflineInfo,proto3" json:"OfflineInfo,omitempty"`
Options string `protobuf:"bytes,12,opt,name=Options,proto3" json:"Options,omitempty"`
PlatformID int32 `protobuf:"varint,13,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
IsEmphasize bool `protobuf:"varint,14,opt,name=IsEmphasize,proto3" json:"IsEmphasize,omitempty"`
SenderNickName string `protobuf:"bytes,14,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"`
SenderFaceURL string `protobuf:"bytes,15,opt,name=SenderFaceURL,proto3" json:"SenderFaceURL,omitempty"`
ClientMsgID string `protobuf:"bytes,16,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -160,11 +162,25 @@ func (m *PushMsgReq) GetPlatformID() int32 {
return 0
}
func (m *PushMsgReq) GetIsEmphasize() bool {
func (m *PushMsgReq) GetSenderNickName() string {
if m != nil {
return m.IsEmphasize
return m.SenderNickName
}
return false
return ""
}
func (m *PushMsgReq) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *PushMsgReq) GetClientMsgID() string {
if m != nil {
return m.ClientMsgID
}
return ""
}
type PushMsgResp struct {
@@ -216,29 +232,31 @@ func init() {
}
var fileDescriptor_ae0042da44e9a7a7 = []byte{
// 346 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x4d, 0x6b, 0xf2, 0x40,
0x14, 0x85, 0xc9, 0xab, 0xf1, 0x63, 0xf2, 0x6a, 0xdb, 0xa1, 0x94, 0x8b, 0x8b, 0x12, 0x5c, 0x65,
0x53, 0x0b, 0xed, 0xb2, 0x9b, 0x52, 0xd3, 0x42, 0x16, 0xa2, 0x4c, 0x5c, 0x75, 0xe7, 0xc7, 0x8d,
0x06, 0xcc, 0xcc, 0x98, 0x89, 0x42, 0xfb, 0x6b, 0xfa, 0x53, 0xcb, 0x9d, 0x44, 0x0d, 0xdd, 0x88,
0xe7, 0x39, 0xe7, 0x1e, 0x2e, 0xb9, 0xc3, 0xae, 0xf4, 0xc1, 0x6c, 0x1f, 0xe9, 0x67, 0xa4, 0x73,
0x55, 0x28, 0xde, 0xa4, 0xff, 0xc3, 0x9f, 0x06, 0x63, 0xb3, 0x83, 0xd9, 0x4e, 0xcc, 0x46, 0xe0,
0x9e, 0xdf, 0xb1, 0x56, 0x8c, 0x72, 0x1d, 0x85, 0xe0, 0xf8, 0x4e, 0xd0, 0x15, 0x95, 0x22, 0x2e,
0x70, 0x75, 0x8c, 0x42, 0xf8, 0x57, 0xf2, 0x52, 0x71, 0x60, 0xed, 0xb1, 0x92, 0x05, 0xca, 0x02,
0x1a, 0xd6, 0x38, 0x49, 0x72, 0x28, 0x13, 0xe3, 0x1e, 0x9a, 0xbe, 0x13, 0x34, 0xc4, 0x49, 0xf2,
0x01, 0xeb, 0x50, 0xeb, 0x3c, 0xcd, 0x10, 0x5c, 0x6b, 0x9d, 0x35, 0x4d, 0x4d, 0xcc, 0xe6, 0x23,
0x57, 0x19, 0xb4, 0x7c, 0x27, 0x70, 0xc5, 0x49, 0x72, 0x9f, 0x79, 0x55, 0xf5, 0xfc, 0x4b, 0x23,
0xb4, 0xad, 0x5b, 0x47, 0x94, 0x88, 0xd1, 0x98, 0x54, 0x49, 0x9b, 0xe8, 0x94, 0x89, 0x1a, 0xa2,
0xc4, 0x54, 0x63, 0xbe, 0x28, 0x52, 0x25, 0xa3, 0x10, 0xba, 0x76, 0xe3, 0x3a, 0xe2, 0xb7, 0xcc,
0x9d, 0x98, 0x4d, 0x14, 0x02, 0xb3, 0x5e, 0x29, 0xec, 0x5c, 0x92, 0xec, 0x52, 0x89, 0x91, 0x4c,
0x14, 0x78, 0xd5, 0xdc, 0x05, 0xd1, 0xde, 0x53, 0x4d, 0x1d, 0x06, 0xfe, 0x97, 0xdf, 0xa1, 0x92,
0xfc, 0x9e, 0xb1, 0xd9, 0x6e, 0x51, 0x24, 0x2a, 0xcf, 0xa2, 0x10, 0x7a, 0x76, 0xa9, 0x1a, 0xa1,
0xee, 0xc8, 0xbc, 0x67, 0x7a, 0xbb, 0x30, 0xe9, 0x37, 0x42, 0xdf, 0x77, 0x82, 0x8e, 0xa8, 0xa3,
0xe1, 0x03, 0xf3, 0xce, 0x17, 0x32, 0x9a, 0x0a, 0x05, 0x9a, 0xc3, 0xae, 0x18, 0xab, 0x35, 0xda,
0x33, 0xb9, 0xa2, 0x46, 0x9e, 0x5e, 0x59, 0xbf, 0x8a, 0xc7, 0x98, 0x1f, 0xd3, 0x15, 0xf2, 0x11,
0x6b, 0x57, 0x84, 0x5f, 0x8f, 0xec, 0x0b, 0xb8, 0x5c, 0x7c, 0x70, 0xf3, 0x87, 0x18, 0xfd, 0xd6,
0xfb, 0xf4, 0x88, 0xbd, 0xe8, 0x25, 0xd1, 0x65, 0xcb, 0xbe, 0x97, 0xe7, 0xdf, 0x00, 0x00, 0x00,
0xff, 0xff, 0x20, 0x4b, 0x09, 0x6a, 0x42, 0x02, 0x00, 0x00,
// 377 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x5d, 0xeb, 0xda, 0x30,
0x14, 0xc6, 0xe9, 0xb4, 0xbe, 0x9c, 0xce, 0x97, 0x85, 0x31, 0x82, 0x17, 0xa3, 0xc8, 0x18, 0xde,
0xcc, 0xc1, 0x76, 0xb9, 0x9b, 0x31, 0x8b, 0x50, 0x98, 0x2f, 0xa4, 0xee, 0x66, 0x77, 0xb5, 0x9e,
0x6a, 0x59, 0x9b, 0xc4, 0xa6, 0x0a, 0xfb, 0xd2, 0xfb, 0x0c, 0x23, 0x49, 0xd5, 0xfe, 0xbd, 0x29,
0x7d, 0x7e, 0xe7, 0x39, 0x87, 0x27, 0xc9, 0x81, 0x91, 0xbc, 0xa8, 0xd3, 0x67, 0xfd, 0x99, 0xcb,
0x52, 0x54, 0x82, 0xb4, 0xf5, 0xff, 0xf4, 0x5f, 0x0b, 0x60, 0x7b, 0x51, 0xa7, 0x95, 0x3a, 0x32,
0x3c, 0x93, 0x77, 0xd0, 0x89, 0x90, 0x1f, 0xc2, 0x80, 0x3a, 0xbe, 0x33, 0xeb, 0xb3, 0x5a, 0x69,
0xce, 0x30, 0xb9, 0x86, 0x01, 0x7d, 0x65, 0xb9, 0x55, 0x84, 0x42, 0x77, 0x21, 0x78, 0x85, 0xbc,
0xa2, 0x2d, 0x53, 0xb8, 0x49, 0x5d, 0xd1, 0x9e, 0x08, 0xcf, 0xb4, 0xed, 0x3b, 0xb3, 0x16, 0xbb,
0x49, 0x32, 0x81, 0x9e, 0x9e, 0xba, 0xcb, 0x0a, 0xa4, 0xae, 0x29, 0xdd, 0xb5, 0xee, 0x5a, 0xa9,
0xe3, 0xb2, 0x14, 0x05, 0xed, 0xf8, 0xce, 0xcc, 0x65, 0x37, 0x49, 0x7c, 0xf0, 0xea, 0xd1, 0xbb,
0xbf, 0x12, 0x69, 0xd7, 0x54, 0x9b, 0x48, 0x3b, 0x22, 0x54, 0x2a, 0x13, 0xdc, 0x38, 0x7a, 0xd6,
0xd1, 0x40, 0xda, 0xb1, 0x91, 0x58, 0xc6, 0x55, 0x26, 0x78, 0x18, 0xd0, 0xbe, 0x49, 0xdc, 0x44,
0xe4, 0x2d, 0xb8, 0x2b, 0x75, 0x0c, 0x03, 0x0a, 0xa6, 0x66, 0x85, 0xe9, 0x4b, 0xd3, 0x3c, 0xe3,
0x18, 0xf2, 0x54, 0x50, 0xaf, 0xee, 0x7b, 0x20, 0x9d, 0x7b, 0x23, 0xf5, 0x0c, 0x45, 0x5f, 0xdb,
0x7b, 0xa8, 0x25, 0x79, 0x0f, 0xb0, 0xcd, 0xe3, 0x2a, 0x15, 0x65, 0x11, 0x06, 0x74, 0x60, 0x42,
0x35, 0x08, 0xf9, 0x08, 0x43, 0x7d, 0x7a, 0x2c, 0xd7, 0x59, 0xf2, 0x67, 0x1d, 0x17, 0x48, 0x87,
0x66, 0xc0, 0x13, 0x25, 0x1f, 0x60, 0x60, 0xc9, 0x32, 0x4e, 0xf0, 0x17, 0xfb, 0x49, 0x47, 0xc6,
0xf6, 0x12, 0x9a, 0x5b, 0xca, 0x33, 0xe4, 0x95, 0x3d, 0xc5, 0xd8, 0x26, 0x6d, 0xa0, 0xe9, 0x27,
0xf0, 0xee, 0xef, 0xad, 0xa4, 0x8e, 0xc7, 0x50, 0x5d, 0xf2, 0x6a, 0x21, 0x0e, 0x68, 0x1e, 0xdd,
0x65, 0x0d, 0xf2, 0xe5, 0x3b, 0x0c, 0x6b, 0x7b, 0x84, 0xe5, 0x35, 0x4b, 0x90, 0xcc, 0xa1, 0x5b,
0x13, 0x32, 0x9e, 0x9b, 0x7d, 0x7a, 0xec, 0xcf, 0xe4, 0xcd, 0x13, 0x51, 0xf2, 0xc7, 0xe0, 0xb7,
0xa7, 0xd9, 0x37, 0xb9, 0xd7, 0x74, 0xdf, 0x31, 0xdb, 0xf7, 0xf5, 0x7f, 0x00, 0x00, 0x00, 0xff,
0xff, 0x50, 0x88, 0x84, 0xf6, 0x90, 0x02, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
src/proto/push/push.proto
+3 -1
View File
@@ -16,7 +16,9 @@ message PushMsgReq {
string OfflineInfo = 11;
string Options =12;
int32 PlatformID =13;
bool IsEmphasize = 14;
string SenderNickName = 14;
string SenderFaceURL = 15;
string ClientMsgID = 16;
}
message PushMsgResp{
int32 ResultCode = 1;
src/proto/relay/relay.pb.go
+47 -29
View File
@@ -36,7 +36,9 @@ type MsgToUserReq struct {
OperationID string `protobuf:"bytes,11,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
ServerMsgID string `protobuf:"bytes,12,opt,name=ServerMsgID,proto3" json:"ServerMsgID,omitempty"`
PlatformID int32 `protobuf:"varint,13,opt,name=PlatformID,proto3" json:"PlatformID,omitempty"`
IsEmphasize bool `protobuf:"varint,14,opt,name=IsEmphasize,proto3" json:"IsEmphasize,omitempty"`
SenderNickName string `protobuf:"bytes,14,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"`
SenderFaceURL string `protobuf:"bytes,15,opt,name=SenderFaceURL,proto3" json:"SenderFaceURL,omitempty"`
ClientMsgID string `protobuf:"bytes,16,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -144,11 +146,25 @@ func (m *MsgToUserReq) GetPlatformID() int32 {
return 0
}
func (m *MsgToUserReq) GetIsEmphasize() bool {
func (m *MsgToUserReq) GetSenderNickName() string {
if m != nil {
return m.IsEmphasize
return m.SenderNickName
}
return false
return ""
}
func (m *MsgToUserReq) GetSenderFaceURL() string {
if m != nil {
return m.SenderFaceURL
}
return ""
}
func (m *MsgToUserReq) GetClientMsgID() string {
if m != nil {
return m.ClientMsgID
}
return ""
}
type MsgToUserResp struct {
@@ -267,31 +283,33 @@ func init() {
}
var fileDescriptor_b6da3b5c0d1535b3 = []byte{
// 381 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcb, 0x6a, 0xe3, 0x30,
0x18, 0x85, 0x71, 0x3c, 0xb9, 0x29, 0x37, 0x46, 0x33, 0x04, 0x4d, 0x16, 0x83, 0xc9, 0xa2, 0x98,
0x2e, 0x52, 0x48, 0xa1, 0x9b, 0xec, 0x1a, 0x37, 0xe0, 0x85, 0x49, 0x91, 0xd3, 0x4d, 0x77, 0x4e,
0xf2, 0xd7, 0x35, 0xd8, 0x92, 0x22, 0xb9, 0x81, 0xf4, 0xb1, 0xfb, 0x04, 0x45, 0x72, 0xd2, 0x88,
0x94, 0x6e, 0x8c, 0xcf, 0xf7, 0x1f, 0x1f, 0x1f, 0x5d, 0xd0, 0x6f, 0x09, 0x79, 0x72, 0xb8, 0x31,
0xcf, 0x89, 0x90, 0xbc, 0xe4, 0xb8, 0x6e, 0xc4, 0xf8, 0xa3, 0x86, 0xba, 0x91, 0x4a, 0x57, 0xfc,
0x49, 0x81, 0xa4, 0xb0, 0xc3, 0x43, 0xd4, 0x88, 0x81, 0x6d, 0xc3, 0x80, 0x38, 0x9e, 0xe3, 0xb7,
0xe9, 0x51, 0x69, 0x4e, 0x61, 0xb3, 0x0f, 0x03, 0x52, 0xab, 0x78, 0xa5, 0x30, 0x41, 0xcd, 0x39,
0x67, 0x25, 0xb0, 0x92, 0xd4, 0xcd, 0xe0, 0x24, 0xf5, 0x44, 0x7b, 0x62, 0xd8, 0x91, 0x86, 0xe7,
0xf8, 0x2e, 0x3d, 0x49, 0x3c, 0x42, 0x2d, 0x9d, 0xba, 0xca, 0x0a, 0x20, 0x4d, 0x33, 0xfa, 0xd2,
0xfa, 0xab, 0x48, 0xa5, 0x0b, 0xc9, 0x0b, 0xd2, 0xf2, 0x1c, 0xbf, 0x4e, 0x4f, 0x12, 0x7b, 0xa8,
0x73, 0x8c, 0x5e, 0x1d, 0x04, 0x90, 0xb6, 0x99, 0xda, 0x48, 0x3b, 0x62, 0x50, 0x2a, 0xe3, 0xcc,
0x38, 0x50, 0xe5, 0xb0, 0x90, 0x76, 0x2c, 0x05, 0xc8, 0xa4, 0xcc, 0x38, 0x0b, 0x03, 0xd2, 0x31,
0x8d, 0x6d, 0x54, 0x65, 0xc8, 0x3d, 0xc8, 0x48, 0xa5, 0x61, 0x40, 0xba, 0x95, 0xc3, 0x42, 0xf8,
0x3f, 0x42, 0x8f, 0x79, 0x52, 0xbe, 0x70, 0x59, 0x84, 0x01, 0xe9, 0x99, 0x9f, 0x58, 0x44, 0x27,
0x84, 0xea, 0xa1, 0x10, 0xaf, 0x89, 0xca, 0xde, 0x81, 0xf4, 0x3d, 0xc7, 0x6f, 0x51, 0x1b, 0x8d,
0x67, 0xa8, 0x67, 0xed, 0xb9, 0x12, 0xf8, 0x1a, 0xfd, 0x92, 0xa0, 0x04, 0x71, 0x3c, 0xd7, 0xef,
0x4c, 0x87, 0x93, 0xea, 0xa0, 0xe2, 0x8c, 0xa5, 0x39, 0x9c, 0x9d, 0xc6, 0x33, 0xde, 0xa1, 0xc1,
0xc5, 0x40, 0x37, 0xa2, 0xa0, 0xde, 0xf2, 0x72, 0xce, 0xb7, 0x60, 0xce, 0xcd, 0xa5, 0x16, 0xf9,
0xf1, 0xec, 0xae, 0x50, 0x5f, 0xbf, 0xe9, 0xee, 0x8b, 0x6a, 0x35, 0xae, 0x59, 0xcd, 0x05, 0x9d,
0xc6, 0xe8, 0xdf, 0x92, 0xe5, 0x19, 0x83, 0x08, 0x94, 0x4a, 0x52, 0xa0, 0xba, 0x9e, 0xde, 0x92,
0x6c, 0x03, 0xf8, 0x0e, 0xb5, 0xcf, 0x4d, 0xfe, 0x1c, 0xab, 0xdb, 0x57, 0x6a, 0xf4, 0xf7, 0x3b,
0x54, 0xe2, 0x7e, 0xf0, 0xdc, 0x33, 0x78, 0x26, 0xd6, 0x26, 0x6f, 0xdd, 0x30, 0x17, 0xf3, 0xf6,
0x33, 0x00, 0x00, 0xff, 0xff, 0x57, 0x9a, 0x71, 0x03, 0xad, 0x02, 0x00, 0x00,
// 412 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x6f, 0xd3, 0x30,
0x14, 0xc6, 0x15, 0x42, 0xbb, 0xf5, 0x75, 0x6d, 0xc1, 0xa0, 0xc9, 0xec, 0x80, 0xa2, 0x0a, 0x4d,
0x11, 0x87, 0x21, 0x0d, 0x89, 0xcb, 0x6e, 0x2c, 0xaa, 0x14, 0x89, 0x6c, 0xc8, 0xe9, 0x2e, 0xdc,
0xb2, 0xec, 0x11, 0x59, 0x24, 0x76, 0x6a, 0x87, 0x49, 0xfb, 0xef, 0xf8, 0xd3, 0x90, 0x9f, 0x5b,
0x6a, 0x8a, 0xb8, 0x44, 0xf9, 0x7e, 0xef, 0xcb, 0xcb, 0xe7, 0xe7, 0x07, 0x2f, 0x0d, 0xb6, 0xd5,
0xd3, 0x07, 0x7a, 0x5e, 0xf4, 0x46, 0x0f, 0x9a, 0x8d, 0x48, 0x2c, 0x7f, 0xc5, 0x70, 0x52, 0xd8,
0x66, 0xad, 0xef, 0x2c, 0x1a, 0x81, 0x1b, 0x76, 0x0a, 0xe3, 0x12, 0xd5, 0x43, 0x9e, 0xf1, 0x28,
0x89, 0xd2, 0x89, 0xd8, 0x2a, 0xc7, 0x05, 0xd6, 0x8f, 0x79, 0xc6, 0x9f, 0x79, 0xee, 0x15, 0xe3,
0x70, 0x74, 0xad, 0xd5, 0x80, 0x6a, 0xe0, 0x23, 0x2a, 0xec, 0xa4, 0xab, 0x38, 0x4f, 0x89, 0x1b,
0x3e, 0x4e, 0xa2, 0x34, 0x16, 0x3b, 0xc9, 0xce, 0xe0, 0xd8, 0x75, 0x5d, 0xcb, 0x0e, 0xf9, 0x11,
0x95, 0xfe, 0x68, 0xf7, 0x55, 0x61, 0x9b, 0x95, 0xd1, 0x1d, 0x3f, 0x4e, 0xa2, 0x74, 0x24, 0x76,
0x92, 0x25, 0x30, 0xdd, 0xb6, 0x5e, 0x3f, 0xf5, 0xc8, 0x27, 0x54, 0x0d, 0x91, 0x73, 0x94, 0x68,
0xad, 0xd4, 0x8a, 0x1c, 0xe0, 0x1d, 0x01, 0x72, 0x8e, 0xdb, 0x1e, 0x4d, 0x35, 0x48, 0xad, 0xf2,
0x8c, 0x4f, 0x29, 0x71, 0x88, 0x7c, 0x0f, 0xf3, 0x88, 0xa6, 0xb0, 0x4d, 0x9e, 0xf1, 0x13, 0xef,
0x08, 0x10, 0x7b, 0x0b, 0xf0, 0xb5, 0xad, 0x86, 0xef, 0xda, 0x74, 0x79, 0xc6, 0x67, 0xf4, 0x93,
0x80, 0xb0, 0x73, 0x98, 0xbb, 0xd3, 0xa0, 0xb9, 0x91, 0xf5, 0x8f, 0x9b, 0xaa, 0x43, 0x3e, 0xa7,
0x26, 0x07, 0x94, 0xbd, 0x83, 0x99, 0x27, 0xab, 0xaa, 0xc6, 0x3b, 0xf1, 0x85, 0x2f, 0xc8, 0xf6,
0x37, 0xa4, 0x53, 0xb7, 0x12, 0xd5, 0xe0, 0xf3, 0xbc, 0xf0, 0x79, 0x02, 0xb4, 0xbc, 0x82, 0x59,
0x70, 0x83, 0xb6, 0x67, 0xef, 0xe1, 0xb9, 0x41, 0xdb, 0xf3, 0x28, 0x89, 0xd3, 0xe9, 0xe5, 0xe9,
0x85, 0xbf, 0xf6, 0x52, 0xaa, 0xa6, 0xc5, 0xbd, 0x93, 0x3c, 0xcb, 0x0d, 0x2c, 0x0e, 0x0a, 0xee,
0x7c, 0x02, 0xed, 0xcf, 0x76, 0xb8, 0xd6, 0x0f, 0x48, 0x5b, 0x10, 0x8b, 0x80, 0xfc, 0x77, 0x13,
0xce, 0x61, 0xee, 0xde, 0xdc, 0x24, 0x56, 0x7e, 0x36, 0x31, 0xcd, 0xe6, 0x80, 0x5e, 0x96, 0xf0,
0xe6, 0x56, 0xb5, 0x52, 0x61, 0x81, 0xd6, 0x56, 0x0d, 0x0a, 0x17, 0xcf, 0x0d, 0x58, 0xd6, 0xc8,
0x3e, 0xc1, 0x64, 0x9f, 0xe4, 0xd5, 0x36, 0x7a, 0xb8, 0xa0, 0x67, 0xaf, 0xff, 0x85, 0xb6, 0xff,
0xbc, 0xf8, 0x36, 0x23, 0x7c, 0xd5, 0xdf, 0x53, 0xbf, 0xfb, 0x31, 0xad, 0xf9, 0xc7, 0xdf, 0x01,
0x00, 0x00, 0xff, 0xff, 0xca, 0xdd, 0x7b, 0x0c, 0xfb, 0x02, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
src/proto/relay/relay.proto
+3 -1
View File
@@ -14,7 +14,9 @@ message MsgToUserReq {
string OperationID = 11;
string ServerMsgID = 12;
int32 PlatformID = 13;
bool IsEmphasize = 14;
string SenderNickName = 14;
string SenderFaceURL = 15;
string ClientMsgID = 16;
}
message MsgToUserResp{
repeated SingleMsgToUser resp = 1;