Browse Source

聊天记录以及房间信息

wfz 3 years ago
parent
commit
4767996ef3

+ 168 - 77
api/chat/chat.pb.go

@@ -809,6 +809,69 @@ func (x *RoomReply) GetRoomId() int64 {
 	return 0
 }
 
+type FindChatRoomMsgRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RoomId     int64  `protobuf:"varint,1,opt,name=roomId,proto3" json:"roomId"`
+	PersonType string `protobuf:"bytes,2,opt,name=personType,proto3" json:"personType"` // 类型
+	PersonID   string `protobuf:"bytes,3,opt,name=personID,proto3" json:"personID"`     // 查询目标的ID
+}
+
+func (x *FindChatRoomMsgRequest) Reset() {
+	*x = FindChatRoomMsgRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_chat_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindChatRoomMsgRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindChatRoomMsgRequest) ProtoMessage() {}
+
+func (x *FindChatRoomMsgRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_chat_proto_msgTypes[11]
+	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 FindChatRoomMsgRequest.ProtoReflect.Descriptor instead.
+func (*FindChatRoomMsgRequest) Descriptor() ([]byte, []int) {
+	return file_chat_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *FindChatRoomMsgRequest) GetRoomId() int64 {
+	if x != nil {
+		return x.RoomId
+	}
+	return 0
+}
+
+func (x *FindChatRoomMsgRequest) GetPersonType() string {
+	if x != nil {
+		return x.PersonType
+	}
+	return ""
+}
+
+func (x *FindChatRoomMsgRequest) GetPersonID() string {
+	if x != nil {
+		return x.PersonID
+	}
+	return ""
+}
+
 type FindChatRecordListRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -824,7 +887,7 @@ type FindChatRecordListRequest struct {
 func (x *FindChatRecordListRequest) Reset() {
 	*x = FindChatRecordListRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_chat_proto_msgTypes[11]
+		mi := &file_chat_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -837,7 +900,7 @@ func (x *FindChatRecordListRequest) String() string {
 func (*FindChatRecordListRequest) ProtoMessage() {}
 
 func (x *FindChatRecordListRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_chat_proto_msgTypes[11]
+	mi := &file_chat_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -850,7 +913,7 @@ func (x *FindChatRecordListRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindChatRecordListRequest.ProtoReflect.Descriptor instead.
 func (*FindChatRecordListRequest) Descriptor() ([]byte, []int) {
-	return file_chat_proto_rawDescGZIP(), []int{11}
+	return file_chat_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *FindChatRecordListRequest) GetNextId() int64 {
@@ -996,62 +1059,74 @@ var file_chat_proto_rawDesc = []byte{
 	0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x09, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
 	0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x9f, 0x01, 0x0a,
-	0x19, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c,
-	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65,
-	0x78, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
-	0x6f, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x32, 0xfb,
-	0x04, 0x0a, 0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x72, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b,
-	0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61,
-	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65,
-	0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x44, 0x0a, 0x0e, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x1d, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43,
-	0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x13, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x12, 0x5f, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50,
-	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x41,
-	0x6e, 0x64, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f, 0x6e, 0x6c,
-	0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x12, 0x61, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e,
-	0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x68, 0x61, 0x74, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64,
-	0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e,
-	0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e,
-	0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x68, 0x61, 0x74, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f, 0x6f,
-	0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64,
-	0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12,
-	0x3d, 0x0a, 0x07, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x12, 0x18, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e,
-	0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5c,
-	0x0a, 0x12, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x4c, 0x69, 0x73, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x6c, 0x0a, 0x16,
+	0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x1e,
+	0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a,
+	0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x22, 0x9f, 0x01, 0x0a, 0x19, 0x46,
+	0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
+	0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x32, 0xcb, 0x05, 0x0a,
+	0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x72, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73,
+	0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50,
+	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x44, 0x0a, 0x0e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x1d, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61,
+	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x13, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+	0x5f, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x41, 0x6e, 0x64,
+	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
+	0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x12, 0x61, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52,
+	0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68,
+	0x61, 0x74, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f,
+	0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52,
+	0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68,
+	0x61, 0x74, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f,
+	0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3d, 0x0a,
+	0x07, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x12, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x68, 0x61, 0x74, 0x2e, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x52, 0x65,
+	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5c, 0x0a, 0x12,
 	0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x3d, 0x0a, 0x08,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e,
-	0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x73, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x46, 0x69,
+	0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0f, 0x46, 0x69,
+	0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x12, 0x20, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61,
+	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61,
+	0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x22, 0x00, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b,
+	0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
+	0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -1066,7 +1141,7 @@ func file_chat_proto_rawDescGZIP() []byte {
 	return file_chat_proto_rawDescData
 }
 
-var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_chat_proto_goTypes = []interface{}{
 	(*PartnerFindRoomListRequest)(nil),          // 0: api.chat.PartnerFindRoomListRequest
 	(*UserFindRoomListRequest)(nil),             // 1: api.chat.UserFindRoomListRequest
@@ -1079,31 +1154,35 @@ var file_chat_proto_goTypes = []interface{}{
 	(*ReceiveReply)(nil),                        // 8: api.chat.ReceiveReply
 	(*CheckUserPartnerIsRelationshipReply)(nil), // 9: api.chat.CheckUserPartnerIsRelationshipReply
 	(*RoomReply)(nil),                           // 10: api.chat.RoomReply
-	(*FindChatRecordListRequest)(nil),           // 11: api.chat.FindChatRecordListRequest
-	(*common.UserAndPartnerIdParam)(nil),        // 12: api.common.UserAndPartnerIdParam
-	(*common.ListPageAndPersonRequest)(nil),     // 13: api.common.ListPageAndPersonRequest
-	(*common.OnlinePersonListReply)(nil),        // 14: api.common.OnlinePersonListReply
-	(*common.ChatRecordListReply)(nil),          // 15: api.common.ChatRecordListReply
+	(*FindChatRoomMsgRequest)(nil),              // 11: api.chat.FindChatRoomMsgRequest
+	(*FindChatRecordListRequest)(nil),           // 12: api.chat.FindChatRecordListRequest
+	(*common.UserAndPartnerIdParam)(nil),        // 13: api.common.UserAndPartnerIdParam
+	(*common.ListPageAndPersonRequest)(nil),     // 14: api.common.ListPageAndPersonRequest
+	(*common.OnlinePersonListReply)(nil),        // 15: api.common.OnlinePersonListReply
+	(*common.ChatRecordListReply)(nil),          // 16: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                  // 17: api.common.ChatRoomMsg
 }
 var file_chat_proto_depIdxs = []int32{
 	3,  // 0: api.chat.UserFindRoomListReply.list:type_name -> api.chat.UserRoomInfo
 	5,  // 1: api.chat.PartnerFindRoomListReply.list:type_name -> api.chat.PartnerRoomInfo
-	12, // 2: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
+	13, // 2: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
 	6,  // 3: api.chat.Chat.CreateChatRoom:input_type -> api.chat.CreateChatRoomParam
-	13, // 4: api.chat.Chat.FindOnlinePersonList:input_type -> api.common.ListPageAndPersonRequest
+	14, // 4: api.chat.Chat.FindOnlinePersonList:input_type -> api.common.ListPageAndPersonRequest
 	0,  // 5: api.chat.Chat.PartnerFindRoomList:input_type -> api.chat.PartnerFindRoomListRequest
 	1,  // 6: api.chat.Chat.UserFindRoomList:input_type -> api.chat.UserFindRoomListRequest
 	7,  // 7: api.chat.Chat.Receive:input_type -> api.chat.ReceiveRequest
-	11, // 8: api.chat.Chat.FindChatRecordList:input_type -> api.chat.FindChatRecordListRequest
-	9,  // 9: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	10, // 10: api.chat.Chat.CreateChatRoom:output_type -> api.chat.RoomReply
-	14, // 11: api.chat.Chat.FindOnlinePersonList:output_type -> api.common.OnlinePersonListReply
-	4,  // 12: api.chat.Chat.PartnerFindRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	2,  // 13: api.chat.Chat.UserFindRoomList:output_type -> api.chat.UserFindRoomListReply
-	8,  // 14: api.chat.Chat.Receive:output_type -> api.chat.ReceiveReply
-	15, // 15: api.chat.Chat.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	9,  // [9:16] is the sub-list for method output_type
-	2,  // [2:9] is the sub-list for method input_type
+	12, // 8: api.chat.Chat.FindChatRecordList:input_type -> api.chat.FindChatRecordListRequest
+	11, // 9: api.chat.Chat.FindChatRoomMsg:input_type -> api.chat.FindChatRoomMsgRequest
+	9,  // 10: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	10, // 11: api.chat.Chat.CreateChatRoom:output_type -> api.chat.RoomReply
+	15, // 12: api.chat.Chat.FindOnlinePersonList:output_type -> api.common.OnlinePersonListReply
+	4,  // 13: api.chat.Chat.PartnerFindRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	2,  // 14: api.chat.Chat.UserFindRoomList:output_type -> api.chat.UserFindRoomListReply
+	8,  // 15: api.chat.Chat.Receive:output_type -> api.chat.ReceiveReply
+	16, // 16: api.chat.Chat.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	17, // 17: api.chat.Chat.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	10, // [10:18] is the sub-list for method output_type
+	2,  // [2:10] is the sub-list for method input_type
 	2,  // [2:2] is the sub-list for extension type_name
 	2,  // [2:2] is the sub-list for extension extendee
 	0,  // [0:2] is the sub-list for field type_name
@@ -1248,6 +1327,18 @@ func file_chat_proto_init() {
 			}
 		}
 		file_chat_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindChatRoomMsgRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_chat_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FindChatRecordListRequest); i {
 			case 0:
 				return &v.state
@@ -1266,7 +1357,7 @@ func file_chat_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_chat_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 10 - 1
api/chat/chat.proto

@@ -23,8 +23,10 @@ service Chat {
   // 用户查询房间列表
   rpc UserFindRoomList (UserFindRoomListRequest) returns (UserFindRoomListReply){};
   rpc Receive (ReceiveRequest) returns (ReceiveReply){};
-  // 用户查询聊天记录
+  // 查询聊天记录
   rpc FindChatRecordList (FindChatRecordListRequest) returns (common.ChatRecordListReply){};
+  // 房间信息
+  rpc FindChatRoomMsg (FindChatRoomMsgRequest) returns (common.ChatRoomMsg){};
 }
 
 message PartnerFindRoomListRequest {
@@ -107,6 +109,13 @@ message RoomReply{
   int64 roomId = 1;
 }
 
+message FindChatRoomMsgRequest{
+  int64 roomId = 1;
+  string personType = 2; // 类型
+  string personID = 3; // 查询目标的ID
+}
+
+
 message FindChatRecordListRequest{
   int64 nextId = 1;
   int64 offset = 2;

+ 40 - 2
api/chat/chat_grpc.pb.go

@@ -30,8 +30,10 @@ type ChatClient interface {
 	// 用户查询房间列表
 	UserFindRoomList(ctx context.Context, in *UserFindRoomListRequest, opts ...grpc.CallOption) (*UserFindRoomListReply, error)
 	Receive(ctx context.Context, in *ReceiveRequest, opts ...grpc.CallOption) (*ReceiveReply, error)
-	// 用户查询聊天记录
+	// 查询聊天记录
 	FindChatRecordList(ctx context.Context, in *FindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error)
+	// 房间信息
+	FindChatRoomMsg(ctx context.Context, in *FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error)
 }
 
 type chatClient struct {
@@ -105,6 +107,15 @@ func (c *chatClient) FindChatRecordList(ctx context.Context, in *FindChatRecordL
 	return out, nil
 }
 
+func (c *chatClient) FindChatRoomMsg(ctx context.Context, in *FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error) {
+	out := new(common.ChatRoomMsg)
+	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindChatRoomMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ChatServer is the server API for Chat service.
 // All implementations must embed UnimplementedChatServer
 // for forward compatibility
@@ -120,8 +131,10 @@ type ChatServer interface {
 	// 用户查询房间列表
 	UserFindRoomList(context.Context, *UserFindRoomListRequest) (*UserFindRoomListReply, error)
 	Receive(context.Context, *ReceiveRequest) (*ReceiveReply, error)
-	// 用户查询聊天记录
+	// 查询聊天记录
 	FindChatRecordList(context.Context, *FindChatRecordListRequest) (*common.ChatRecordListReply, error)
+	// 房间信息
+	FindChatRoomMsg(context.Context, *FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -150,6 +163,9 @@ func (UnimplementedChatServer) Receive(context.Context, *ReceiveRequest) (*Recei
 func (UnimplementedChatServer) FindChatRecordList(context.Context, *FindChatRecordListRequest) (*common.ChatRecordListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindChatRecordList not implemented")
 }
+func (UnimplementedChatServer) FindChatRoomMsg(context.Context, *FindChatRoomMsgRequest) (*common.ChatRoomMsg, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatRoomMsg not implemented")
+}
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
 
 // UnsafeChatServer may be embedded to opt out of forward compatibility for this service.
@@ -289,6 +305,24 @@ func _Chat_FindChatRecordList_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Chat_FindChatRoomMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FindChatRoomMsgRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChatServer).FindChatRoomMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.chat.Chat/FindChatRoomMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChatServer).FindChatRoomMsg(ctx, req.(*FindChatRoomMsgRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Chat_ServiceDesc is the grpc.ServiceDesc for Chat service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -324,6 +358,10 @@ var Chat_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindChatRecordList",
 			Handler:    _Chat_FindChatRecordList_Handler,
 		},
+		{
+			MethodName: "FindChatRoomMsg",
+			Handler:    _Chat_FindChatRoomMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "chat.proto",

+ 337 - 50
api/common/common.pb.go

@@ -2207,6 +2207,117 @@ func (x *ChatRecordListReply) GetNextId() int64 {
 	return 0
 }
 
+type ChatRoomMsg struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RoomId      int64  `protobuf:"varint,1,opt,name=roomId,proto3" json:"roomId"`          // 房间ID
+	SelfID      string `protobuf:"bytes,2,opt,name=selfID,proto3" json:"selfID"`           // 自己的ID
+	SelfType    string `protobuf:"bytes,3,opt,name=selfType,proto3" json:"selfType"`       // 自己的type
+	OtherID     string `protobuf:"bytes,4,opt,name=otherID,proto3" json:"otherID"`         // 对方的ID
+	OtherType   string `protobuf:"bytes,5,opt,name=otherType,proto3" json:"otherType"`     // 对方的type
+	SelfName    string `protobuf:"bytes,6,opt,name=selfName,proto3" json:"selfName"`       // 自己的名称
+	OtherName   string `protobuf:"bytes,7,opt,name=otherName,proto3" json:"otherName"`     // 他人的名称
+	SelfAvatar  string `protobuf:"bytes,8,opt,name=selfAvatar,proto3" json:"selfAvatar"`   // 自己的头像
+	OtherAvatar string `protobuf:"bytes,9,opt,name=otherAvatar,proto3" json:"otherAvatar"` // 他人的头像
+}
+
+func (x *ChatRoomMsg) Reset() {
+	*x = ChatRoomMsg{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[31]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ChatRoomMsg) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ChatRoomMsg) ProtoMessage() {}
+
+func (x *ChatRoomMsg) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[31]
+	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 ChatRoomMsg.ProtoReflect.Descriptor instead.
+func (*ChatRoomMsg) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{31}
+}
+
+func (x *ChatRoomMsg) GetRoomId() int64 {
+	if x != nil {
+		return x.RoomId
+	}
+	return 0
+}
+
+func (x *ChatRoomMsg) GetSelfID() string {
+	if x != nil {
+		return x.SelfID
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetSelfType() string {
+	if x != nil {
+		return x.SelfType
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetOtherID() string {
+	if x != nil {
+		return x.OtherID
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetOtherType() string {
+	if x != nil {
+		return x.OtherType
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetSelfName() string {
+	if x != nil {
+		return x.SelfName
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetOtherName() string {
+	if x != nil {
+		return x.OtherName
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetSelfAvatar() string {
+	if x != nil {
+		return x.SelfAvatar
+	}
+	return ""
+}
+
+func (x *ChatRoomMsg) GetOtherAvatar() string {
+	if x != nil {
+		return x.OtherAvatar
+	}
+	return ""
+}
+
 type ChatRecordInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2224,7 +2335,7 @@ type ChatRecordInfo struct {
 func (x *ChatRecordInfo) Reset() {
 	*x = ChatRecordInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[31]
+		mi := &file_common_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2237,7 +2348,7 @@ func (x *ChatRecordInfo) String() string {
 func (*ChatRecordInfo) ProtoMessage() {}
 
 func (x *ChatRecordInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[31]
+	mi := &file_common_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2250,7 +2361,7 @@ func (x *ChatRecordInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChatRecordInfo.ProtoReflect.Descriptor instead.
 func (*ChatRecordInfo) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{31}
+	return file_common_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *ChatRecordInfo) GetMessageId() int64 {
@@ -2315,7 +2426,7 @@ type Message struct {
 func (x *Message) Reset() {
 	*x = Message{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[32]
+		mi := &file_common_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2328,7 +2439,7 @@ func (x *Message) String() string {
 func (*Message) ProtoMessage() {}
 
 func (x *Message) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[32]
+	mi := &file_common_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2341,7 +2452,7 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Message.ProtoReflect.Descriptor instead.
 func (*Message) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{32}
+	return file_common_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *Message) GetContent() string {
@@ -2365,6 +2476,116 @@ func (x *Message) GetSecond() int64 {
 	return 0
 }
 
+type FindChatRoomMsgRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RoomId int64 `protobuf:"varint,1,opt,name=roomId,proto3" json:"roomId"`
+}
+
+func (x *FindChatRoomMsgRequest) Reset() {
+	*x = FindChatRoomMsgRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindChatRoomMsgRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindChatRoomMsgRequest) ProtoMessage() {}
+
+func (x *FindChatRoomMsgRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[34]
+	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 FindChatRoomMsgRequest.ProtoReflect.Descriptor instead.
+func (*FindChatRoomMsgRequest) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{34}
+}
+
+func (x *FindChatRoomMsgRequest) GetRoomId() int64 {
+	if x != nil {
+		return x.RoomId
+	}
+	return 0
+}
+
+type FindChatRecordListRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NextId int64 `protobuf:"varint,1,opt,name=nextId,proto3" json:"nextId"`
+	Offset int64 `protobuf:"varint,2,opt,name=offset,proto3" json:"offset"`
+	RoomId int64 `protobuf:"varint,3,opt,name=roomId,proto3" json:"roomId"`
+}
+
+func (x *FindChatRecordListRequest) Reset() {
+	*x = FindChatRecordListRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[35]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindChatRecordListRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindChatRecordListRequest) ProtoMessage() {}
+
+func (x *FindChatRecordListRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[35]
+	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 FindChatRecordListRequest.ProtoReflect.Descriptor instead.
+func (*FindChatRecordListRequest) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{35}
+}
+
+func (x *FindChatRecordListRequest) GetNextId() int64 {
+	if x != nil {
+		return x.NextId
+	}
+	return 0
+}
+
+func (x *FindChatRecordListRequest) GetOffset() int64 {
+	if x != nil {
+		return x.Offset
+	}
+	return 0
+}
+
+func (x *FindChatRecordListRequest) GetRoomId() int64 {
+	if x != nil {
+		return x.RoomId
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -2612,6 +2833,23 @@ var file_common_proto_rawDesc = []byte{
 	0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x6e,
 	0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74,
 	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
+	0x22, 0x8d, 0x02, 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67,
+	0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x66,
+	0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x66, 0x49, 0x44,
+	0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x6f, 0x74, 0x68, 0x65, 0x72, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f,
+	0x74, 0x68, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6c, 0x66, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x66, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e,
+	0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x66, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x66, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x20,
+	0x0a, 0x0b, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72,
 	0x22, 0xdb, 0x01, 0x0a, 0x0e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49,
 	0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49,
@@ -2631,12 +2869,22 @@ var file_common_proto_rawDesc = []byte{
 	0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x55,
 	0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69,
 	0x61, 0x6c, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x42, 0x43, 0x0a,
-	0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67,
-	0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, 0x30, 0x0a,
+	0x16, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22,
+	0x63, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06,
+	0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65,
+	0x78, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06,
+	0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f,
+	0x6f, 0x6d, 0x49, 0x64, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -2651,49 +2899,52 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
 var file_common_proto_goTypes = []interface{}{
-	(*UserAndPartnerIdParam)(nil),    // 0: api.common.UserAndPartnerIdParam
-	(*UserAndPartnerParam)(nil),      // 1: api.common.UserAndPartnerParam
-	(*User1AndUser2IdParam)(nil),     // 2: api.common.User1AndUser2IdParam
-	(*PartnerIDParam)(nil),           // 3: api.common.PartnerIDParam
-	(*PersonIDParam)(nil),            // 4: api.common.PersonIDParam
-	(*PersonParam)(nil),              // 5: api.common.PersonParam
-	(*UserIDParam)(nil),              // 6: api.common.UserIDParam
-	(*WxConfReq)(nil),                // 7: api.common.WxConfReq
-	(*WxConfResponse)(nil),           // 8: api.common.WxConfResponse
-	(*HomeInfo)(nil),                 // 9: api.common.HomeInfo
-	(*PersonMsg)(nil),                // 10: api.common.PersonMsg
-	(*LookedAndLikedNum)(nil),        // 11: api.common.LookedAndLikedNum
-	(*AddFriendMessageInfo)(nil),     // 12: api.common.AddFriendMessageInfo
-	(*PersonIDList)(nil),             // 13: api.common.PersonIDList
-	(*PersonDBReply)(nil),            // 14: api.common.PersonDBReply
-	(*PersonDB)(nil),                 // 15: api.common.PersonDB
-	(*ListPageRequest)(nil),          // 16: api.common.ListPageRequest
-	(*ListPage2Request)(nil),         // 17: api.common.ListPage2Request
-	(*ListPageAndPersonRequest)(nil), // 18: api.common.ListPageAndPersonRequest
-	(*SendPhoneCodeRequest)(nil),     // 19: api.common.SendPhoneCodeRequest
-	(*CheckPhoneCodeRequest)(nil),    // 20: api.common.CheckPhoneCodeRequest
-	(*UploadMaterialResponse)(nil),   // 21: api.common.UploadMaterialResponse
-	(*Ids)(nil),                      // 22: api.common.Ids
-	(*TagListReply)(nil),             // 23: api.common.TagListReply
-	(*TagList)(nil),                  // 24: api.common.TagList
-	(*SexReq)(nil),                   // 25: api.common.SexReq
-	(*RandomIntroduceReply)(nil),     // 26: api.common.RandomIntroduceReply
-	(*UpdateInformationRequest)(nil), // 27: api.common.UpdateInformationRequest
-	(*OnlinePersonListReply)(nil),    // 28: api.common.OnlinePersonListReply
-	(*OnlinePersonInfo)(nil),         // 29: api.common.OnlinePersonInfo
-	(*ChatRecordListReply)(nil),      // 30: api.common.ChatRecordListReply
-	(*ChatRecordInfo)(nil),           // 31: api.common.ChatRecordInfo
-	(*Message)(nil),                  // 32: api.common.Message
+	(*UserAndPartnerIdParam)(nil),     // 0: api.common.UserAndPartnerIdParam
+	(*UserAndPartnerParam)(nil),       // 1: api.common.UserAndPartnerParam
+	(*User1AndUser2IdParam)(nil),      // 2: api.common.User1AndUser2IdParam
+	(*PartnerIDParam)(nil),            // 3: api.common.PartnerIDParam
+	(*PersonIDParam)(nil),             // 4: api.common.PersonIDParam
+	(*PersonParam)(nil),               // 5: api.common.PersonParam
+	(*UserIDParam)(nil),               // 6: api.common.UserIDParam
+	(*WxConfReq)(nil),                 // 7: api.common.WxConfReq
+	(*WxConfResponse)(nil),            // 8: api.common.WxConfResponse
+	(*HomeInfo)(nil),                  // 9: api.common.HomeInfo
+	(*PersonMsg)(nil),                 // 10: api.common.PersonMsg
+	(*LookedAndLikedNum)(nil),         // 11: api.common.LookedAndLikedNum
+	(*AddFriendMessageInfo)(nil),      // 12: api.common.AddFriendMessageInfo
+	(*PersonIDList)(nil),              // 13: api.common.PersonIDList
+	(*PersonDBReply)(nil),             // 14: api.common.PersonDBReply
+	(*PersonDB)(nil),                  // 15: api.common.PersonDB
+	(*ListPageRequest)(nil),           // 16: api.common.ListPageRequest
+	(*ListPage2Request)(nil),          // 17: api.common.ListPage2Request
+	(*ListPageAndPersonRequest)(nil),  // 18: api.common.ListPageAndPersonRequest
+	(*SendPhoneCodeRequest)(nil),      // 19: api.common.SendPhoneCodeRequest
+	(*CheckPhoneCodeRequest)(nil),     // 20: api.common.CheckPhoneCodeRequest
+	(*UploadMaterialResponse)(nil),    // 21: api.common.UploadMaterialResponse
+	(*Ids)(nil),                       // 22: api.common.Ids
+	(*TagListReply)(nil),              // 23: api.common.TagListReply
+	(*TagList)(nil),                   // 24: api.common.TagList
+	(*SexReq)(nil),                    // 25: api.common.SexReq
+	(*RandomIntroduceReply)(nil),      // 26: api.common.RandomIntroduceReply
+	(*UpdateInformationRequest)(nil),  // 27: api.common.UpdateInformationRequest
+	(*OnlinePersonListReply)(nil),     // 28: api.common.OnlinePersonListReply
+	(*OnlinePersonInfo)(nil),          // 29: api.common.OnlinePersonInfo
+	(*ChatRecordListReply)(nil),       // 30: api.common.ChatRecordListReply
+	(*ChatRoomMsg)(nil),               // 31: api.common.ChatRoomMsg
+	(*ChatRecordInfo)(nil),            // 32: api.common.ChatRecordInfo
+	(*Message)(nil),                   // 33: api.common.Message
+	(*FindChatRoomMsgRequest)(nil),    // 34: api.common.FindChatRoomMsgRequest
+	(*FindChatRecordListRequest)(nil), // 35: api.common.FindChatRecordListRequest
 }
 var file_common_proto_depIdxs = []int32{
 	24, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
 	15, // 1: api.common.PersonDBReply.list:type_name -> api.common.PersonDB
 	24, // 2: api.common.TagListReply.list:type_name -> api.common.TagList
 	29, // 3: api.common.OnlinePersonListReply.list:type_name -> api.common.OnlinePersonInfo
-	31, // 4: api.common.ChatRecordListReply.list:type_name -> api.common.ChatRecordInfo
-	32, // 5: api.common.ChatRecordInfo.message:type_name -> api.common.Message
+	32, // 4: api.common.ChatRecordListReply.list:type_name -> api.common.ChatRecordInfo
+	33, // 5: api.common.ChatRecordInfo.message:type_name -> api.common.Message
 	6,  // [6:6] is the sub-list for method output_type
 	6,  // [6:6] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
@@ -3080,7 +3331,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChatRecordInfo); i {
+			switch v := v.(*ChatRoomMsg); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -3092,6 +3343,18 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ChatRecordInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Message); i {
 			case 0:
 				return &v.state
@@ -3103,6 +3366,30 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindChatRoomMsgRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindChatRecordListRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -3110,7 +3397,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   33,
+			NumMessages:   36,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 23 - 0
api/common/common.proto

@@ -227,6 +227,18 @@ message ChatRecordListReply{
   int64 nextId = 2;
 }
 
+message ChatRoomMsg{
+  int64 roomId = 1;    // 房间ID
+  string selfID = 2; // 自己的ID
+  string selfType = 3; // 自己的type
+  string otherID = 4; // 对方的ID
+  string otherType = 5; // 对方的type
+  string selfName = 6;// 自己的名称
+  string otherName = 7;// 他人的名称
+  string selfAvatar = 8;// 自己的头像
+  string otherAvatar = 9;// 他人的头像
+}
+
 message ChatRecordInfo{
   int64 messageId = 1; // 消息的ID
   string msgType = 2;  // 消息类型
@@ -241,4 +253,15 @@ message Message{
   string content = 1; // 文本内容
   string materialUrl = 2; // 素材链接
   int64 second = 3;// 音频的秒数
+}
+
+message FindChatRoomMsgRequest{
+  int64 roomId = 1;
+}
+
+
+message FindChatRecordListRequest{
+  int64 nextId = 1;
+  int64 offset = 2;
+  int64 roomId = 3;
 }

+ 85 - 61
api/partner/partner.pb.go

@@ -568,7 +568,7 @@ var file_partner_proto_rawDesc = []byte{
 	0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x2b,
 	0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x50, 0x61, 0x72, 0x74, 0x6e,
 	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xbb, 0x12, 0x0a, 0x07,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xb6, 0x14, 0x0a, 0x07,
 	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61,
 	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74,
@@ -716,12 +716,28 @@ var file_partner_proto_rawDesc = []byte{
 	0x46, 0x69, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c,
 	0x79, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f,
 	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x2f, 0x63, 0x68, 0x61,
-	0x74, 0x2f, 0x6f, 0x76, 0x65, 0x72, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69,
-	0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e,
-	0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x2f, 0x6f, 0x76, 0x65, 0x72, 0x3a, 0x01, 0x2a, 0x12, 0x81, 0x01, 0x0a, 0x12, 0x46, 0x69,
+	0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74,
+	0x12, 0x25, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69,
+	0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d,
+	0x22, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63,
+	0x68, 0x61, 0x74, 0x2f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x3a, 0x01, 0x2a, 0x12, 0x75, 0x0a,
+	0x0f, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67,
+	0x12, 0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69,
+	0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x22, 0x25, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x72, 0x6f, 0x6f, 0x6d, 0x2f, 0x6d, 0x73,
+	0x67, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61,
+	0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72,
+	0x74, 0x6e, 0x65, 0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -738,36 +754,40 @@ func file_partner_proto_rawDescGZIP() []byte {
 
 var file_partner_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_partner_proto_goTypes = []interface{}{
-	(*PartnerInfo)(nil),                     // 0: api.partner.PartnerInfo
-	(*PartnerMessage)(nil),                  // 1: api.partner.PartnerMessage
-	(*PartnerBalance)(nil),                  // 2: api.partner.PartnerBalance
-	(*PartnerDBBalance)(nil),                // 3: api.partner.PartnerDBBalance
-	(*RandomPartnerInfo)(nil),               // 4: api.partner.RandomPartnerInfo
-	(*GetRandomPartnerRequest)(nil),         // 5: api.partner.GetRandomPartnerRequest
-	(*emptypb.Empty)(nil),                   // 6: google.protobuf.Empty
-	(*common.PartnerIDParam)(nil),           // 7: api.common.PartnerIDParam
-	(*common.PersonIDParam)(nil),            // 8: api.common.PersonIDParam
-	(*common.SendPhoneCodeRequest)(nil),     // 9: api.common.SendPhoneCodeRequest
-	(*common.CheckPhoneCodeRequest)(nil),    // 10: api.common.CheckPhoneCodeRequest
-	(*common.UpdateInformationRequest)(nil), // 11: api.common.UpdateInformationRequest
-	(*common.PersonParam)(nil),              // 12: api.common.PersonParam
-	(*common.ListPageRequest)(nil),          // 13: api.common.ListPageRequest
-	(*common.PersonIDList)(nil),             // 14: api.common.PersonIDList
-	(*common.WxConfReq)(nil),                // 15: api.common.WxConfReq
-	(*common.SexReq)(nil),                   // 16: api.common.SexReq
-	(*common.ListPage2Request)(nil),         // 17: api.common.ListPage2Request
-	(*common.PersonMsg)(nil),                // 18: api.common.PersonMsg
-	(*statistics.LookMessageReply)(nil),     // 19: api.statistics.LookMessageReply
-	(*common.AddFriendMessageInfo)(nil),     // 20: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                 // 21: api.common.HomeInfo
-	(*common.LookedAndLikedNum)(nil),        // 22: api.common.LookedAndLikedNum
-	(*statistics.LookAndLikeListReply)(nil), // 23: api.statistics.LookAndLikeListReply
-	(*common.PersonDBReply)(nil),            // 24: api.common.PersonDBReply
-	(*common.WxConfResponse)(nil),           // 25: api.common.WxConfResponse
-	(*chat.RoomReply)(nil),                  // 26: api.chat.RoomReply
-	(*common.TagListReply)(nil),             // 27: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),    // 28: api.common.OnlinePersonListReply
-	(*chat.PartnerFindRoomListReply)(nil),   // 29: api.chat.PartnerFindRoomListReply
+	(*PartnerInfo)(nil),                      // 0: api.partner.PartnerInfo
+	(*PartnerMessage)(nil),                   // 1: api.partner.PartnerMessage
+	(*PartnerBalance)(nil),                   // 2: api.partner.PartnerBalance
+	(*PartnerDBBalance)(nil),                 // 3: api.partner.PartnerDBBalance
+	(*RandomPartnerInfo)(nil),                // 4: api.partner.RandomPartnerInfo
+	(*GetRandomPartnerRequest)(nil),          // 5: api.partner.GetRandomPartnerRequest
+	(*emptypb.Empty)(nil),                    // 6: google.protobuf.Empty
+	(*common.PartnerIDParam)(nil),            // 7: api.common.PartnerIDParam
+	(*common.PersonIDParam)(nil),             // 8: api.common.PersonIDParam
+	(*common.SendPhoneCodeRequest)(nil),      // 9: api.common.SendPhoneCodeRequest
+	(*common.CheckPhoneCodeRequest)(nil),     // 10: api.common.CheckPhoneCodeRequest
+	(*common.UpdateInformationRequest)(nil),  // 11: api.common.UpdateInformationRequest
+	(*common.PersonParam)(nil),               // 12: api.common.PersonParam
+	(*common.ListPageRequest)(nil),           // 13: api.common.ListPageRequest
+	(*common.PersonIDList)(nil),              // 14: api.common.PersonIDList
+	(*common.WxConfReq)(nil),                 // 15: api.common.WxConfReq
+	(*common.SexReq)(nil),                    // 16: api.common.SexReq
+	(*common.ListPage2Request)(nil),          // 17: api.common.ListPage2Request
+	(*common.FindChatRecordListRequest)(nil), // 18: api.common.FindChatRecordListRequest
+	(*common.FindChatRoomMsgRequest)(nil),    // 19: api.common.FindChatRoomMsgRequest
+	(*common.PersonMsg)(nil),                 // 20: api.common.PersonMsg
+	(*statistics.LookMessageReply)(nil),      // 21: api.statistics.LookMessageReply
+	(*common.AddFriendMessageInfo)(nil),      // 22: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                  // 23: api.common.HomeInfo
+	(*common.LookedAndLikedNum)(nil),         // 24: api.common.LookedAndLikedNum
+	(*statistics.LookAndLikeListReply)(nil),  // 25: api.statistics.LookAndLikeListReply
+	(*common.PersonDBReply)(nil),             // 26: api.common.PersonDBReply
+	(*common.WxConfResponse)(nil),            // 27: api.common.WxConfResponse
+	(*chat.RoomReply)(nil),                   // 28: api.chat.RoomReply
+	(*common.TagListReply)(nil),              // 29: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),     // 30: api.common.OnlinePersonListReply
+	(*chat.PartnerFindRoomListReply)(nil),    // 31: api.chat.PartnerFindRoomListReply
+	(*common.ChatRecordListReply)(nil),       // 32: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),               // 33: api.common.ChatRoomMsg
 }
 var file_partner_proto_depIdxs = []int32{
 	6,  // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
@@ -792,30 +812,34 @@ var file_partner_proto_depIdxs = []int32{
 	13, // 19: api.partner.Partner.FindUnReplyRoomList:input_type -> api.common.ListPageRequest
 	13, // 20: api.partner.Partner.FindWithinSevenDayRoomList:input_type -> api.common.ListPageRequest
 	13, // 21: api.partner.Partner.FindOverSevenDayRoomList:input_type -> api.common.ListPageRequest
-	0,  // 22: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	2,  // 23: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
-	3,  // 24: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
-	18, // 25: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
-	1,  // 26: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
-	19, // 27: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
-	6,  // 28: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
-	6,  // 29: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
-	20, // 30: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	6,  // 31: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
-	4,  // 32: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	21, // 33: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
-	22, // 34: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	23, // 35: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	24, // 36: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
-	25, // 37: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	26, // 38: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
-	27, // 39: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
-	28, // 40: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
-	29, // 41: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	29, // 42: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	29, // 43: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	22, // [22:44] is the sub-list for method output_type
-	0,  // [0:22] is the sub-list for method input_type
+	18, // 22: api.partner.Partner.FindChatRecordList:input_type -> api.common.FindChatRecordListRequest
+	19, // 23: api.partner.Partner.FindChatRoomMsg:input_type -> api.common.FindChatRoomMsgRequest
+	0,  // 24: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
+	2,  // 25: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
+	3,  // 26: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
+	20, // 27: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
+	1,  // 28: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
+	21, // 29: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
+	6,  // 30: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
+	6,  // 31: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
+	22, // 32: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	6,  // 33: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
+	4,  // 34: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
+	23, // 35: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
+	24, // 36: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	25, // 37: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	26, // 38: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
+	27, // 39: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
+	28, // 40: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
+	29, // 41: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
+	30, // 42: api.partner.Partner.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	31, // 43: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	31, // 44: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	31, // 45: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	32, // 46: api.partner.Partner.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	33, // 47: api.partner.Partner.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	24, // [24:48] is the sub-list for method output_type
+	0,  // [0:24] 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

+ 14 - 0
api/partner/partner.proto

@@ -141,6 +141,20 @@ service Partner {
       body:"*"
     };
   };
+  // 接待者查询聊天记录
+  rpc FindChatRecordList (common.FindChatRecordListRequest) returns (common.ChatRecordListReply){
+    option (google.api.http) = {
+      post: "/api/partner/chat/record",
+      body:"*"
+    };
+  };
+  // 接待者查询房间信息
+  rpc FindChatRoomMsg (common.FindChatRoomMsgRequest) returns (common.ChatRoomMsg){
+    option (google.api.http) = {
+      post: "/api/partner/chat/room/msg",
+      body:"*"
+    };
+  };
 }
 
 message PartnerInfo{

+ 76 - 0
api/partner/partner_grpc.pb.go

@@ -64,6 +64,10 @@ type PartnerClient interface {
 	FindWithinSevenDayRoomList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*chat.PartnerFindRoomListReply, error)
 	// 七天外列表(更早的聊天记录)
 	FindOverSevenDayRoomList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*chat.PartnerFindRoomListReply, error)
+	// 接待者查询聊天记录
+	FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error)
+	// 接待者查询房间信息
+	FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error)
 }
 
 type partnerClient struct {
@@ -272,6 +276,24 @@ func (c *partnerClient) FindOverSevenDayRoomList(ctx context.Context, in *common
 	return out, nil
 }
 
+func (c *partnerClient) FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error) {
+	out := new(common.ChatRecordListReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindChatRecordList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error) {
+	out := new(common.ChatRoomMsg)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindChatRoomMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // PartnerServer is the server API for Partner service.
 // All implementations must embed UnimplementedPartnerServer
 // for forward compatibility
@@ -318,6 +340,10 @@ type PartnerServer interface {
 	FindWithinSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
 	// 七天外列表(更早的聊天记录)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
+	// 接待者查询聊天记录
+	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
+	// 接待者查询房间信息
+	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -391,6 +417,12 @@ func (UnimplementedPartnerServer) FindWithinSevenDayRoomList(context.Context, *c
 func (UnimplementedPartnerServer) FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOverSevenDayRoomList not implemented")
 }
+func (UnimplementedPartnerServer) FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatRecordList not implemented")
+}
+func (UnimplementedPartnerServer) FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatRoomMsg not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -800,6 +832,42 @@ func _Partner_FindOverSevenDayRoomList_Handler(srv interface{}, ctx context.Cont
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_FindChatRecordList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindChatRecordListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindChatRecordList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindChatRecordList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindChatRecordList(ctx, req.(*common.FindChatRecordListRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_FindChatRoomMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindChatRoomMsgRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindChatRoomMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindChatRoomMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindChatRoomMsg(ctx, req.(*common.FindChatRoomMsgRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Partner_ServiceDesc is the grpc.ServiceDesc for Partner service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -895,6 +963,14 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindOverSevenDayRoomList",
 			Handler:    _Partner_FindOverSevenDayRoomList_Handler,
 		},
+		{
+			MethodName: "FindChatRecordList",
+			Handler:    _Partner_FindChatRecordList_Handler,
+		},
+		{
+			MethodName: "FindChatRoomMsg",
+			Handler:    _Partner_FindChatRoomMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 86 - 0
api/partner/partner_http.pb.go

@@ -32,6 +32,8 @@ const _ = http.SupportPackageIsVersion1
 type PartnerHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	CreateUserPartnerRoom(context.Context, *common.PersonIDParam) (*chat.RoomReply, error)
+	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
+	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*chat.PartnerFindRoomListReply, error)
@@ -68,6 +70,8 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/list/chat/unreply", _Partner_FindUnReplyRoomList0_HTTP_Handler(srv))
 	r.POST("/api/partner/list/chat/within", _Partner_FindWithinSevenDayRoomList0_HTTP_Handler(srv))
 	r.POST("/api/partner/list/chat/over", _Partner_FindOverSevenDayRoomList0_HTTP_Handler(srv))
+	r.POST("/api/partner/chat/record", _Partner_FindChatRecordList0_HTTP_Handler(srv))
+	r.POST("/api/partner/chat/room/msg", _Partner_FindChatRoomMsg0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -529,9 +533,65 @@ func _Partner_FindOverSevenDayRoomList0_HTTP_Handler(srv PartnerHTTPServer) func
 	}
 }
 
+func _Partner_FindChatRecordList0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.FindChatRecordListRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/FindChatRecordList")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindChatRecordList(ctx, req.(*common.FindChatRecordListRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
+func _Partner_FindChatRoomMsg0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.FindChatRoomMsgRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/FindChatRoomMsg")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindChatRoomMsg(ctx, req.(*common.FindChatRoomMsgRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CreateUserPartnerRoom(ctx context.Context, req *common.PersonIDParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
+	FindChatRecordList(ctx context.Context, req *common.FindChatRecordListRequest, opts ...http.CallOption) (rsp *common.ChatRecordListReply, err error)
+	FindChatRoomMsg(ctx context.Context, req *common.FindChatRoomMsgRequest, opts ...http.CallOption) (rsp *common.ChatRoomMsg, err error)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindOnlineList(ctx context.Context, req *common.ListPage2Request, opts ...http.CallOption) (rsp *common.OnlinePersonListReply, err error)
 	FindOverSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *chat.PartnerFindRoomListReply, err error)
@@ -583,6 +643,32 @@ func (c *PartnerHTTPClientImpl) CreateUserPartnerRoom(ctx context.Context, in *c
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...http.CallOption) (*common.ChatRecordListReply, error) {
+	var out common.ChatRecordListReply
+	pattern := "/api/partner/chat/record"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindChatRecordList"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
+func (c *PartnerHTTPClientImpl) FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...http.CallOption) (*common.ChatRoomMsg, error) {
+	var out common.ChatRoomMsg
+	pattern := "/api/partner/chat/room/msg"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/FindChatRoomMsg"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) FindLookList(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*statistics.LookAndLikeListReply, error) {
 	var out statistics.LookAndLikeListReply
 	pattern := "/api/partner/list/look"

+ 66 - 43
api/user/user.pb.go

@@ -498,7 +498,7 @@ var file_user_proto_rawDesc = []byte{
 	0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x0d,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x22, 0x1e, 0x0a, 0x0a, 0x4b, 0x65,
 	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xe6, 0x12, 0x0a, 0x04, 0x55,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xda, 0x14, 0x0a, 0x04, 0x55,
 	0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65,
 	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
@@ -649,11 +649,26 @@ var file_user_proto_rawDesc = []byte{
 	0x69, 0x63, 0x73, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
 	0x65, 0x70, 0x6c, 0x79, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x22, 0x12, 0x2f, 0x61,
 	0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x6c, 0x6f, 0x6f, 0x6b, 0x2f, 0x6e, 0x75, 0x6d,
-	0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x50,
-	0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73,
-	0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x3a, 0x01, 0x2a, 0x12, 0x7e, 0x0a, 0x12, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68,
+	0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x3a, 0x01, 0x2a, 0x12, 0x72, 0x0a, 0x0f, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52,
+	0x6f, 0x6f, 0x6d, 0x4d, 0x73, 0x67, 0x12, 0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d,
+	0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d,
+	0x4d, 0x73, 0x67, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x22, 0x17, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x72, 0x6f, 0x6f, 0x6d,
+	0x2f, 0x6d, 0x73, 0x67, 0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75,
+	0x73, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61,
+	0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65,
+	0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -687,19 +702,23 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.WxConfReq)(nil),                         // 14: api.common.WxConfReq
 	(*common.SexReq)(nil),                            // 15: api.common.SexReq
 	(*common.ListPage2Request)(nil),                  // 16: api.common.ListPage2Request
-	(*common.PersonMsg)(nil),                         // 17: api.common.PersonMsg
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 18: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.RoomReply)(nil),                           // 19: api.chat.RoomReply
-	(*common.AddFriendMessageInfo)(nil),              // 20: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                          // 21: api.common.HomeInfo
-	(*common.PersonDBReply)(nil),                     // 22: api.common.PersonDBReply
-	(*statistics.LookAndLikeListReply)(nil),          // 23: api.statistics.LookAndLikeListReply
-	(*statistics.LookAndLikeMessageReply)(nil),       // 24: api.statistics.LookAndLikeMessageReply
-	(*common.WxConfResponse)(nil),                    // 25: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                      // 26: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),             // 27: api.common.OnlinePersonListReply
-	(*common.LookedAndLikedNum)(nil),                 // 28: api.common.LookedAndLikedNum
-	(*statistics.LookMessageReply)(nil),              // 29: api.statistics.LookMessageReply
+	(*common.FindChatRecordListRequest)(nil),         // 17: api.common.FindChatRecordListRequest
+	(*common.FindChatRoomMsgRequest)(nil),            // 18: api.common.FindChatRoomMsgRequest
+	(*common.PersonMsg)(nil),                         // 19: api.common.PersonMsg
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 20: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.RoomReply)(nil),                           // 21: api.chat.RoomReply
+	(*common.AddFriendMessageInfo)(nil),              // 22: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                          // 23: api.common.HomeInfo
+	(*common.PersonDBReply)(nil),                     // 24: api.common.PersonDBReply
+	(*statistics.LookAndLikeListReply)(nil),          // 25: api.statistics.LookAndLikeListReply
+	(*statistics.LookAndLikeMessageReply)(nil),       // 26: api.statistics.LookAndLikeMessageReply
+	(*common.WxConfResponse)(nil),                    // 27: api.common.WxConfResponse
+	(*common.TagListReply)(nil),                      // 28: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),             // 29: api.common.OnlinePersonListReply
+	(*common.LookedAndLikedNum)(nil),                 // 30: api.common.LookedAndLikedNum
+	(*statistics.LookMessageReply)(nil),              // 31: api.statistics.LookMessageReply
+	(*common.ChatRecordListReply)(nil),               // 32: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                       // 33: api.common.ChatRoomMsg
 }
 var file_user_proto_depIdxs = []int32{
 	2,  // 0: api.user.UserFindChatListReply.list:type_name -> api.user.UserChatInfo
@@ -725,30 +744,34 @@ var file_user_proto_depIdxs = []int32{
 	11, // 20: api.user.User.UserGetPersonLikedAndLooked:input_type -> api.common.PersonParam
 	6,  // 21: api.user.User.GetUserBalance:input_type -> google.protobuf.Empty
 	6,  // 22: api.user.User.GetUserLookNum:input_type -> google.protobuf.Empty
-	6,  // 23: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	3,  // 24: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	17, // 25: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	6,  // 26: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	6,  // 27: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	18, // 28: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	19, // 29: api.user.User.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
-	20, // 30: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	21, // 31: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	22, // 32: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	23, // 33: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	23, // 34: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	23, // 35: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	24, // 36: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	25, // 37: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	26, // 38: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	27, // 39: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
-	1,  // 40: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	1,  // 41: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	28, // 42: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	0,  // 43: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	29, // 44: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	23, // [23:45] is the sub-list for method output_type
-	1,  // [1:23] is the sub-list for method input_type
+	17, // 23: api.user.User.FindChatRecordList:input_type -> api.common.FindChatRecordListRequest
+	18, // 24: api.user.User.FindChatRoomMsg:input_type -> api.common.FindChatRoomMsgRequest
+	6,  // 25: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	3,  // 26: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	19, // 27: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	6,  // 28: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	6,  // 29: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	20, // 30: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	21, // 31: api.user.User.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
+	22, // 32: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	23, // 33: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	24, // 34: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	25, // 35: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	25, // 36: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	25, // 37: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	26, // 38: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	27, // 39: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	28, // 40: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	29, // 41: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	1,  // 42: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	1,  // 43: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	30, // 44: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	0,  // 45: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	31, // 46: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	32, // 47: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	33, // 48: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	25, // [25:49] is the sub-list for method output_type
+	1,  // [1:25] is the sub-list for method input_type
 	1,  // [1:1] is the sub-list for extension type_name
 	1,  // [1:1] is the sub-list for extension extendee
 	0,  // [0:1] is the sub-list for field type_name

+ 14 - 0
api/user/user.proto

@@ -158,6 +158,20 @@ service User {
       body:"*"
     };
   };
+  // 用户查询聊天记录
+  rpc FindChatRecordList (common.FindChatRecordListRequest) returns (common.ChatRecordListReply){
+    option (google.api.http) = {
+      post: "/api/user/chat/record",
+      body:"*"
+    };
+  };
+  // 用户查询房间信息
+  rpc FindChatRoomMsg (common.FindChatRoomMsgRequest) returns (common.ChatRoomMsg){
+    option (google.api.http) = {
+      post: "/api/user/chat/room/msg",
+      body:"*"
+    };
+  };
 }
 
 message UserBalance{

+ 76 - 0
api/user/user_grpc.pb.go

@@ -66,6 +66,10 @@ type UserClient interface {
 	GetUserBalance(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserBalance, error)
 	// 获取用户访问数详情
 	GetUserLookNum(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*statistics.LookMessageReply, error)
+	// 用户查询聊天记录
+	FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error)
+	// 用户查询房间信息
+	FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error)
 }
 
 type userClient struct {
@@ -274,6 +278,24 @@ func (c *userClient) GetUserLookNum(ctx context.Context, in *emptypb.Empty, opts
 	return out, nil
 }
 
+func (c *userClient) FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...grpc.CallOption) (*common.ChatRecordListReply, error) {
+	out := new(common.ChatRecordListReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindChatRecordList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...grpc.CallOption) (*common.ChatRoomMsg, error) {
+	out := new(common.ChatRoomMsg)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindChatRoomMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UserServer is the server API for User service.
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
@@ -322,6 +344,10 @@ type UserServer interface {
 	GetUserBalance(context.Context, *emptypb.Empty) (*UserBalance, error)
 	// 获取用户访问数详情
 	GetUserLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
+	// 用户查询聊天记录
+	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
+	// 用户查询房间信息
+	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -395,6 +421,12 @@ func (UnimplementedUserServer) GetUserBalance(context.Context, *emptypb.Empty) (
 func (UnimplementedUserServer) GetUserLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserLookNum not implemented")
 }
+func (UnimplementedUserServer) FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatRecordList not implemented")
+}
+func (UnimplementedUserServer) FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatRoomMsg not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -804,6 +836,42 @@ func _User_GetUserLookNum_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_FindChatRecordList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindChatRecordListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindChatRecordList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindChatRecordList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindChatRecordList(ctx, req.(*common.FindChatRecordListRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_FindChatRoomMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindChatRoomMsgRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindChatRoomMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindChatRoomMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindChatRoomMsg(ctx, req.(*common.FindChatRoomMsgRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // User_ServiceDesc is the grpc.ServiceDesc for User service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -899,6 +967,14 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetUserLookNum",
 			Handler:    _User_GetUserLookNum_Handler,
 		},
+		{
+			MethodName: "FindChatRecordList",
+			Handler:    _User_FindChatRecordList_Handler,
+		},
+		{
+			MethodName: "FindChatRoomMsg",
+			Handler:    _User_FindChatRoomMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

+ 86 - 0
api/user/user_http.pb.go

@@ -33,6 +33,8 @@ type UserHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
 	CreateUserPartnerRoom(context.Context, *common.PartnerIDParam) (*chat.RoomReply, error)
+	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
+	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
 	FindLikeList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLikedList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
 	FindLookList(context.Context, *common.ListPageRequest) (*statistics.LookAndLikeListReply, error)
@@ -74,6 +76,8 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/num", _User_UserGetPersonLikedAndLooked0_HTTP_Handler(srv))
 	r.POST("/api/user/balance", _User_GetUserBalance0_HTTP_Handler(srv))
 	r.POST("/api/user/look/num", _User_GetUserLookNum0_HTTP_Handler(srv))
+	r.POST("/api/user/chat/record", _User_FindChatRecordList0_HTTP_Handler(srv))
+	r.POST("/api/user/chat/room/msg", _User_FindChatRoomMsg0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -616,10 +620,66 @@ func _User_GetUserLookNum0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Contex
 	}
 }
 
+func _User_FindChatRecordList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.FindChatRecordListRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/FindChatRecordList")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindChatRecordList(ctx, req.(*common.FindChatRecordListRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
+func _User_FindChatRoomMsg0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.FindChatRoomMsgRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/FindChatRoomMsg")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindChatRoomMsg(ctx, req.(*common.FindChatRoomMsgRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type UserHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
 	CreateUserPartnerRoom(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
+	FindChatRecordList(ctx context.Context, req *common.FindChatRecordListRequest, opts ...http.CallOption) (rsp *common.ChatRecordListReply, err error)
+	FindChatRoomMsg(ctx context.Context, req *common.FindChatRoomMsgRequest, opts ...http.CallOption) (rsp *common.ChatRoomMsg, err error)
 	FindLikeList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindLikedList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
 	FindLookList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *statistics.LookAndLikeListReply, err error)
@@ -686,6 +746,32 @@ func (c *UserHTTPClientImpl) CreateUserPartnerRoom(ctx context.Context, in *comm
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) FindChatRecordList(ctx context.Context, in *common.FindChatRecordListRequest, opts ...http.CallOption) (*common.ChatRecordListReply, error) {
+	var out common.ChatRecordListReply
+	pattern := "/api/user/chat/record"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/FindChatRecordList"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
+func (c *UserHTTPClientImpl) FindChatRoomMsg(ctx context.Context, in *common.FindChatRoomMsgRequest, opts ...http.CallOption) (*common.ChatRoomMsg, error) {
+	var out common.ChatRoomMsg
+	pattern := "/api/user/chat/room/msg"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/FindChatRoomMsg"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *UserHTTPClientImpl) FindLikeList(ctx context.Context, in *common.ListPageRequest, opts ...http.CallOption) (*statistics.LookAndLikeListReply, error) {
 	var out statistics.LookAndLikeListReply
 	pattern := "/api/user/list/like"

+ 7 - 0
js/api/chat/chat_pb.ts

@@ -89,6 +89,13 @@ export interface CheckUserPartnerIsRelationshipReply{
 export interface RoomReply{
     roomId?:number;
 }
+export interface FindChatRoomMsgRequest{
+    roomId?:number;
+    /**  类型 */
+    personType?:string;
+    /**  查询目标的ID */
+    personID?:string;
+}
 export interface FindChatRecordListRequest{
     nextId?:number;
     offset?:number;

+ 28 - 0
js/api/common/common_pb.ts

@@ -276,6 +276,26 @@ export interface ChatRecordListReply{
     list?:Array<ChatRecordInfo>;
     nextId?:number;
 }
+export interface ChatRoomMsg{
+    /**  房间ID */
+    roomId?:number;
+    /**  自己的ID */
+    selfID?:string;
+    /**  自己的type */
+    selfType?:string;
+    /**  对方的ID */
+    otherID?:string;
+    /**  对方的type */
+    otherType?:string;
+    /**  自己的名称 */
+    selfName?:string;
+    /**  他人的名称 */
+    otherName?:string;
+    /**  自己的头像 */
+    selfAvatar?:string;
+    /**  他人的头像 */
+    otherAvatar?:string;
+}
 export interface ChatRecordInfo{
     /**  消息的ID */
     messageId?:number;
@@ -300,4 +320,12 @@ export interface Message{
     /**  音频的秒数 */
     second?:number;
 }
+export interface FindChatRoomMsgRequest{
+    roomId?:number;
+}
+export interface FindChatRecordListRequest{
+    nextId?:number;
+    offset?:number;
+    roomId?:number;
+}
 

+ 11 - 1
js/api/partner/partner_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {PartnerInfo,PartnerBalance,PartnerDBBalance,PartnerMessage,GetRandomPartnerRequest,RandomPartnerInfo} from "./partner_pb";
-import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply} from "../common/common_pb";
+import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg} from "../common/common_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
 import {RoomReply,PartnerFindRoomListReply} from "../chat/chat_pb";
 
@@ -91,6 +91,16 @@ const PartnerService = {
 	const res = await request.post<{ data: PartnerFindRoomListReply, code: string, message: string }>('/api/partner/list/chat/over', req);
     return res.data.data;
   },
+  /**  接待者查询聊天记录 */
+  FindChatRecordList: async (req?: FindChatRecordListRequest) => {
+	const res = await request.post<{ data: ChatRecordListReply, code: string, message: string }>('/api/partner/chat/record', req);
+    return res.data.data;
+  },
+  /**  接待者查询房间信息 */
+  FindChatRoomMsg: async (req?: FindChatRoomMsgRequest) => {
+	const res = await request.post<{ data: ChatRoomMsg, code: string, message: string }>('/api/partner/chat/room/msg', req);
+    return res.data.data;
+  },
 
 };
 

+ 11 - 1
js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum} from "../common/common_pb";
+import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -106,6 +106,16 @@ const UserService = {
 	const res = await request.post<{ data: LookMessageReply, code: string, message: string }>('/api/user/look/num', req);
     return res.data.data;
   },
+  /**  用户查询聊天记录 */
+  FindChatRecordList: async (req?: FindChatRecordListRequest) => {
+	const res = await request.post<{ data: ChatRecordListReply, code: string, message: string }>('/api/user/chat/record', req);
+    return res.data.data;
+  },
+  /**  用户查询房间信息 */
+  FindChatRoomMsg: async (req?: FindChatRoomMsgRequest) => {
+	const res = await request.post<{ data: ChatRoomMsg, code: string, message: string }>('/api/user/chat/room/msg', req);
+    return res.data.data;
+  },
 
 };