diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 0b84cbd10..672379114 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -32,15 +32,18 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code } msg = &pb.DBChat{ - Id: primitive.NewObjectID().Hex(), - Channel: req.Channel, - Suid: session.GetUserId(), - Slv: req.Ulv, - Uname: req.Uname, - Avatar: req.Avatar, - Stag: session.GetServiecTag(), - Content: req.Content, - Ctime: time.Now().Unix(), + Id: primitive.NewObjectID().Hex(), + Channel: req.Channel, + Suid: session.GetUserId(), + Slv: req.Ulv, + Uname: req.Uname, + Avatar: req.Avatar, + Stag: session.GetServiecTag(), + Content: req.Content, + Ctime: time.Now().Unix(), + AppendInt: req.AppendInt, + AppendStr: req.AppendStr, + AppendBool: req.AppendBool, } if max, err = this.module.configure.GetChannelRecordMax(); err != nil { code = pb.ErrorCode_ConfigNoFound diff --git a/modules/chat/api_sendcross.go b/modules/chat/api_sendcross.go index 264e8dc0a..dae634c3d 100644 --- a/modules/chat/api_sendcross.go +++ b/modules/chat/api_sendcross.go @@ -32,15 +32,18 @@ func (this *apiComp) SendCross(session comm.IUserSession, req *pb.ChatSendCrossR } msg = &pb.DBChat{ - Id: primitive.NewObjectID().Hex(), - Channel: req.Channel, - Suid: session.GetUserId(), - Slv: req.Ulv, - Uname: req.Uname, - Avatar: req.Avatar, - Stag: session.GetServiecTag(), - Content: req.Content, - Ctime: time.Now().Unix(), + Id: primitive.NewObjectID().Hex(), + Channel: req.Channel, + Suid: session.GetUserId(), + Slv: req.Ulv, + Uname: req.Uname, + Avatar: req.Avatar, + Stag: session.GetServiecTag(), + Content: req.Content, + Ctime: time.Now().Unix(), + AppendInt: req.AppendInt, + AppendStr: req.AppendStr, + AppendBool: req.AppendBool, } // if max, err = this.module.configure.GetChannelRecordMax(); err != nil { // code = pb.ErrorCode_ConfigNoFound diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go index 5e08ad401..d76fda2d5 100644 --- a/pb/chat_db.pb.go +++ b/pb/chat_db.pb.go @@ -81,8 +81,9 @@ type ChatType int32 const ( ChatType_Text ChatType = 0 //文泵聊天消息 ChatType_Moonfantasy ChatType = 1 //月子秘境消息 - ChatType_HeroShare ChatType = 2 //英雄分享 - ChatType_EquipmentShare ChatType = 3 //装备分享 + ChatType_Share ChatType = 2 //分享类型 + ChatType_HeroShare ChatType = 3 //英雄分享 + ChatType_EquipmentShare ChatType = 4 //装备分享 ) // Enum value maps for ChatType. @@ -90,14 +91,16 @@ var ( ChatType_name = map[int32]string{ 0: "Text", 1: "Moonfantasy", - 2: "HeroShare", - 3: "EquipmentShare", + 2: "Share", + 3: "HeroShare", + 4: "EquipmentShare", } ChatType_value = map[string]int32{ "Text": 0, "Moonfantasy": 1, - "HeroShare": 2, - "EquipmentShare": 3, + "Share": 2, + "HeroShare": 3, + "EquipmentShare": 4, } ) @@ -330,13 +333,13 @@ var file_chat_chat_db_proto_rawDesc = []byte{ 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x53, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x10, 0x04, 0x2a, 0x48, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x54, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x10, 0x04, 0x2a, 0x53, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x65, 0x78, 0x74, 0x10, 0x00, 0x12, 0x0f, 0x0a, - 0x0b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01, 0x12, 0x0d, - 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x12, 0x0a, - 0x0e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, - 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x0b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x01, 0x12, 0x09, + 0x0a, 0x05, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x65, 0x72, + 0x6f, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x45, 0x71, 0x75, 0x69, + 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x68, 0x61, 0x72, 0x65, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/chat_msg.pb.go b/pb/chat_msg.pb.go index 9c40be35d..3cbd98adf 100644 --- a/pb/chat_msg.pb.go +++ b/pb/chat_msg.pb.go @@ -473,12 +473,16 @@ type ChatSendReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 - Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 - Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 - Channel ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 - TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"` //目标用户id - Content string `protobuf:"bytes,6,opt,name=content,proto3" json:"content"` //内容 + Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 + Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 + Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 + Channel ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 + TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"` //目标用户id + Ctype ChatType `protobuf:"varint,6,opt,name=ctype,proto3,enum=ChatType" json:"ctype"` //消息类型 + Content string `protobuf:"bytes,7,opt,name=content,proto3" json:"content"` //内容 + AppendInt int64 `protobuf:"varint,8,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"` //聊天附加数据 + AppendStr string `protobuf:"bytes,9,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"` //聊天附加数据 + AppendBool string `protobuf:"bytes,10,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"` //聊天附加数据 } func (x *ChatSendReq) Reset() { @@ -548,6 +552,13 @@ func (x *ChatSendReq) GetTargetId() string { return "" } +func (x *ChatSendReq) GetCtype() ChatType { + if x != nil { + return x.Ctype + } + return ChatType_Text +} + func (x *ChatSendReq) GetContent() string { if x != nil { return x.Content @@ -555,6 +566,27 @@ func (x *ChatSendReq) GetContent() string { return "" } +func (x *ChatSendReq) GetAppendInt() int64 { + if x != nil { + return x.AppendInt + } + return 0 +} + +func (x *ChatSendReq) GetAppendStr() string { + if x != nil { + return x.AppendStr + } + return "" +} + +func (x *ChatSendReq) GetAppendBool() string { + if x != nil { + return x.AppendBool + } + return "" +} + //消息发送请求 回应 type ChatSendResp struct { state protoimpl.MessageState @@ -609,12 +641,16 @@ type ChatSendCrossReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 - Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 - Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 - Channel ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 - TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"` //目标用户id - Content string `protobuf:"bytes,6,opt,name=content,proto3" json:"content"` //内容 + Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 + Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 + Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 + Channel ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 + TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"` //目标用户id + Ctype ChatType `protobuf:"varint,6,opt,name=ctype,proto3,enum=ChatType" json:"ctype"` //消息类型 + Content string `protobuf:"bytes,7,opt,name=content,proto3" json:"content"` //内容 + AppendInt int64 `protobuf:"varint,8,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"` //聊天附加数据 + AppendStr string `protobuf:"bytes,9,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"` //聊天附加数据 + AppendBool string `protobuf:"bytes,10,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"` //聊天附加数据 } func (x *ChatSendCrossReq) Reset() { @@ -684,6 +720,13 @@ func (x *ChatSendCrossReq) GetTargetId() string { return "" } +func (x *ChatSendCrossReq) GetCtype() ChatType { + if x != nil { + return x.Ctype + } + return ChatType_Text +} + func (x *ChatSendCrossReq) GetContent() string { if x != nil { return x.Content @@ -691,6 +734,27 @@ func (x *ChatSendCrossReq) GetContent() string { return "" } +func (x *ChatSendCrossReq) GetAppendInt() int64 { + if x != nil { + return x.AppendInt + } + return 0 +} + +func (x *ChatSendCrossReq) GetAppendStr() string { + if x != nil { + return x.AppendStr + } + return "" +} + +func (x *ChatSendCrossReq) GetAppendBool() string { + if x != nil { + return x.AppendBool + } + return "" +} + //跨服消息发送请求 回应 type ChatSendCrossResp struct { state protoimpl.MessageState @@ -778,7 +842,7 @@ var file_chat_chat_msg_proto_rawDesc = []byte{ 0x65, 0x6c, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x14, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x43, 0x68, 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xab, 0x01, 0x0a, 0x0b, + 0x43, 0x68, 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xa8, 0x02, 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, @@ -788,26 +852,41 @@ var file_chat_chat_msg_proto_rawDesc = []byte{ 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, - 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, - 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, - 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, - 0x63, 0x22, 0xb0, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, - 0x6f, 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, - 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, - 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, - 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, - 0x43, 0x72, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, - 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, - 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, + 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, + 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, + 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, + 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, + 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, + 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, + 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, + 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0xad, + 0x02, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, 0x6f, 0x73, 0x73, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x75, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, + 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, + 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, + 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x22, 0x2b, + 0x0a, 0x11, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -839,6 +918,7 @@ var file_chat_chat_msg_proto_goTypes = []interface{}{ (*ChatSendCrossResp)(nil), // 12: ChatSendCrossResp (*DBChat)(nil), // 13: DBChat (ChatChannel)(0), // 14: ChatChannel + (ChatType)(0), // 15: ChatType } var file_chat_chat_msg_proto_depIdxs = []int32{ 13, // 0: ChatMessagePush.chat:type_name -> DBChat @@ -847,12 +927,14 @@ var file_chat_chat_msg_proto_depIdxs = []int32{ 14, // 3: ChatGetCrossListReq.channel:type_name -> ChatChannel 13, // 4: ChatGetCrossListResp.chats:type_name -> DBChat 14, // 5: ChatSendReq.channel:type_name -> ChatChannel - 14, // 6: ChatSendCrossReq.channel:type_name -> ChatChannel - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 15, // 6: ChatSendReq.ctype:type_name -> ChatType + 14, // 7: ChatSendCrossReq.channel:type_name -> ChatChannel + 15, // 8: ChatSendCrossReq.ctype:type_name -> ChatType + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_chat_chat_msg_proto_init() }