diff --git a/cmd/rpc/open_im_message_cms/main.go b/cmd/rpc/open_im_message_cms/main.go new file mode 100644 index 000000000..2ca603991 --- /dev/null +++ b/cmd/rpc/open_im_message_cms/main.go @@ -0,0 +1,13 @@ +package main + +import ( + rpcMessageCMS "Open_IM/internal/rpc/message_cms" + "flag" +) + +func main() { + rpcPort := flag.Int("port", 11200, "rpc listening port") + flag.Parse() + rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort) + rpcServer.Run() +} diff --git a/internal/cms_api/message/message.go b/internal/cms_api/message/message.go index 297268405..d223b94b1 100644 --- a/internal/cms_api/message/message.go +++ b/internal/cms_api/message/message.go @@ -1,7 +1,15 @@ package message import ( + "Open_IM/pkg/cms_api_struct" + "Open_IM/pkg/common/config" openIMHttp "Open_IM/pkg/common/http" + "Open_IM/pkg/common/log" + "Open_IM/pkg/grpc-etcdv3/getcdv3" + pbMessage "Open_IM/pkg/proto/message_cms" + "Open_IM/pkg/utils" + "context" + "strings" "Open_IM/pkg/common/constant" @@ -19,3 +27,27 @@ func MassSendMassage(c *gin.Context) { func WithdrawMessage(c *gin.Context) { openIMHttp.RespHttp200(c, constant.OK, nil) } + +func GetChatLogs(c *gin.Context) { + var ( + req cms_api_struct.GetChatLogsRequest + resp cms_api_struct.GetChatLogsResponse + reqPb pbMessage.GetChatLogsReq + ) + if err := c.ShouldBindQuery(&req); err != nil { + log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error()) + openIMHttp.RespHttp200(c, constant.ErrArgs, resp) + return + } + utils.CopyStructFields(&reqPb, &req) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImStatisticsName) + client := pbMessage.NewMessageClient(etcdConn) + respPb, err := client.GetChatLogs(context.Background(), &reqPb) + if err != nil { + log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetChatLogs rpc failed", err.Error()) + openIMHttp.RespHttp200(c, constant.ErrServer, resp) + return + } + utils.CopyStructFields(&resp, &respPb) + openIMHttp.RespHttp200(c, constant.OK, resp) +} diff --git a/internal/rpc/message_cms/message_cms.go b/internal/rpc/message_cms/message_cms.go new file mode 100644 index 000000000..ed04446d8 --- /dev/null +++ b/internal/rpc/message_cms/message_cms.go @@ -0,0 +1,99 @@ +package MessageCMS + +import ( + "Open_IM/pkg/common/config" + "Open_IM/pkg/common/db" + "context" + + //"Open_IM/pkg/common/constant" + //"Open_IM/pkg/common/db" + + "Open_IM/pkg/common/log" + + //cp "Open_IM/pkg/common/utils" + "Open_IM/pkg/grpc-etcdv3/getcdv3" + pbMessageCMS "Open_IM/pkg/proto/message_cms" + + "Open_IM/pkg/utils" + //"context" + "net" + "strconv" + "strings" + + "google.golang.org/grpc" +) + +type messageCMSServer struct { + rpcPort int + rpcRegisterName string + etcdSchema string + etcdAddr []string +} + +func NewMessageCMSServer(port int) *messageCMSServer { + log.NewPrivateLog("Statistics") + return &messageCMSServer{ + rpcPort: port, + rpcRegisterName: config.Config.RpcRegisterName.OpenImStatisticsName, + etcdSchema: config.Config.Etcd.EtcdSchema, + etcdAddr: config.Config.Etcd.EtcdAddr, + } +} + +func (s *messageCMSServer) Run() { + log.NewInfo("0", "Statistics rpc start ") + ip := utils.ServerIP + registerAddress := ip + ":" + strconv.Itoa(s.rpcPort) + //listener network + listener, err := net.Listen("tcp", registerAddress) + if err != nil { + log.NewError("0", "Listen failed ", err.Error(), registerAddress) + return + } + log.NewInfo("0", "listen network success, ", registerAddress, listener) + defer listener.Close() + //grpc server + srv := grpc.NewServer() + defer srv.GracefulStop() + //Service registers with etcd + pbMessageCMS.RegisterMessageServer(srv, s) + err = getcdv3.RegisterEtcd(s.etcdSchema, strings.Join(s.etcdAddr, ","), ip, s.rpcPort, s.rpcRegisterName, 10) + if err != nil { + log.NewError("0", "RegisterEtcd failed ", err.Error()) + return + } + err = srv.Serve(listener) + if err != nil { + log.NewError("0", "Serve failed ", err.Error()) + return + } + log.NewInfo("0", "statistics rpc success") +} + +func (s *messageCMSServer) BoradcastMessage(_ context.Context, req *pbMessageCMS.BoradcastMessageReq) (*pbMessageCMS.BoradcastMessageResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "BoradcastMessage", req.String()) + resp := &pbMessageCMS.BoradcastMessageResp{} + return resp, nil +} + +func (s *messageCMSServer) GetChatLogs(_ context.Context, req *pbMessageCMS.GetChatLogsReq) (*pbMessageCMS.GetChatLogsResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "GetChatLogs", req.String()) + resp := &pbMessageCMS.GetChatLogsResp{} + chatLog := db.ChatLog{ + Content: req.Content, + } + return resp, nil +} + +func (s *messageCMSServer) MassSendMessage(_ context.Context, req *pbMessageCMS.MassSendMessageReq) (*pbMessageCMS.MassSendMessageResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "MassSendMessage", req.String()) + resp := &pbMessageCMS.MassSendMessageResp{} + return resp, nil +} + +func (s *messageCMSServer) WithdrawMessage(_ context.Context, req *pbMessageCMS.WithdrawMessageReq) (*pbMessageCMS.WithdrawMessageResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "WithdrawMessage", req.String()) + resp := &pbMessageCMS.WithdrawMessageResp{} + + return resp, nil +} diff --git a/pkg/cms_api_struct/message.go b/pkg/cms_api_struct/message.go deleted file mode 100644 index a9e32f70e..000000000 --- a/pkg/cms_api_struct/message.go +++ /dev/null @@ -1,33 +0,0 @@ -package cms_api_struct - -type BroadcastRequest struct { - Message string `json:"message"` -} - -type BroadcastResponse struct { -} - -type CommonMessage struct { - SessionType int `json:"session_type"` - ContentType int `json:"content_type"` - SenderNickName string `json:"sender_nick_name"` - SenderId int `json:"sender_id"` - SearchContent string `json:"search_content"` - WholeContent string `json:"whole_content"` -} - -type SearchMessageByUserResponse struct { - MessageList []struct { - CommonMessage - ReceiverNickName string `json:"receiver_nick_name"` - ReceiverID int `json:"receiver_id"` - Date string `json:"date"` - } `json:"massage_list"` -} - -type SearchMessageByGroupResponse struct { - MessageList []struct { - CommonMessage - Date string `json:"date"` - } `json:"massage_list"` -} diff --git a/pkg/cms_api_struct/message_cms.go b/pkg/cms_api_struct/message_cms.go new file mode 100644 index 000000000..e65b8d2f7 --- /dev/null +++ b/pkg/cms_api_struct/message_cms.go @@ -0,0 +1,48 @@ +package cms_api_struct + +type BroadcastRequest struct { + Message string `json:"message"` +} + +type BroadcastResponse struct { +} + +type MassSendMassageRequest struct { +} + +type MassSendMassageResponse struct { +} + +type GetChatLogsRequest struct { + SessionType int `form:"session_type"` + ContentType int `form:"content_type"` + Content string `form:"content"` + UserId string `form:"user_id"` + GroupId string `form:"group_id"` + Date string `form:"date"` + + RequestPagination +} + +type ChatLog struct { + SessionType int `json:"session_type"` + ContentType int `json:"content_type"` + SenderNickName string `json:"sender_nick_name"` + SenderId int `json:"sender_id"` + SearchContent string `json:"search_content"` + WholeContent string `json:"whole_content"` + + ReceiverNickName string `json:"receiver_nick_name"` + ReceiverID int `json:"receiver_id"` + + GroupName string `json:"group_name"` + GroupId string `json:"group_id"` + + Date string `json:"date"` +} + +type GetChatLogsResponse struct { + ChatLogs []ChatLog `json:"chat_logs"` + + ResponsePagination +} diff --git a/pkg/proto/message/message.pb.go b/pkg/proto/message_cms/message.pb.go similarity index 52% rename from pkg/proto/message/message.pb.go rename to pkg/proto/message_cms/message.pb.go index dcbbd907d..740ea304b 100644 --- a/pkg/proto/message/message.pb.go +++ b/pkg/proto/message_cms/message.pb.go @@ -2,11 +2,12 @@ // versions: // protoc-gen-go v1.26.0 // protoc v3.19.3 -// source: message/message.proto +// source: message_cms/message.proto -package message +package messageCMS import ( + sdk_ws "Open_IM/pkg/proto/sdk_ws" context "context" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -36,7 +37,7 @@ type BoradcastMessageReq struct { func (x *BoradcastMessageReq) Reset() { *x = BoradcastMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[0] + mi := &file_message_cms_message_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -49,7 +50,7 @@ func (x *BoradcastMessageReq) String() string { func (*BoradcastMessageReq) ProtoMessage() {} func (x *BoradcastMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[0] + mi := &file_message_cms_message_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -62,7 +63,7 @@ func (x *BoradcastMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use BoradcastMessageReq.ProtoReflect.Descriptor instead. func (*BoradcastMessageReq) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{0} + return file_message_cms_message_proto_rawDescGZIP(), []int{0} } func (x *BoradcastMessageReq) GetMessage() string { @@ -88,7 +89,7 @@ type BoradcastMessageResp struct { func (x *BoradcastMessageResp) Reset() { *x = BoradcastMessageResp{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[1] + mi := &file_message_cms_message_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -101,7 +102,7 @@ func (x *BoradcastMessageResp) String() string { func (*BoradcastMessageResp) ProtoMessage() {} func (x *BoradcastMessageResp) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[1] + mi := &file_message_cms_message_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -114,7 +115,7 @@ func (x *BoradcastMessageResp) ProtoReflect() protoreflect.Message { // Deprecated: Use BoradcastMessageResp.ProtoReflect.Descriptor instead. func (*BoradcastMessageResp) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{1} + return file_message_cms_message_proto_rawDescGZIP(), []int{1} } type MassSendMessageReq struct { @@ -130,7 +131,7 @@ type MassSendMessageReq struct { func (x *MassSendMessageReq) Reset() { *x = MassSendMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[2] + mi := &file_message_cms_message_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -143,7 +144,7 @@ func (x *MassSendMessageReq) String() string { func (*MassSendMessageReq) ProtoMessage() {} func (x *MassSendMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[2] + mi := &file_message_cms_message_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -156,7 +157,7 @@ func (x *MassSendMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use MassSendMessageReq.ProtoReflect.Descriptor instead. func (*MassSendMessageReq) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{2} + return file_message_cms_message_proto_rawDescGZIP(), []int{2} } func (x *MassSendMessageReq) GetMessage() string { @@ -189,7 +190,7 @@ type MassSendMessageResp struct { func (x *MassSendMessageResp) Reset() { *x = MassSendMessageResp{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[3] + mi := &file_message_cms_message_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -202,7 +203,7 @@ func (x *MassSendMessageResp) String() string { func (*MassSendMessageResp) ProtoMessage() {} func (x *MassSendMessageResp) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[3] + mi := &file_message_cms_message_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -215,7 +216,7 @@ func (x *MassSendMessageResp) ProtoReflect() protoreflect.Message { // Deprecated: Use MassSendMessageResp.ProtoReflect.Descriptor instead. func (*MassSendMessageResp) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{3} + return file_message_cms_message_proto_rawDescGZIP(), []int{3} } type GetChatLogsReq struct { @@ -223,18 +224,20 @@ type GetChatLogsReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Content string `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` - Date string `protobuf:"bytes,3,opt,name=Date,proto3" json:"Date,omitempty"` - SessionType int32 `protobuf:"varint,4,opt,name=SessionType,proto3" json:"SessionType,omitempty"` - ContentType int32 `protobuf:"varint,5,opt,name=ContentType,proto3" json:"ContentType,omitempty"` - OperationID string `protobuf:"bytes,6,opt,name=OperationID,proto3" json:"OperationID,omitempty"` + Content string `protobuf:"bytes,1,opt,name=Content,proto3" json:"Content,omitempty"` + UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` + GroupId string `protobuf:"bytes,3,opt,name=GroupId,proto3" json:"GroupId,omitempty"` + Date string `protobuf:"bytes,4,opt,name=Date,proto3" json:"Date,omitempty"` + SessionType int32 `protobuf:"varint,5,opt,name=SessionType,proto3" json:"SessionType,omitempty"` + ContentType int32 `protobuf:"varint,6,opt,name=ContentType,proto3" json:"ContentType,omitempty"` + Pagination *sdk_ws.RequestPagination `protobuf:"bytes,7,opt,name=Pagination,proto3" json:"Pagination,omitempty"` + OperationID string `protobuf:"bytes,8,opt,name=OperationID,proto3" json:"OperationID,omitempty"` } func (x *GetChatLogsReq) Reset() { *x = GetChatLogsReq{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[4] + mi := &file_message_cms_message_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -247,7 +250,7 @@ func (x *GetChatLogsReq) String() string { func (*GetChatLogsReq) ProtoMessage() {} func (x *GetChatLogsReq) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[4] + mi := &file_message_cms_message_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -260,7 +263,7 @@ func (x *GetChatLogsReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GetChatLogsReq.ProtoReflect.Descriptor instead. func (*GetChatLogsReq) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{4} + return file_message_cms_message_proto_rawDescGZIP(), []int{4} } func (x *GetChatLogsReq) GetContent() string { @@ -277,6 +280,13 @@ func (x *GetChatLogsReq) GetUserId() string { return "" } +func (x *GetChatLogsReq) GetGroupId() string { + if x != nil { + return x.GroupId + } + return "" +} + func (x *GetChatLogsReq) GetDate() string { if x != nil { return x.Date @@ -298,6 +308,13 @@ func (x *GetChatLogsReq) GetContentType() int32 { return 0 } +func (x *GetChatLogsReq) GetPagination() *sdk_ws.RequestPagination { + if x != nil { + return x.Pagination + } + return nil +} + func (x *GetChatLogsReq) GetOperationID() string { if x != nil { return x.OperationID @@ -305,24 +322,146 @@ func (x *GetChatLogsReq) GetOperationID() string { return "" } +type ChatLogs struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SessionType int32 `protobuf:"varint,1,opt,name=SessionType,proto3" json:"SessionType,omitempty"` + ContentType int32 `protobuf:"varint,2,opt,name=ContentType,proto3" json:"ContentType,omitempty"` + SenderNickName string `protobuf:"bytes,3,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"` + SenderId string `protobuf:"bytes,4,opt,name=SenderId,proto3" json:"SenderId,omitempty"` + ReciverNickName string `protobuf:"bytes,5,opt,name=ReciverNickName,proto3" json:"ReciverNickName,omitempty"` + ReciverId string `protobuf:"bytes,6,opt,name=ReciverId,proto3" json:"ReciverId,omitempty"` + SearchContent string `protobuf:"bytes,7,opt,name=SearchContent,proto3" json:"SearchContent,omitempty"` + WholeContent string `protobuf:"bytes,8,opt,name=WholeContent,proto3" json:"WholeContent,omitempty"` + GroupId string `protobuf:"bytes,9,opt,name=GroupId,proto3" json:"GroupId,omitempty"` + GroupName string `protobuf:"bytes,10,opt,name=GroupName,proto3" json:"GroupName,omitempty"` + Date string `protobuf:"bytes,11,opt,name=Date,proto3" json:"Date,omitempty"` +} + +func (x *ChatLogs) Reset() { + *x = ChatLogs{} + if protoimpl.UnsafeEnabled { + mi := &file_message_cms_message_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ChatLogs) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ChatLogs) ProtoMessage() {} + +func (x *ChatLogs) ProtoReflect() protoreflect.Message { + mi := &file_message_cms_message_proto_msgTypes[5] + 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 ChatLogs.ProtoReflect.Descriptor instead. +func (*ChatLogs) Descriptor() ([]byte, []int) { + return file_message_cms_message_proto_rawDescGZIP(), []int{5} +} + +func (x *ChatLogs) GetSessionType() int32 { + if x != nil { + return x.SessionType + } + return 0 +} + +func (x *ChatLogs) GetContentType() int32 { + if x != nil { + return x.ContentType + } + return 0 +} + +func (x *ChatLogs) GetSenderNickName() string { + if x != nil { + return x.SenderNickName + } + return "" +} + +func (x *ChatLogs) GetSenderId() string { + if x != nil { + return x.SenderId + } + return "" +} + +func (x *ChatLogs) GetReciverNickName() string { + if x != nil { + return x.ReciverNickName + } + return "" +} + +func (x *ChatLogs) GetReciverId() string { + if x != nil { + return x.ReciverId + } + return "" +} + +func (x *ChatLogs) GetSearchContent() string { + if x != nil { + return x.SearchContent + } + return "" +} + +func (x *ChatLogs) GetWholeContent() string { + if x != nil { + return x.WholeContent + } + return "" +} + +func (x *ChatLogs) GetGroupId() string { + if x != nil { + return x.GroupId + } + return "" +} + +func (x *ChatLogs) GetGroupName() string { + if x != nil { + return x.GroupName + } + return "" +} + +func (x *ChatLogs) GetDate() string { + if x != nil { + return x.Date + } + return "" +} + type GetChatLogsResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - SessionType int32 `protobuf:"varint,1,opt,name=SessionType,proto3" json:"SessionType,omitempty"` - ContentType int32 `protobuf:"varint,2,opt,name=ContentType,proto3" json:"ContentType,omitempty"` - SenderNickName string `protobuf:"bytes,3,opt,name=SenderNickName,proto3" json:"SenderNickName,omitempty"` - ReciverNickName string `protobuf:"bytes,4,opt,name=ReciverNickName,proto3" json:"ReciverNickName,omitempty"` - SearchContent string `protobuf:"bytes,5,opt,name=SearchContent,proto3" json:"SearchContent,omitempty"` - Content string `protobuf:"bytes,6,opt,name=Content,proto3" json:"Content,omitempty"` - Date string `protobuf:"bytes,7,opt,name=Date,proto3" json:"Date,omitempty"` + ChatLogs []*ChatLogs `protobuf:"bytes,1,rep,name=ChatLogs,proto3" json:"ChatLogs,omitempty"` + Pagination *sdk_ws.ResponsePagination `protobuf:"bytes,2,opt,name=Pagination,proto3" json:"Pagination,omitempty"` } func (x *GetChatLogsResp) Reset() { *x = GetChatLogsResp{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[5] + mi := &file_message_cms_message_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -335,7 +474,7 @@ func (x *GetChatLogsResp) String() string { func (*GetChatLogsResp) ProtoMessage() {} func (x *GetChatLogsResp) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[5] + mi := &file_message_cms_message_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -348,56 +487,21 @@ func (x *GetChatLogsResp) ProtoReflect() protoreflect.Message { // Deprecated: Use GetChatLogsResp.ProtoReflect.Descriptor instead. func (*GetChatLogsResp) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{5} + return file_message_cms_message_proto_rawDescGZIP(), []int{6} } -func (x *GetChatLogsResp) GetSessionType() int32 { +func (x *GetChatLogsResp) GetChatLogs() []*ChatLogs { if x != nil { - return x.SessionType + return x.ChatLogs } - return 0 + return nil } -func (x *GetChatLogsResp) GetContentType() int32 { +func (x *GetChatLogsResp) GetPagination() *sdk_ws.ResponsePagination { if x != nil { - return x.ContentType + return x.Pagination } - return 0 -} - -func (x *GetChatLogsResp) GetSenderNickName() string { - if x != nil { - return x.SenderNickName - } - return "" -} - -func (x *GetChatLogsResp) GetReciverNickName() string { - if x != nil { - return x.ReciverNickName - } - return "" -} - -func (x *GetChatLogsResp) GetSearchContent() string { - if x != nil { - return x.SearchContent - } - return "" -} - -func (x *GetChatLogsResp) GetContent() string { - if x != nil { - return x.Content - } - return "" -} - -func (x *GetChatLogsResp) GetDate() string { - if x != nil { - return x.Date - } - return "" + return nil } type WithdrawMessageReq struct { @@ -412,7 +516,7 @@ type WithdrawMessageReq struct { func (x *WithdrawMessageReq) Reset() { *x = WithdrawMessageReq{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[6] + mi := &file_message_cms_message_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -425,7 +529,7 @@ func (x *WithdrawMessageReq) String() string { func (*WithdrawMessageReq) ProtoMessage() {} func (x *WithdrawMessageReq) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[6] + mi := &file_message_cms_message_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -438,7 +542,7 @@ func (x *WithdrawMessageReq) ProtoReflect() protoreflect.Message { // Deprecated: Use WithdrawMessageReq.ProtoReflect.Descriptor instead. func (*WithdrawMessageReq) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{6} + return file_message_cms_message_proto_rawDescGZIP(), []int{7} } func (x *WithdrawMessageReq) GetServerMsgId() string { @@ -464,7 +568,7 @@ type WithdrawMessageResp struct { func (x *WithdrawMessageResp) Reset() { *x = WithdrawMessageResp{} if protoimpl.UnsafeEnabled { - mi := &file_message_message_proto_msgTypes[7] + mi := &file_message_cms_message_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -477,7 +581,7 @@ func (x *WithdrawMessageResp) String() string { func (*WithdrawMessageResp) ProtoMessage() {} func (x *WithdrawMessageResp) ProtoReflect() protoreflect.Message { - mi := &file_message_message_proto_msgTypes[7] + mi := &file_message_cms_message_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -490,134 +594,165 @@ func (x *WithdrawMessageResp) ProtoReflect() protoreflect.Message { // Deprecated: Use WithdrawMessageResp.ProtoReflect.Descriptor instead. func (*WithdrawMessageResp) Descriptor() ([]byte, []int) { - return file_message_message_proto_rawDescGZIP(), []int{7} + return file_message_cms_message_proto_rawDescGZIP(), []int{8} } -var File_message_message_proto protoreflect.FileDescriptor +var File_message_cms_message_proto protoreflect.FileDescriptor -var file_message_message_proto_rawDesc = []byte{ - 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x22, 0x51, 0x0a, 0x13, 0x42, 0x6f, 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x49, 0x44, 0x22, 0x16, 0x0a, 0x14, 0x42, 0x6f, 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x6a, 0x0a, 0x12, 0x4d, - 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, - 0x71, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x15, 0x0a, 0x13, 0x4d, 0x61, 0x73, 0x73, 0x53, - 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0xbc, - 0x01, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, - 0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x53, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, - 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x4f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0xfb, 0x01, - 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, +var file_message_cms_message_proto_rawDesc = []byte{ + 0x0a, 0x19, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6d, 0x73, 0x2f, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x1a, 0x21, 0x4f, 0x70, 0x65, 0x6e, 0x5f, 0x49, 0x4d, 0x2f, 0x70, 0x6b, + 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x64, 0x6b, 0x5f, 0x77, 0x73, 0x2f, 0x77, + 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x51, 0x0a, 0x13, 0x42, 0x6f, 0x72, 0x61, 0x64, + 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, + 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x16, 0x0a, 0x14, 0x42, 0x6f, + 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x22, 0x6a, 0x0a, 0x12, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x07, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b, + 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x15, + 0x0a, 0x13, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x9c, 0x02, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, + 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x44, 0x0a, 0x0a, + 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x24, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, + 0x44, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x49, 0x44, 0x22, 0xf0, 0x02, 0x0a, 0x08, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, + 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x53, - 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, - 0x0f, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x72, 0x4e, - 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x61, 0x72, 0x63, - 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, - 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x12, 0x57, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x53, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x52, 0x65, 0x63, + 0x69, 0x76, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0f, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x72, 0x49, + 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x57, 0x68, 0x6f, 0x6c, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x57, + 0x68, 0x6f, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, + 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x22, 0x87, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x43, + 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x08, 0x43, + 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, + 0x52, 0x08, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x45, 0x0a, 0x0a, 0x50, 0x61, + 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x61, 0x67, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x58, 0x0a, 0x12, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, + 0x72, 0x76, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, + 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x15, 0x0a, 0x13, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, - 0x71, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4d, 0x73, - 0x67, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x15, 0x0a, 0x13, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, - 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x32, 0xb8, 0x02, 0x0a, - 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x4f, 0x0a, 0x10, 0x42, 0x6f, 0x72, 0x61, - 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x2e, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4c, 0x0a, 0x0f, 0x4d, 0x61, 0x73, - 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x40, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x68, - 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x2e, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x71, 0x1a, - 0x18, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, - 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4c, 0x0a, 0x0f, 0x57, 0x69, 0x74, - 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1c, 0x2e, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x13, 0x5a, 0x11, 0x2e, 0x2f, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x3b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x70, 0x32, 0xb8, 0x02, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x4f, + 0x0a, 0x10, 0x42, 0x6f, 0x72, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x1c, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x6f, 0x72, + 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, + 0x1a, 0x1d, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x61, 0x64, + 0x63, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x4c, 0x0a, 0x0f, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x61, 0x73, + 0x73, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, + 0x1c, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x61, 0x73, 0x73, 0x53, 0x65, + 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x40, 0x0a, + 0x0b, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x17, 0x2e, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, + 0x67, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, + 0x47, 0x65, 0x74, 0x43, 0x68, 0x61, 0x74, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x4c, 0x0a, 0x0f, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x57, 0x69, 0x74, + 0x68, 0x64, 0x72, 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, + 0x1c, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x57, 0x69, 0x74, 0x68, 0x64, 0x72, + 0x61, 0x77, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x1a, 0x5a, + 0x18, 0x2e, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x63, 0x6d, 0x73, 0x3b, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x4d, 0x53, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( - file_message_message_proto_rawDescOnce sync.Once - file_message_message_proto_rawDescData = file_message_message_proto_rawDesc + file_message_cms_message_proto_rawDescOnce sync.Once + file_message_cms_message_proto_rawDescData = file_message_cms_message_proto_rawDesc ) -func file_message_message_proto_rawDescGZIP() []byte { - file_message_message_proto_rawDescOnce.Do(func() { - file_message_message_proto_rawDescData = protoimpl.X.CompressGZIP(file_message_message_proto_rawDescData) +func file_message_cms_message_proto_rawDescGZIP() []byte { + file_message_cms_message_proto_rawDescOnce.Do(func() { + file_message_cms_message_proto_rawDescData = protoimpl.X.CompressGZIP(file_message_cms_message_proto_rawDescData) }) - return file_message_message_proto_rawDescData + return file_message_cms_message_proto_rawDescData } -var file_message_message_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_message_message_proto_goTypes = []interface{}{ - (*BoradcastMessageReq)(nil), // 0: message.BoradcastMessageReq - (*BoradcastMessageResp)(nil), // 1: message.BoradcastMessageResp - (*MassSendMessageReq)(nil), // 2: message.MassSendMessageReq - (*MassSendMessageResp)(nil), // 3: message.MassSendMessageResp - (*GetChatLogsReq)(nil), // 4: message.GetChatLogsReq - (*GetChatLogsResp)(nil), // 5: message.GetChatLogsResp - (*WithdrawMessageReq)(nil), // 6: message.WithdrawMessageReq - (*WithdrawMessageResp)(nil), // 7: message.WithdrawMessageResp +var file_message_cms_message_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_message_cms_message_proto_goTypes = []interface{}{ + (*BoradcastMessageReq)(nil), // 0: message.BoradcastMessageReq + (*BoradcastMessageResp)(nil), // 1: message.BoradcastMessageResp + (*MassSendMessageReq)(nil), // 2: message.MassSendMessageReq + (*MassSendMessageResp)(nil), // 3: message.MassSendMessageResp + (*GetChatLogsReq)(nil), // 4: message.GetChatLogsReq + (*ChatLogs)(nil), // 5: message.ChatLogs + (*GetChatLogsResp)(nil), // 6: message.GetChatLogsResp + (*WithdrawMessageReq)(nil), // 7: message.WithdrawMessageReq + (*WithdrawMessageResp)(nil), // 8: message.WithdrawMessageResp + (*sdk_ws.RequestPagination)(nil), // 9: server_api_params.RequestPagination + (*sdk_ws.ResponsePagination)(nil), // 10: server_api_params.ResponsePagination } -var file_message_message_proto_depIdxs = []int32{ - 0, // 0: message.message.BoradcastMessage:input_type -> message.BoradcastMessageReq - 2, // 1: message.message.MassSendMessage:input_type -> message.MassSendMessageReq - 4, // 2: message.message.GetChatLogs:input_type -> message.GetChatLogsReq - 6, // 3: message.message.WithdrawMessage:input_type -> message.WithdrawMessageReq - 1, // 4: message.message.BoradcastMessage:output_type -> message.BoradcastMessageResp - 3, // 5: message.message.MassSendMessage:output_type -> message.MassSendMessageResp - 5, // 6: message.message.GetChatLogs:output_type -> message.GetChatLogsResp - 7, // 7: message.message.WithdrawMessage:output_type -> message.WithdrawMessageResp - 4, // [4:8] is the sub-list for method output_type - 0, // [0:4] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name +var file_message_cms_message_proto_depIdxs = []int32{ + 9, // 0: message.GetChatLogsReq.Pagination:type_name -> server_api_params.RequestPagination + 5, // 1: message.GetChatLogsResp.ChatLogs:type_name -> message.ChatLogs + 10, // 2: message.GetChatLogsResp.Pagination:type_name -> server_api_params.ResponsePagination + 0, // 3: message.message.BoradcastMessage:input_type -> message.BoradcastMessageReq + 2, // 4: message.message.MassSendMessage:input_type -> message.MassSendMessageReq + 4, // 5: message.message.GetChatLogs:input_type -> message.GetChatLogsReq + 7, // 6: message.message.WithdrawMessage:input_type -> message.WithdrawMessageReq + 1, // 7: message.message.BoradcastMessage:output_type -> message.BoradcastMessageResp + 3, // 8: message.message.MassSendMessage:output_type -> message.MassSendMessageResp + 6, // 9: message.message.GetChatLogs:output_type -> message.GetChatLogsResp + 8, // 10: message.message.WithdrawMessage:output_type -> message.WithdrawMessageResp + 7, // [7:11] is the sub-list for method output_type + 3, // [3:7] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } -func init() { file_message_message_proto_init() } -func file_message_message_proto_init() { - if File_message_message_proto != nil { +func init() { file_message_cms_message_proto_init() } +func file_message_cms_message_proto_init() { + if File_message_cms_message_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_message_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BoradcastMessageReq); i { case 0: return &v.state @@ -629,7 +764,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BoradcastMessageResp); i { case 0: return &v.state @@ -641,7 +776,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MassSendMessageReq); i { case 0: return &v.state @@ -653,7 +788,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MassSendMessageResp); i { case 0: return &v.state @@ -665,7 +800,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetChatLogsReq); i { case 0: return &v.state @@ -677,7 +812,19 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ChatLogs); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_message_cms_message_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetChatLogsResp); i { case 0: return &v.state @@ -689,7 +836,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WithdrawMessageReq); i { case 0: return &v.state @@ -701,7 +848,7 @@ func file_message_message_proto_init() { return nil } } - file_message_message_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_message_cms_message_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WithdrawMessageResp); i { case 0: return &v.state @@ -718,20 +865,20 @@ func file_message_message_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_message_message_proto_rawDesc, + RawDescriptor: file_message_cms_message_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 9, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_message_message_proto_goTypes, - DependencyIndexes: file_message_message_proto_depIdxs, - MessageInfos: file_message_message_proto_msgTypes, + GoTypes: file_message_cms_message_proto_goTypes, + DependencyIndexes: file_message_cms_message_proto_depIdxs, + MessageInfos: file_message_cms_message_proto_msgTypes, }.Build() - File_message_message_proto = out.File - file_message_message_proto_rawDesc = nil - file_message_message_proto_goTypes = nil - file_message_message_proto_depIdxs = nil + File_message_cms_message_proto = out.File + file_message_cms_message_proto_rawDesc = nil + file_message_cms_message_proto_goTypes = nil + file_message_cms_message_proto_depIdxs = nil } // Reference imports to suppress errors if they are not otherwise used. @@ -919,5 +1066,5 @@ var _Message_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "message/message.proto", + Metadata: "message_cms/message.proto", } diff --git a/pkg/proto/message/message.proto b/pkg/proto/message_cms/message.proto similarity index 59% rename from pkg/proto/message/message.proto rename to pkg/proto/message_cms/message.proto index 7b557dfbd..d8eb8a120 100644 --- a/pkg/proto/message/message.proto +++ b/pkg/proto/message_cms/message.proto @@ -1,5 +1,6 @@ syntax = "proto3"; -option go_package = "./message;message"; +import "Open_IM/pkg/proto/sdk_ws/ws.proto"; +option go_package = "./message_cms;messageCMS"; package message; message BoradcastMessageReq { @@ -22,22 +23,34 @@ message MassSendMessageResp { } message GetChatLogsReq { - string content = 1; + string Content = 1; string UserId = 2; - string Date = 3; - int32 SessionType = 4; - int32 ContentType = 5; - string OperationID = 6; + string GroupId = 3; + string Date = 4; + int32 SessionType = 5; + int32 ContentType = 6; + server_api_params.RequestPagination Pagination = 7; + string OperationID = 8; + } -message GetChatLogsResp { +message ChatLogs { int32 SessionType = 1; int32 ContentType = 2; string SenderNickName = 3; - string ReciverNickName = 4; - string SearchContent = 5; - string Content = 6; - string Date = 7; + string SenderId = 4; + string ReciverNickName = 5; + string ReciverId = 6; + string SearchContent = 7; + string WholeContent = 8; + string GroupId = 9; + string GroupName = 10; + string Date = 11; +} + +message GetChatLogsResp { + repeated ChatLogs ChatLogs = 1; + server_api_params.ResponsePagination Pagination = 2; } message WithdrawMessageReq { diff --git a/pkg/proto/proto_dir.cfg b/pkg/proto/proto_dir.cfg index 9f22fa533..0d67a8dfe 100644 --- a/pkg/proto/proto_dir.cfg +++ b/pkg/proto/proto_dir.cfg @@ -1,10 +1,10 @@ all_proto=( - # message/message.proto - # statistics/statistics.proto + message_cms/message.proto + #statistics/statistics.proto # auth/auth.proto # friend/friend.proto - group/group.proto + # group/group.proto # user/user.proto # chat/chat.proto # push/push.proto