历史消息

rpc/internal/logic/findusermsglogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
+	"app.yhyue.com/moapp/MessageCenter/service"
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type FindUserMsgLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewFindUserMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindUserMsgLogic {
+	return &FindUserMsgLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 查询指定用户的历史消息记录
+func (l *FindUserMsgLogic) FindUserMsg(in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
+	// todo: add your logic here and delete this line
+	data := service.FindUserMsg(*in)
+	return &data, nil
+}

rpc/internal/server/messageserver.go

@@ -50,3 +50,9 @@ func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.GetUnrea
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadCount(in)
 }
+
+// 查询指定用户的历史消息记录
+func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
+	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)
+	return l.FindUserMsg(in)
+}

rpc/message.proto

@@ -25,19 +25,16 @@ message  ChangeReadStatusRequest {
 message DeleteSingleMessageRequest{
   int64 id = 1;    // 消息id
   string appid = 3; //应用标识
-
 }
 // 批量删除消息
 message DeleteMultipleMessageRequest{
   string id = 1;    // 多条消息id, 逗号分隔
   string appid = 3; //应用标识
-
 }
 // 查询指定用户未读消息合计
 message GetUnreadCountRequest{
   string userId = 1;    // 用户id
-  string appid = 3; //应用标识
-
+  string appid = 2; //应用标识
 }
 
 message Response {
@@ -51,6 +48,36 @@ message GetUnreadCountResponse {
   int64 count = 3;//
 }
 
+message FindUserMsgReq {
+  string userId = 1;    //用户id
+  string receiveUserId = 2; //聊天方用户id
+  string appid = 3; //应用标识
+  int64 offSet = 4; //当前
+  int64 pageSize = 5; //大小
+}
+
+message Messages {
+  string receiveUserId = 1; //接收方用户ID
+  string receiveName = 2; //接收方用户名
+  string sendUserId = 3; //发送方用户ID
+  string sendName = 4; //发送方用户名
+  string title = 5; //主题
+  string content = 6; //内容
+  int64 msgType = 7; //消息类型 1：客服   2：系统通知  3：营销   4：用户会话
+  string link = 8; //跳转链接
+  int64 citeId = 9; //引用id
+  int64 isRead = 10; //已读未读 0：未读  1：已读
+  string createtime = 11;
+  string appid = 12; //应用标识
+}
+
+message FindUserMsgRes {
+  int64 code = 1;//状态码
+  string message = 2;//响应消息
+  repeated Messages data = 3;//
+  int64 count = 4; //总数
+}
+
 service Message {
   // 修改消息阅读状态
   rpc ChangeReadStatus(ChangeReadStatusRequest) returns(Response);
@@ -62,4 +89,6 @@ service Message {
   rpc DeleteMultipleMessage(DeleteMultipleMessageRequest) returns(Response);
   //  查询指定用户未读消息合计
   rpc GetUnreadCount(GetUnreadCountRequest) returns(GetUnreadCountResponse);
+  //查询指定用户的历史消息记录
+  rpc FindUserMsg(FindUserMsgReq) returns(FindUserMsgRes);
 }

rpc/message/message.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0
-// 	protoc        v3.15.1
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.11.4
 // source: message.proto
 
 package message
@@ -330,7 +330,7 @@ type GetUnreadCountRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` // 用户id
-	Appid  string `protobuf:"bytes,3,opt,name=appid,proto3" json:"appid,omitempty"`   //应用标识
+	Appid  string `protobuf:"bytes,2,opt,name=appid,proto3" json:"appid,omitempty"`   //应用标识
 }
 
 func (x *GetUnreadCountRequest) Reset() {
@@ -497,6 +497,291 @@ func (x *GetUnreadCountResponse) GetCount() int64 {
 	return 0
 }
 
+type FindUserMsgReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId        string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`               //用户id
+	ReceiveUserId string `protobuf:"bytes,2,opt,name=receiveUserId,proto3" json:"receiveUserId,omitempty"` //聊天方用户id
+	Appid         string `protobuf:"bytes,3,opt,name=appid,proto3" json:"appid,omitempty"`                 //应用标识
+	OffSet        int64  `protobuf:"varint,4,opt,name=offSet,proto3" json:"offSet,omitempty"`              //当前
+	PageSize      int64  `protobuf:"varint,5,opt,name=pageSize,proto3" json:"pageSize,omitempty"`          //大小
+}
+
+func (x *FindUserMsgReq) Reset() {
+	*x = FindUserMsgReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindUserMsgReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindUserMsgReq) ProtoMessage() {}
+
+func (x *FindUserMsgReq) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[7]
+	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 FindUserMsgReq.ProtoReflect.Descriptor instead.
+func (*FindUserMsgReq) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *FindUserMsgReq) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *FindUserMsgReq) GetReceiveUserId() string {
+	if x != nil {
+		return x.ReceiveUserId
+	}
+	return ""
+}
+
+func (x *FindUserMsgReq) GetAppid() string {
+	if x != nil {
+		return x.Appid
+	}
+	return ""
+}
+
+func (x *FindUserMsgReq) GetOffSet() int64 {
+	if x != nil {
+		return x.OffSet
+	}
+	return 0
+}
+
+func (x *FindUserMsgReq) GetPageSize() int64 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
+}
+
+type Messages struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ReceiveUserId string `protobuf:"bytes,1,opt,name=receiveUserId,proto3" json:"receiveUserId,omitempty"` //接收方用户ID
+	ReceiveName   string `protobuf:"bytes,2,opt,name=receiveName,proto3" json:"receiveName,omitempty"`     //接收方用户名
+	SendUserId    string `protobuf:"bytes,3,opt,name=sendUserId,proto3" json:"sendUserId,omitempty"`       //发送方用户ID
+	SendName      string `protobuf:"bytes,4,opt,name=sendName,proto3" json:"sendName,omitempty"`           //发送方用户名
+	Title         string `protobuf:"bytes,5,opt,name=title,proto3" json:"title,omitempty"`                 //主题
+	Content       string `protobuf:"bytes,6,opt,name=content,proto3" json:"content,omitempty"`             //内容
+	MsgType       int64  `protobuf:"varint,7,opt,name=msgType,proto3" json:"msgType,omitempty"`            //消息类型 1：客服   2：系统通知  3：营销   4：用户会话
+	Link          string `protobuf:"bytes,8,opt,name=link,proto3" json:"link,omitempty"`                   //跳转链接
+	CiteId        int64  `protobuf:"varint,9,opt,name=citeId,proto3" json:"citeId,omitempty"`              //引用id
+	IsRead        int64  `protobuf:"varint,10,opt,name=isRead,proto3" json:"isRead,omitempty"`             //已读未读 0：未读  1：已读
+	Createtime    string `protobuf:"bytes,11,opt,name=createtime,proto3" json:"createtime,omitempty"`
+	Appid         string `protobuf:"bytes,12,opt,name=appid,proto3" json:"appid,omitempty"` //应用标识
+}
+
+func (x *Messages) Reset() {
+	*x = Messages{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Messages) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Messages) ProtoMessage() {}
+
+func (x *Messages) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[8]
+	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 Messages.ProtoReflect.Descriptor instead.
+func (*Messages) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *Messages) GetReceiveUserId() string {
+	if x != nil {
+		return x.ReceiveUserId
+	}
+	return ""
+}
+
+func (x *Messages) GetReceiveName() string {
+	if x != nil {
+		return x.ReceiveName
+	}
+	return ""
+}
+
+func (x *Messages) GetSendUserId() string {
+	if x != nil {
+		return x.SendUserId
+	}
+	return ""
+}
+
+func (x *Messages) GetSendName() string {
+	if x != nil {
+		return x.SendName
+	}
+	return ""
+}
+
+func (x *Messages) GetTitle() string {
+	if x != nil {
+		return x.Title
+	}
+	return ""
+}
+
+func (x *Messages) GetContent() string {
+	if x != nil {
+		return x.Content
+	}
+	return ""
+}
+
+func (x *Messages) GetMsgType() int64 {
+	if x != nil {
+		return x.MsgType
+	}
+	return 0
+}
+
+func (x *Messages) GetLink() string {
+	if x != nil {
+		return x.Link
+	}
+	return ""
+}
+
+func (x *Messages) GetCiteId() int64 {
+	if x != nil {
+		return x.CiteId
+	}
+	return 0
+}
+
+func (x *Messages) GetIsRead() int64 {
+	if x != nil {
+		return x.IsRead
+	}
+	return 0
+}
+
+func (x *Messages) GetCreatetime() string {
+	if x != nil {
+		return x.Createtime
+	}
+	return ""
+}
+
+func (x *Messages) GetAppid() string {
+	if x != nil {
+		return x.Appid
+	}
+	return ""
+}
+
+type FindUserMsgRes struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Code    int64       `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`      //状态码
+	Message string      `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` //响应消息
+	Data    []*Messages `protobuf:"bytes,3,rep,name=data,proto3" json:"data,omitempty"`       //
+	Count   int64       `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"`    //总数
+}
+
+func (x *FindUserMsgRes) Reset() {
+	*x = FindUserMsgRes{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_message_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindUserMsgRes) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindUserMsgRes) ProtoMessage() {}
+
+func (x *FindUserMsgRes) ProtoReflect() protoreflect.Message {
+	mi := &file_message_proto_msgTypes[9]
+	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 FindUserMsgRes.ProtoReflect.Descriptor instead.
+func (*FindUserMsgRes) Descriptor() ([]byte, []int) {
+	return file_message_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *FindUserMsgRes) GetCode() int64 {
+	if x != nil {
+		return x.Code
+	}
+	return 0
+}
+
+func (x *FindUserMsgRes) GetMessage() string {
+	if x != nil {
+		return x.Message
+	}
+	return ""
+}
+
+func (x *FindUserMsgRes) GetData() []*Messages {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
+func (x *FindUserMsgRes) GetCount() int64 {
+	if x != nil {
+		return x.Count
+	}
+	return 0
+}
+
 var File_message_proto protoreflect.FileDescriptor
 
 var file_message_proto_rawDesc = []byte{
@@ -538,7 +823,7 @@ var file_message_proto_rawDesc = []byte{
 	0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x22, 0x38, 0x0a,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x22, 0x38, 0x0a,
 	0x08, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
 	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a,
 	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
@@ -548,32 +833,74 @@ var file_message_proto_rawDesc = []byte{
 	0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
 	0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x32, 0x82, 0x03, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x47, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e,
-	0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0b, 0x53, 0x65,
-	0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53,
-	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x2e, 0x6d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x69, 0x6e,
-	0x67, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x75,
-	0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x2e,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x75,
-	0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x98, 0x01, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+	0x6f, 0x66, 0x66, 0x53, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66,
+	0x66, 0x53, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
+	0x22, 0xd2, 0x02, 0x0a, 0x08, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x12, 0x24, 0x0a,
+	0x0d, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
+	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6e, 0x64, 0x55, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x6e, 0x64, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x6e, 0x64, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x6e, 0x64, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6c,
+	0x69, 0x6e, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x12,
+	0x16, 0x0a, 0x06, 0x63, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x06, 0x63, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61,
+	0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12,
+	0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x61, 0x70, 0x70, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65,
+	0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x32, 0xc3, 0x03, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x47,
+	0x0a, 0x10, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x43, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x52, 0x65, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x55, 0x6e,
-	0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75,
-	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75,
-	0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x0b, 0x53, 0x65, 0x6e, 0x64, 0x55,
+	0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x4d, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x69, 0x6e, 0x67,
+	0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x23, 0x2e, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11,
+	0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x51, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69,
+	0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x25, 0x2e, 0x6d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69,
+	0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x11, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61,
+	0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x47, 0x65, 0x74, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x64, 0x55,
+	0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x1a,
+	0x17, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73,
+	0x65, 0x72, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -588,7 +915,7 @@ func file_message_proto_rawDescGZIP() []byte {
 	return file_message_proto_rawDescData
 }
 
-var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_message_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_message_proto_goTypes = []interface{}{
 	(*SendMsgRequest)(nil),               // 0: message.SendMsgRequest
 	(*ChangeReadStatusRequest)(nil),      // 1: message.ChangeReadStatusRequest
@@ -597,23 +924,29 @@ var file_message_proto_goTypes = []interface{}{
 	(*GetUnreadCountRequest)(nil),        // 4: message.GetUnreadCountRequest
 	(*Response)(nil),                     // 5: message.Response
 	(*GetUnreadCountResponse)(nil),       // 6: message.GetUnreadCountResponse
+	(*FindUserMsgReq)(nil),               // 7: message.FindUserMsgReq
+	(*Messages)(nil),                     // 8: message.Messages
+	(*FindUserMsgRes)(nil),               // 9: message.FindUserMsgRes
 }
 var file_message_proto_depIdxs = []int32{
-	1, // 0: message.Message.ChangeReadStatus:input_type -> message.ChangeReadStatusRequest
-	0, // 1: message.Message.SendUserMsg:input_type -> message.SendMsgRequest
-	2, // 2: message.Message.DeleteSingleMessage:input_type -> message.DeleteSingleMessageRequest
-	3, // 3: message.Message.DeleteMultipleMessage:input_type -> message.DeleteMultipleMessageRequest
-	4, // 4: message.Message.GetUnreadCount:input_type -> message.GetUnreadCountRequest
-	5, // 5: message.Message.ChangeReadStatus:output_type -> message.Response
-	5, // 6: message.Message.SendUserMsg:output_type -> message.Response
-	5, // 7: message.Message.DeleteSingleMessage:output_type -> message.Response
-	5, // 8: message.Message.DeleteMultipleMessage:output_type -> message.Response
-	6, // 9: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
-	5, // [5:10] is the sub-list for method output_type
-	0, // [0:5] 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
+	8, // 0: message.FindUserMsgRes.data:type_name -> message.Messages
+	1, // 1: message.Message.ChangeReadStatus:input_type -> message.ChangeReadStatusRequest
+	0, // 2: message.Message.SendUserMsg:input_type -> message.SendMsgRequest
+	2, // 3: message.Message.DeleteSingleMessage:input_type -> message.DeleteSingleMessageRequest
+	3, // 4: message.Message.DeleteMultipleMessage:input_type -> message.DeleteMultipleMessageRequest
+	4, // 5: message.Message.GetUnreadCount:input_type -> message.GetUnreadCountRequest
+	7, // 6: message.Message.FindUserMsg:input_type -> message.FindUserMsgReq
+	5, // 7: message.Message.ChangeReadStatus:output_type -> message.Response
+	5, // 8: message.Message.SendUserMsg:output_type -> message.Response
+	5, // 9: message.Message.DeleteSingleMessage:output_type -> message.Response
+	5, // 10: message.Message.DeleteMultipleMessage:output_type -> message.Response
+	6, // 11: message.Message.GetUnreadCount:output_type -> message.GetUnreadCountResponse
+	9, // 12: message.Message.FindUserMsg:output_type -> message.FindUserMsgRes
+	7, // [7:13] is the sub-list for method output_type
+	1, // [1:7] 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
 }
 
 func init() { file_message_proto_init() }
@@ -706,6 +1039,42 @@ func file_message_proto_init() {
 				return nil
 			}
 		}
+		file_message_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindUserMsgReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Messages); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_message_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindUserMsgRes); 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{
@@ -713,7 +1082,7 @@ func file_message_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_message_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -749,6 +1118,8 @@ type MessageClient interface {
 	DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest, opts ...grpc.CallOption) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
+	//查询指定用户的历史消息记录
+	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
 }
 
 type messageClient struct {
@@ -804,6 +1175,15 @@ func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRe
 	return out, nil
 }
 
+func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
+	out := new(FindUserMsgRes)
+	err := c.cc.Invoke(ctx, "/message.Message/FindUserMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // MessageServer is the server API for Message service.
 type MessageServer interface {
 	// 修改消息阅读状态
@@ -816,6 +1196,8 @@ type MessageServer interface {
 	DeleteMultipleMessage(context.Context, *DeleteMultipleMessageRequest) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
+	//查询指定用户的历史消息记录
+	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
 }
 
 // UnimplementedMessageServer can be embedded to have forward compatible implementations.
@@ -837,6 +1219,9 @@ func (*UnimplementedMessageServer) DeleteMultipleMessage(context.Context, *Delet
 func (*UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
 }
+func (*UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindUserMsg not implemented")
+}
 
 func RegisterMessageServer(s *grpc.Server, srv MessageServer) {
 	s.RegisterService(&_Message_serviceDesc, srv)
@@ -932,6 +1317,24 @@ func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FindUserMsgReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).FindUserMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/FindUserMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).FindUserMsg(ctx, req.(*FindUserMsgReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Message_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "message.Message",
 	HandlerType: (*MessageServer)(nil),
@@ -956,6 +1359,10 @@ var _Message_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetUnreadCount",
 			Handler:    _Message_GetUnreadCount_Handler,
 		},
+		{
+			MethodName: "FindUserMsg",
+			Handler:    _Message_FindUserMsg_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "message.proto",

rpc/messageclient/message.go

@@ -14,13 +14,16 @@ import (
 )
 
 type (
-	GetUnreadCountResponse       = message.GetUnreadCountResponse
-	SendMsgRequest               = message.SendMsgRequest
+	GetUnreadCountRequest        = message.GetUnreadCountRequest
 	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
 	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
 	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
-	GetUnreadCountRequest        = message.GetUnreadCountRequest
+	FindUserMsgReq               = message.FindUserMsgReq
+	Messages                     = message.Messages
+	FindUserMsgRes               = message.FindUserMsgRes
+	SendMsgRequest               = message.SendMsgRequest
 	Response                     = message.Response
+	GetUnreadCountResponse       = message.GetUnreadCountResponse
 
 	Message interface {
 		//  修改消息阅读状态
@@ -33,6 +36,8 @@ type (
 		DeleteMultipleMessage(ctx context.Context, in *DeleteMultipleMessageRequest) (*Response, error)
 		//   查询指定用户未读消息合计
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
+		// 查询指定用户的历史消息记录
+		FindUserMsg(ctx context.Context, in *FindUserMsgReq) (*FindUserMsgRes, error)
 	}
 
 	defaultMessage struct {
@@ -75,3 +80,9 @@ func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountR
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadCount(ctx, in)
 }
+
+// 查询指定用户的历史消息记录
+func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq) (*FindUserMsgRes, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.FindUserMsg(ctx, in)
+}

rpc/test/send_test.go

@@ -21,7 +21,7 @@ func Test_SendMsg(t *testing.T) {
 		SendUserId:    "5fa3bb6d059e75bcdf8dab6a",
 		SendName:      "xzh",
 		Title:         "超级订阅",
-		Content:       "2333333",
+		Content:       "444",
 		Link:          "",
 		CiteId:        int64(3),
 		MsgType:       int64(4),
@@ -29,3 +29,17 @@ func Test_SendMsg(t *testing.T) {
 	res, err := std.SendUserMsg(ctx, req)
 	log.Println("err ", err, res)
 }
+
+func Test_FindUserMsg(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	std := messageclient.NewMessage(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"127.0.0.1:2379"}, Key: "message.rpc"}}))
+	req := &messageclient.FindUserMsgReq{
+		Appid:         "10000",
+		ReceiveUserId: "6042120adca8410f1ef2ec84",
+		UserId:        "5fa3bb6d059e75bcdf8dab6a",
+		OffSet:        int64(1),
+		PageSize:      int64(10),
+	}
+	res, err := std.FindUserMsg(ctx, req)
+	log.Println("err ", err, res.Code, res.Message, res.Count, res.Data)
+}

service/sendMsg.go

@@ -14,7 +14,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 	defer orm.Close()
 	err := orm.Begin()
 	fmt.Println(err)
-	count, _ := orm.Table("conversation").Select("*").Where("user_id = ? or user_id = ?", this.ReceiveUserId, this.SendUserId).Count()
+	count, _ := orm.Table("conversation").Where("user_id = ? or user_id = ?", this.ReceiveUserId, this.SendUserId).Count()
 	if count < 1 {
 		conversation := entity.Conversation{
 			AppId:       this.Appid,
@@ -75,3 +75,45 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 	orm.Commit()
 	return 1, "消息发送成功"
 }
+
+func FindUserMsg(this message.FindUserMsgReq) message.FindUserMsgRes {
+	orm := entity.Engine
+	var messages []*entity.Message
+	var err error
+	var count int64
+	count, err = orm.Table("message").Where("((receive_userid = ? and send_userid = ?) or (receive_userid = ? and send_userid = ?)) and isdel = ? and appid = ?", this.UserId, this.ReceiveUserId, this.ReceiveUserId, this.UserId, 1, this.Appid).Count()
+	log.Println("数量：", count)
+	data := message.FindUserMsgRes{}
+	if count > 0 {
+		err = orm.Table("message").Select("*").Where("((receive_userid = ? and send_userid = ?) or (receive_userid = ? and send_userid = ?)) and isdel = ? and appid = ?", this.UserId, this.ReceiveUserId, this.ReceiveUserId, this.UserId, 1, this.Appid).
+			Limit(int(this.PageSize), (int(this.OffSet)-1)*int(this.PageSize)).
+			Find(&messages)
+		log.Println("数据：", messages)
+		log.Println("数据：", messages)
+		for _, v := range messages {
+			data.Data = append(data.Data, &message.Messages{
+				Appid:         v.AppId,
+				ReceiveUserId: v.ReceiveUserid,
+				ReceiveName:   v.ReceiveName,
+				SendUserId:    v.SendUserid,
+				SendName:      v.SendName,
+				Createtime:    v.CreateTime.Format("2006-01-02 15:04:05"),
+				Title:         v.Title,
+				MsgType:       int64(v.MsgType),
+				Link:          v.Link,
+				CiteId:        int64(v.CiteId),
+				Content:       v.Content,
+				IsRead:        int64(v.IsRead),
+			})
+		}
+	}
+	data.Count = count
+	if err != nil {
+		data.Code = -1
+		data.Message = "查询失败"
+	} else {
+		data.Code = 1
+		data.Message = "查询成功"
+	}
+	return data
+}