Browse Source

推荐列表

wfz 3 years ago
parent
commit
9775a3c11c

File diff suppressed because it is too large
+ 363 - 273
api/chat/chat.pb.go


+ 9 - 1
api/chat/chat.proto

@@ -19,7 +19,7 @@ service Chat {
   // 查询在线人的列表
   rpc FindOnlinePersonList (common.ListPageAndPersonRequest) returns (common.RecommendPersonListReply);
   // 查询推荐人的列表
-  rpc FindRecommendPersonList (common.ListPageAndPersonRequest) returns (common.RecommendPersonListReply);
+  rpc FindRecommendPersonList (FindRecommendPersonListRequest) returns (common.RecommendPersonListReply);
   // 接待员查询房间列表
   rpc PartnerFindRoomList (PartnerFindRoomListRequest) returns (PartnerFindRoomListReply){};
   // 用户查询房间列表
@@ -39,6 +39,14 @@ service Chat {
   rpc FindRoomCardMsg (FindRoomCardMsgRequest) returns (common.RoomChatMsg){};
 }
 
+message FindRecommendPersonListRequest{
+  string nextId = 1;
+  int64 offset = 2;
+  string personID = 3; // 查询目标的ID
+  string personType = 4; // 类型
+  int64 sex = 5;// 性别(不筛选就是0)
+}
+
 message FindRoomCardMsgRequest{
   string userIdentifyId = 1; // 身份ID
   string partnerIdentifyId = 2; // 身份ID

+ 6 - 6
api/chat/chat_grpc.pb.go

@@ -27,7 +27,7 @@ type ChatClient interface {
 	// 查询在线人的列表
 	FindOnlinePersonList(ctx context.Context, in *common.ListPageAndPersonRequest, opts ...grpc.CallOption) (*common.RecommendPersonListReply, error)
 	// 查询推荐人的列表
-	FindRecommendPersonList(ctx context.Context, in *common.ListPageAndPersonRequest, opts ...grpc.CallOption) (*common.RecommendPersonListReply, error)
+	FindRecommendPersonList(ctx context.Context, in *FindRecommendPersonListRequest, opts ...grpc.CallOption) (*common.RecommendPersonListReply, error)
 	// 接待员查询房间列表
 	PartnerFindRoomList(ctx context.Context, in *PartnerFindRoomListRequest, opts ...grpc.CallOption) (*PartnerFindRoomListReply, error)
 	// 用户查询房间列表
@@ -82,7 +82,7 @@ func (c *chatClient) FindOnlinePersonList(ctx context.Context, in *common.ListPa
 	return out, nil
 }
 
-func (c *chatClient) FindRecommendPersonList(ctx context.Context, in *common.ListPageAndPersonRequest, opts ...grpc.CallOption) (*common.RecommendPersonListReply, error) {
+func (c *chatClient) FindRecommendPersonList(ctx context.Context, in *FindRecommendPersonListRequest, opts ...grpc.CallOption) (*common.RecommendPersonListReply, error) {
 	out := new(common.RecommendPersonListReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindRecommendPersonList", in, out, opts...)
 	if err != nil {
@@ -183,7 +183,7 @@ type ChatServer interface {
 	// 查询在线人的列表
 	FindOnlinePersonList(context.Context, *common.ListPageAndPersonRequest) (*common.RecommendPersonListReply, error)
 	// 查询推荐人的列表
-	FindRecommendPersonList(context.Context, *common.ListPageAndPersonRequest) (*common.RecommendPersonListReply, error)
+	FindRecommendPersonList(context.Context, *FindRecommendPersonListRequest) (*common.RecommendPersonListReply, error)
 	// 接待员查询房间列表
 	PartnerFindRoomList(context.Context, *PartnerFindRoomListRequest) (*PartnerFindRoomListReply, error)
 	// 用户查询房间列表
@@ -217,7 +217,7 @@ func (UnimplementedChatServer) CreateChatRoom(context.Context, *CreateChatRoomPa
 func (UnimplementedChatServer) FindOnlinePersonList(context.Context, *common.ListPageAndPersonRequest) (*common.RecommendPersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindOnlinePersonList not implemented")
 }
-func (UnimplementedChatServer) FindRecommendPersonList(context.Context, *common.ListPageAndPersonRequest) (*common.RecommendPersonListReply, error) {
+func (UnimplementedChatServer) FindRecommendPersonList(context.Context, *FindRecommendPersonListRequest) (*common.RecommendPersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindRecommendPersonList not implemented")
 }
 func (UnimplementedChatServer) PartnerFindRoomList(context.Context, *PartnerFindRoomListRequest) (*PartnerFindRoomListReply, error) {
@@ -315,7 +315,7 @@ func _Chat_FindOnlinePersonList_Handler(srv interface{}, ctx context.Context, de
 }
 
 func _Chat_FindRecommendPersonList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.ListPageAndPersonRequest)
+	in := new(FindRecommendPersonListRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -327,7 +327,7 @@ func _Chat_FindRecommendPersonList_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.chat.Chat/FindRecommendPersonList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).FindRecommendPersonList(ctx, req.(*common.ListPageAndPersonRequest))
+		return srv.(ChatServer).FindRecommendPersonList(ctx, req.(*FindRecommendPersonListRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 89 - 8
api/common/common.pb.go

@@ -4034,7 +4034,7 @@ type RecommendPersonInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PersonID       string   `protobuf:"bytes,1,opt,name=personID,proto3" json:"personID"`              // 查询目标的ID
+	PersonId       string   `protobuf:"bytes,1,opt,name=personId,proto3" json:"personId"`              // 查询目标的ID
 	PersonType     string   `protobuf:"bytes,2,opt,name=personType,proto3" json:"personType"`          // 类型
 	Nickname       string   `protobuf:"bytes,3,opt,name=nickname,proto3" json:"nickname"`              // 昵称
 	AvatarUrl      string   `protobuf:"bytes,4,opt,name=avatarUrl,proto3" json:"avatarUrl"`            // 头像链接
@@ -4082,9 +4082,9 @@ func (*RecommendPersonInfo) Descriptor() ([]byte, []int) {
 	return file_common_proto_rawDescGZIP(), []int{57}
 }
 
-func (x *RecommendPersonInfo) GetPersonID() string {
+func (x *RecommendPersonInfo) GetPersonId() string {
 	if x != nil {
-		return x.PersonID
+		return x.PersonId
 	}
 	return ""
 }
@@ -4180,6 +4180,69 @@ func (x *RecommendPersonInfo) GetIsOnline() bool {
 	return false
 }
 
+type FindRecommendRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Num  int64  `protobuf:"varint,1,opt,name=num,proto3" json:"num"`  // 数量
+	Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type"` // 类型
+	Sex  int64  `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`
+}
+
+func (x *FindRecommendRequest) Reset() {
+	*x = FindRecommendRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[58]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindRecommendRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindRecommendRequest) ProtoMessage() {}
+
+func (x *FindRecommendRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[58]
+	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 FindRecommendRequest.ProtoReflect.Descriptor instead.
+func (*FindRecommendRequest) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{58}
+}
+
+func (x *FindRecommendRequest) GetNum() int64 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
+func (x *FindRecommendRequest) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *FindRecommendRequest) GetSex() int64 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -4653,8 +4716,8 @@ var file_common_proto_rawDesc = []byte{
 	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64,
 	0x22, 0x95, 0x03, 0x0a, 0x13, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x50, 0x65,
 	0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79,
+	0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73,
+	0x6f, 0x6e, 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, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
 	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
@@ -4676,7 +4739,12 @@ var file_common_proto_rawDesc = []byte{
 	0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x0d, 0x20,
 	0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
 	0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08,
-	0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e,
+	0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x4e, 0x0a, 0x14, 0x46, 0x69, 0x6e, 0x64,
+	0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e,
+	0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 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,
@@ -4696,7 +4764,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 58)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 59)
 var file_common_proto_goTypes = []interface{}{
 	(*UserAndPartnerIdentifyIdParam)(nil), // 0: api.common.UserAndPartnerIdentifyIdParam
 	(*UserAndPartnerParam)(nil),           // 1: api.common.UserAndPartnerParam
@@ -4756,6 +4824,7 @@ var file_common_proto_goTypes = []interface{}{
 	(*RoomChatMsg)(nil),                   // 55: api.common.RoomChatMsg
 	(*RecommendPersonListReply)(nil),      // 56: api.common.RecommendPersonListReply
 	(*RecommendPersonInfo)(nil),           // 57: api.common.RecommendPersonInfo
+	(*FindRecommendRequest)(nil),          // 58: api.common.FindRecommendRequest
 }
 var file_common_proto_depIdxs = []int32{
 	29, // 0: api.common.ChatCardInfo.tagList:type_name -> api.common.TagList
@@ -5477,6 +5546,18 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindRecommendRequest); 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{
@@ -5484,7 +5565,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   58,
+			NumMessages:   59,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 7 - 1
api/common/common.proto

@@ -408,7 +408,7 @@ message RecommendPersonListReply{
 }
 
 message RecommendPersonInfo{
-  string personID = 1; // 查询目标的ID
+  string personId = 1; // 查询目标的ID
   string personType = 2; // 类型
   string nickname = 3;// 昵称
   string avatarUrl =4;// 头像链接
@@ -422,4 +422,10 @@ message RecommendPersonInfo{
   string introduceVoice = 12;// 介绍语音
   repeated string tagList = 13;// 标签
   bool isOnline = 14; // 是否在线
+}
+
+message FindRecommendRequest{
+  int64 num = 1;// 数量
+  string type = 2;// 类型
+  int64 sex = 3;
 }

+ 78 - 69
api/partner/partner.pb.go

@@ -920,7 +920,7 @@ var file_partner_proto_rawDesc = []byte{
 	0x03, 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, 0x8e, 0x22, 0x0a,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xeb, 0x22, 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,
@@ -1193,12 +1193,18 @@ var file_partner_proto_rawDesc = []byte{
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2d,
 	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x22, 0x22, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72,
 	0x74, 0x6e, 0x65, 0x72, 0x2f, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 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, 0x75, 0x73, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x5b, 0x0a,
+	0x1a, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x50, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x44, 0x42, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x20, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x63,
+	0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f,
+	0x6e, 0x44, 0x42, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 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 (
@@ -1247,26 +1253,27 @@ var file_partner_proto_goTypes = []interface{}{
 	(*common.RandomNumAndSex)(nil),            // 29: api.common.RandomNumAndSex
 	(*common.ReportChatRequest)(nil),          // 30: api.common.ReportChatRequest
 	(*common.RoomIDRequest)(nil),              // 31: api.common.RoomIDRequest
-	(*common.PersonMsg)(nil),                  // 32: api.common.PersonMsg
-	(*statistics.LookMessageReply)(nil),       // 33: api.statistics.LookMessageReply
-	(*common.AddFriendMessageInfo)(nil),       // 34: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                   // 35: api.common.HomeInfo
-	(*common.LookedAndLikedNum)(nil),          // 36: api.common.LookedAndLikedNum
-	(*statistics.LookAndLikeListReply)(nil),   // 37: api.statistics.LookAndLikeListReply
-	(*common.PersonDBReply)(nil),              // 38: api.common.PersonDBReply
-	(*common.WxConfResponse)(nil),             // 39: api.common.WxConfResponse
-	(*chat.RoomReply)(nil),                    // 40: api.chat.RoomReply
-	(*common.TagListReply)(nil),               // 41: api.common.TagListReply
-	(*common.RecommendPersonListReply)(nil),   // 42: api.common.RecommendPersonListReply
-	(*chat.PartnerFindRoomListReply)(nil),     // 43: api.chat.PartnerFindRoomListReply
-	(*common.ChatRecordListReply)(nil),        // 44: api.common.ChatRecordListReply
-	(*common.ChatRoomMsg)(nil),                // 45: api.common.ChatRoomMsg
-	(*common.IsLike)(nil),                     // 46: api.common.IsLike
-	(*common.MemeList)(nil),                   // 47: api.common.MemeList
-	(*common.ChatTopicList)(nil),              // 48: api.common.ChatTopicList
-	(*common.CommonTextList)(nil),             // 49: api.common.CommonTextList
-	(*common.MemeTitleList)(nil),              // 50: api.common.MemeTitleList
-	(*common.PartnerChatCardInfo)(nil),        // 51: api.common.PartnerChatCardInfo
+	(*common.FindRecommendRequest)(nil),       // 32: api.common.FindRecommendRequest
+	(*common.PersonMsg)(nil),                  // 33: api.common.PersonMsg
+	(*statistics.LookMessageReply)(nil),       // 34: api.statistics.LookMessageReply
+	(*common.AddFriendMessageInfo)(nil),       // 35: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                   // 36: api.common.HomeInfo
+	(*common.LookedAndLikedNum)(nil),          // 37: api.common.LookedAndLikedNum
+	(*statistics.LookAndLikeListReply)(nil),   // 38: api.statistics.LookAndLikeListReply
+	(*common.PersonDBReply)(nil),              // 39: api.common.PersonDBReply
+	(*common.WxConfResponse)(nil),             // 40: api.common.WxConfResponse
+	(*chat.RoomReply)(nil),                    // 41: api.chat.RoomReply
+	(*common.TagListReply)(nil),               // 42: api.common.TagListReply
+	(*common.RecommendPersonListReply)(nil),   // 43: api.common.RecommendPersonListReply
+	(*chat.PartnerFindRoomListReply)(nil),     // 44: api.chat.PartnerFindRoomListReply
+	(*common.ChatRecordListReply)(nil),        // 45: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                // 46: api.common.ChatRoomMsg
+	(*common.IsLike)(nil),                     // 47: api.common.IsLike
+	(*common.MemeList)(nil),                   // 48: api.common.MemeList
+	(*common.ChatTopicList)(nil),              // 49: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),             // 50: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),              // 51: api.common.MemeTitleList
+	(*common.PartnerChatCardInfo)(nil),        // 52: api.common.PartnerChatCardInfo
 }
 var file_partner_proto_depIdxs = []int32{
 	3,  // 0: api.partner.LevelTable.list:type_name -> api.partner.LevelInfo
@@ -1310,48 +1317,50 @@ var file_partner_proto_depIdxs = []int32{
 	31, // 38: api.partner.Partner.PartnerSetBlackChat:input_type -> api.common.RoomIDRequest
 	1,  // 39: api.partner.Partner.PartnerGetAward:input_type -> api.partner.PartnerGetAwardRequest
 	0,  // 40: api.partner.Partner.PartnerUpdateWorkingStatus:input_type -> api.partner.PartnerUpdateWorkingStatusRequest
-	5,  // 41: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
-	7,  // 42: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
-	8,  // 43: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
-	32, // 44: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
-	6,  // 45: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
-	33, // 46: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
-	11, // 47: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
-	11, // 48: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
-	34, // 49: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	11, // 50: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
-	9,  // 51: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
-	35, // 52: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
-	36, // 53: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	37, // 54: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	38, // 55: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
-	39, // 56: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
-	40, // 57: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
-	41, // 58: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
-	42, // 59: api.partner.Partner.FindOnlineList:output_type -> api.common.RecommendPersonListReply
-	43, // 60: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	43, // 61: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	43, // 62: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	44, // 63: api.partner.Partner.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	45, // 64: api.partner.Partner.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	11, // 65: api.partner.Partner.AddPartnerBalance:output_type -> google.protobuf.Empty
-	2,  // 66: api.partner.Partner.GetLevelBalanceTable:output_type -> api.partner.LevelTable
-	46, // 67: api.partner.Partner.GetPartnerIsLike:output_type -> api.common.IsLike
-	47, // 68: api.partner.Partner.FindMemeByType:output_type -> api.common.MemeList
-	48, // 69: api.partner.Partner.FindChatTopic:output_type -> api.common.ChatTopicList
-	49, // 70: api.partner.Partner.RandomMeme:output_type -> api.common.CommonTextList
-	49, // 71: api.partner.Partner.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	50, // 72: api.partner.Partner.FindMemeTitle:output_type -> api.common.MemeTitleList
-	51, // 73: api.partner.Partner.PartnerGetChatCard:output_type -> api.common.PartnerChatCardInfo
-	50, // 74: api.partner.Partner.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	11, // 75: api.partner.Partner.PartnerLike:output_type -> google.protobuf.Empty
-	11, // 76: api.partner.Partner.PartnerUnLike:output_type -> google.protobuf.Empty
-	11, // 77: api.partner.Partner.Report:output_type -> google.protobuf.Empty
-	11, // 78: api.partner.Partner.PartnerSetBlackChat:output_type -> google.protobuf.Empty
-	11, // 79: api.partner.Partner.PartnerGetAward:output_type -> google.protobuf.Empty
-	11, // 80: api.partner.Partner.PartnerUpdateWorkingStatus:output_type -> google.protobuf.Empty
-	41, // [41:81] is the sub-list for method output_type
-	1,  // [1:41] is the sub-list for method input_type
+	32, // 41: api.partner.Partner.FindRecommendPartnerDBList:input_type -> api.common.FindRecommendRequest
+	5,  // 42: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
+	7,  // 43: api.partner.Partner.GetPartnerBalance:output_type -> api.partner.PartnerBalance
+	8,  // 44: api.partner.Partner.GetPartnerDBBalance:output_type -> api.partner.PartnerDBBalance
+	33, // 45: api.partner.Partner.GetPartnerDBMsg:output_type -> api.common.PersonMsg
+	6,  // 46: api.partner.Partner.GetPartnerMessage:output_type -> api.partner.PartnerMessage
+	34, // 47: api.partner.Partner.GetPartnerLookNum:output_type -> api.statistics.LookMessageReply
+	11, // 48: api.partner.Partner.SendPhoneCode:output_type -> google.protobuf.Empty
+	11, // 49: api.partner.Partner.CheckPhoneCode:output_type -> google.protobuf.Empty
+	35, // 50: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	11, // 51: api.partner.Partner.UpdatePartnerInformation:output_type -> google.protobuf.Empty
+	9,  // 52: api.partner.Partner.GetRandomPartnerInfo:output_type -> api.partner.RandomPartnerInfo
+	36, // 53: api.partner.Partner.PartnerGetHomeInfo:output_type -> api.common.HomeInfo
+	37, // 54: api.partner.Partner.PartnerGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	38, // 55: api.partner.Partner.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	39, // 56: api.partner.Partner.FindPartnerDBList:output_type -> api.common.PersonDBReply
+	40, // 57: api.partner.Partner.WxConf:output_type -> api.common.WxConfResponse
+	41, // 58: api.partner.Partner.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
+	42, // 59: api.partner.Partner.FindTagListBySex:output_type -> api.common.TagListReply
+	43, // 60: api.partner.Partner.FindOnlineList:output_type -> api.common.RecommendPersonListReply
+	44, // 61: api.partner.Partner.FindUnReplyRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	44, // 62: api.partner.Partner.FindWithinSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	44, // 63: api.partner.Partner.FindOverSevenDayRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	45, // 64: api.partner.Partner.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	46, // 65: api.partner.Partner.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	11, // 66: api.partner.Partner.AddPartnerBalance:output_type -> google.protobuf.Empty
+	2,  // 67: api.partner.Partner.GetLevelBalanceTable:output_type -> api.partner.LevelTable
+	47, // 68: api.partner.Partner.GetPartnerIsLike:output_type -> api.common.IsLike
+	48, // 69: api.partner.Partner.FindMemeByType:output_type -> api.common.MemeList
+	49, // 70: api.partner.Partner.FindChatTopic:output_type -> api.common.ChatTopicList
+	50, // 71: api.partner.Partner.RandomMeme:output_type -> api.common.CommonTextList
+	50, // 72: api.partner.Partner.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	51, // 73: api.partner.Partner.FindMemeTitle:output_type -> api.common.MemeTitleList
+	52, // 74: api.partner.Partner.PartnerGetChatCard:output_type -> api.common.PartnerChatCardInfo
+	51, // 75: api.partner.Partner.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	11, // 76: api.partner.Partner.PartnerLike:output_type -> google.protobuf.Empty
+	11, // 77: api.partner.Partner.PartnerUnLike:output_type -> google.protobuf.Empty
+	11, // 78: api.partner.Partner.Report:output_type -> google.protobuf.Empty
+	11, // 79: api.partner.Partner.PartnerSetBlackChat:output_type -> google.protobuf.Empty
+	11, // 80: api.partner.Partner.PartnerGetAward:output_type -> google.protobuf.Empty
+	11, // 81: api.partner.Partner.PartnerUpdateWorkingStatus:output_type -> google.protobuf.Empty
+	39, // 82: api.partner.Partner.FindRecommendPartnerDBList:output_type -> api.common.PersonDBReply
+	42, // [42:83] is the sub-list for method output_type
+	1,  // [1:42] 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

+ 2 - 0
api/partner/partner.proto

@@ -261,6 +261,8 @@ service Partner {
       body:"*"
     };
   };
+  // 查询推荐用户的数据
+  rpc FindRecommendPartnerDBList (common.FindRecommendRequest) returns (common.PersonDBReply){};
 }
 message PartnerUpdateWorkingStatusRequest{
   string workingStatus = 1;// 工作状态

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

@@ -99,6 +99,8 @@ type PartnerClient interface {
 	PartnerGetAward(ctx context.Context, in *PartnerGetAwardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 接待员更新工作状态
 	PartnerUpdateWorkingStatus(ctx context.Context, in *PartnerUpdateWorkingStatusRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 查询推荐用户的数据
+	FindRecommendPartnerDBList(ctx context.Context, in *common.FindRecommendRequest, opts ...grpc.CallOption) (*common.PersonDBReply, error)
 }
 
 type partnerClient struct {
@@ -469,6 +471,15 @@ func (c *partnerClient) PartnerUpdateWorkingStatus(ctx context.Context, in *Part
 	return out, nil
 }
 
+func (c *partnerClient) FindRecommendPartnerDBList(ctx context.Context, in *common.FindRecommendRequest, opts ...grpc.CallOption) (*common.PersonDBReply, error) {
+	out := new(common.PersonDBReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/FindRecommendPartnerDBList", 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
@@ -550,6 +561,8 @@ type PartnerServer interface {
 	PartnerGetAward(context.Context, *PartnerGetAwardRequest) (*emptypb.Empty, error)
 	// 接待员更新工作状态
 	PartnerUpdateWorkingStatus(context.Context, *PartnerUpdateWorkingStatusRequest) (*emptypb.Empty, error)
+	// 查询推荐用户的数据
+	FindRecommendPartnerDBList(context.Context, *common.FindRecommendRequest) (*common.PersonDBReply, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -677,6 +690,9 @@ func (UnimplementedPartnerServer) PartnerGetAward(context.Context, *PartnerGetAw
 func (UnimplementedPartnerServer) PartnerUpdateWorkingStatus(context.Context, *PartnerUpdateWorkingStatusRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerUpdateWorkingStatus not implemented")
 }
+func (UnimplementedPartnerServer) FindRecommendPartnerDBList(context.Context, *common.FindRecommendRequest) (*common.PersonDBReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindRecommendPartnerDBList not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -1410,6 +1426,24 @@ func _Partner_PartnerUpdateWorkingStatus_Handler(srv interface{}, ctx context.Co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_FindRecommendPartnerDBList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindRecommendRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).FindRecommendPartnerDBList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/FindRecommendPartnerDBList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).FindRecommendPartnerDBList(ctx, req.(*common.FindRecommendRequest))
+	}
+	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)
@@ -1577,6 +1611,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PartnerUpdateWorkingStatus",
 			Handler:    _Partner_PartnerUpdateWorkingStatus_Handler,
 		},
+		{
+			MethodName: "FindRecommendPartnerDBList",
+			Handler:    _Partner_FindRecommendPartnerDBList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 82 - 73
api/user/user.pb.go

@@ -1255,7 +1255,7 @@ var file_user_proto_rawDesc = []byte{
 	0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
 	0x73, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x61, 0x79, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b,
 	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0xe5, 0x24,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0xbf, 0x25,
 	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,
@@ -1550,11 +1550,17 @@ var file_user_proto_rawDesc = []byte{
 	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
 	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15,
 	0x22, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 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,
+	0x72, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x58, 0x0a, 0x17, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x63,
+	0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x44, 0x42, 0x4c, 0x69, 0x73, 0x74,
+	0x12, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69,
+	0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x44, 0x42, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 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 (
@@ -1608,27 +1614,28 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.RandomNumAndSex)(nil),                   // 34: api.common.RandomNumAndSex
 	(*common.RoomIDRequest)(nil),                     // 35: api.common.RoomIDRequest
 	(*common.ReportChatRequest)(nil),                 // 36: api.common.ReportChatRequest
-	(*common.PersonMsg)(nil),                         // 37: api.common.PersonMsg
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 38: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.RoomReply)(nil),                           // 39: api.chat.RoomReply
-	(*common.AddFriendMessageInfo)(nil),              // 40: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                          // 41: api.common.HomeInfo
-	(*common.PersonDBReply)(nil),                     // 42: api.common.PersonDBReply
-	(*statistics.LookAndLikeListReply)(nil),          // 43: api.statistics.LookAndLikeListReply
-	(*statistics.LookAndLikeMessageReply)(nil),       // 44: api.statistics.LookAndLikeMessageReply
-	(*common.WxConfResponse)(nil),                    // 45: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                      // 46: api.common.TagListReply
-	(*common.RecommendPersonListReply)(nil),          // 47: api.common.RecommendPersonListReply
-	(*common.LookedAndLikedNum)(nil),                 // 48: api.common.LookedAndLikedNum
-	(*statistics.LookMessageReply)(nil),              // 49: api.statistics.LookMessageReply
-	(*common.ChatRecordListReply)(nil),               // 50: api.common.ChatRecordListReply
-	(*common.ChatRoomMsg)(nil),                       // 51: api.common.ChatRoomMsg
-	(*common.IsLike)(nil),                            // 52: api.common.IsLike
-	(*common.ChatCardInfo)(nil),                      // 53: api.common.ChatCardInfo
-	(*common.MemeList)(nil),                          // 54: api.common.MemeList
-	(*common.ChatTopicList)(nil),                     // 55: api.common.ChatTopicList
-	(*common.CommonTextList)(nil),                    // 56: api.common.CommonTextList
-	(*common.MemeTitleList)(nil),                     // 57: api.common.MemeTitleList
+	(*common.FindRecommendRequest)(nil),              // 37: api.common.FindRecommendRequest
+	(*common.PersonMsg)(nil),                         // 38: api.common.PersonMsg
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 39: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.RoomReply)(nil),                           // 40: api.chat.RoomReply
+	(*common.AddFriendMessageInfo)(nil),              // 41: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                          // 42: api.common.HomeInfo
+	(*common.PersonDBReply)(nil),                     // 43: api.common.PersonDBReply
+	(*statistics.LookAndLikeListReply)(nil),          // 44: api.statistics.LookAndLikeListReply
+	(*statistics.LookAndLikeMessageReply)(nil),       // 45: api.statistics.LookAndLikeMessageReply
+	(*common.WxConfResponse)(nil),                    // 46: api.common.WxConfResponse
+	(*common.TagListReply)(nil),                      // 47: api.common.TagListReply
+	(*common.RecommendPersonListReply)(nil),          // 48: api.common.RecommendPersonListReply
+	(*common.LookedAndLikedNum)(nil),                 // 49: api.common.LookedAndLikedNum
+	(*statistics.LookMessageReply)(nil),              // 50: api.statistics.LookMessageReply
+	(*common.ChatRecordListReply)(nil),               // 51: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                       // 52: api.common.ChatRoomMsg
+	(*common.IsLike)(nil),                            // 53: api.common.IsLike
+	(*common.ChatCardInfo)(nil),                      // 54: api.common.ChatCardInfo
+	(*common.MemeList)(nil),                          // 55: api.common.MemeList
+	(*common.ChatTopicList)(nil),                     // 56: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),                    // 57: api.common.CommonTextList
+	(*common.MemeTitleList)(nil),                     // 58: api.common.MemeTitleList
 }
 var file_user_proto_depIdxs = []int32{
 	2,  // 0: api.user.RechargeList.list:type_name -> api.user.RechargeInfo
@@ -1679,52 +1686,54 @@ var file_user_proto_depIdxs = []int32{
 	17, // 45: api.user.User.FindRechargeList:input_type -> google.protobuf.Empty
 	13, // 46: api.user.User.FindPayList:input_type -> api.user.FindPayOrderListRequest
 	36, // 47: api.user.User.Report:input_type -> api.common.ReportChatRequest
-	17, // 48: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	7,  // 49: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	37, // 50: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	17, // 51: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	17, // 52: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	38, // 53: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	39, // 54: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
-	40, // 55: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	41, // 56: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	42, // 57: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	43, // 58: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	43, // 59: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	43, // 60: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	44, // 61: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	45, // 62: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	46, // 63: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	47, // 64: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
-	5,  // 65: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	5,  // 66: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	48, // 67: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	4,  // 68: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	49, // 69: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	50, // 70: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	51, // 71: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	52, // 72: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
-	17, // 73: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
-	3,  // 74: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
-	17, // 75: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
-	53, // 76: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
-	17, // 77: api.user.User.UserLike:output_type -> google.protobuf.Empty
-	17, // 78: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
-	17, // 79: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
-	17, // 80: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
-	54, // 81: api.user.User.FindMemeByType:output_type -> api.common.MemeList
-	55, // 82: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
-	56, // 83: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
-	56, // 84: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	57, // 85: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
-	17, // 86: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
-	57, // 87: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	10, // 88: api.user.User.UserRecharge:output_type -> api.user.PayInfo
-	1,  // 89: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
-	12, // 90: api.user.User.FindPayList:output_type -> api.user.PayOrderList
-	17, // 91: api.user.User.Report:output_type -> google.protobuf.Empty
-	48, // [48:92] is the sub-list for method output_type
-	4,  // [4:48] is the sub-list for method input_type
+	37, // 48: api.user.User.FindRecommendUserDBList:input_type -> api.common.FindRecommendRequest
+	17, // 49: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	7,  // 50: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	38, // 51: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	17, // 52: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	17, // 53: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	39, // 54: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	40, // 55: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
+	41, // 56: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	42, // 57: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	43, // 58: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	44, // 59: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	44, // 60: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	44, // 61: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	45, // 62: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	46, // 63: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	47, // 64: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	48, // 65: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
+	5,  // 66: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	5,  // 67: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	49, // 68: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	4,  // 69: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	50, // 70: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	51, // 71: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	52, // 72: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	53, // 73: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
+	17, // 74: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
+	3,  // 75: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
+	17, // 76: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
+	54, // 77: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
+	17, // 78: api.user.User.UserLike:output_type -> google.protobuf.Empty
+	17, // 79: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
+	17, // 80: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
+	17, // 81: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
+	55, // 82: api.user.User.FindMemeByType:output_type -> api.common.MemeList
+	56, // 83: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
+	57, // 84: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
+	57, // 85: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	58, // 86: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
+	17, // 87: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
+	58, // 88: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	10, // 89: api.user.User.UserRecharge:output_type -> api.user.PayInfo
+	1,  // 90: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
+	12, // 91: api.user.User.FindPayList:output_type -> api.user.PayOrderList
+	17, // 92: api.user.User.Report:output_type -> google.protobuf.Empty
+	43, // 93: api.user.User.FindRecommendUserDBList:output_type -> api.common.PersonDBReply
+	49, // [49:94] is the sub-list for method output_type
+	4,  // [4:49] is the sub-list for method input_type
 	4,  // [4:4] is the sub-list for extension type_name
 	4,  // [4:4] is the sub-list for extension extendee
 	0,  // [0:4] is the sub-list for field type_name

+ 2 - 0
api/user/user.proto

@@ -308,6 +308,8 @@ service User {
       body:"*"
     };
   };
+  // 查询推荐用户的数据
+  rpc FindRecommendUserDBList (common.FindRecommendRequest) returns (common.PersonDBReply){};
 }
 
 message UserRechargeRequest{

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

@@ -109,6 +109,8 @@ type UserClient interface {
 	FindPayList(ctx context.Context, in *FindPayOrderListRequest, opts ...grpc.CallOption) (*PayOrderList, error)
 	// 举报某人
 	Report(ctx context.Context, in *common.ReportChatRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 查询推荐用户的数据
+	FindRecommendUserDBList(ctx context.Context, in *common.FindRecommendRequest, opts ...grpc.CallOption) (*common.PersonDBReply, error)
 }
 
 type userClient struct {
@@ -515,6 +517,15 @@ func (c *userClient) Report(ctx context.Context, in *common.ReportChatRequest, o
 	return out, nil
 }
 
+func (c *userClient) FindRecommendUserDBList(ctx context.Context, in *common.FindRecommendRequest, opts ...grpc.CallOption) (*common.PersonDBReply, error) {
+	out := new(common.PersonDBReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindRecommendUserDBList", 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
@@ -606,6 +617,8 @@ type UserServer interface {
 	FindPayList(context.Context, *FindPayOrderListRequest) (*PayOrderList, error)
 	// 举报某人
 	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
+	// 查询推荐用户的数据
+	FindRecommendUserDBList(context.Context, *common.FindRecommendRequest) (*common.PersonDBReply, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -745,6 +758,9 @@ func (UnimplementedUserServer) FindPayList(context.Context, *FindPayOrderListReq
 func (UnimplementedUserServer) Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Report not implemented")
 }
+func (UnimplementedUserServer) FindRecommendUserDBList(context.Context, *common.FindRecommendRequest) (*common.PersonDBReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindRecommendUserDBList not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -1550,6 +1566,24 @@ func _User_Report_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_FindRecommendUserDBList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.FindRecommendRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindRecommendUserDBList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindRecommendUserDBList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindRecommendUserDBList(ctx, req.(*common.FindRecommendRequest))
+	}
+	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)
@@ -1733,6 +1767,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "Report",
 			Handler:    _User_Report_Handler,
 		},
+		{
+			MethodName: "FindRecommendUserDBList",
+			Handler:    _User_FindRecommendUserDBList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

+ 5 - 0
define/user.go

@@ -13,3 +13,8 @@ var (
 var (
 	PayTypeRecharge = "recharge"
 )
+
+var (
+	ExcellentUser = "excellentUser" // 优质用户
+	CommonUser    = "commonUser"    // 普通用户
+)

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

@@ -1,3 +1,13 @@
+export interface FindRecommendPersonListRequest{
+    nextId?:string;
+    offset?:number;
+    /**  查询目标的ID */
+    personID?:string;
+    /**  类型 */
+    personType?:string;
+    /**  性别(不筛选就是0) */
+    sex?:number;
+}
 export interface FindRoomCardMsgRequest{
     /**  身份ID */
     userIdentifyId?:string;

+ 8 - 1
js/api/common/common_pb.ts

@@ -521,7 +521,7 @@ export interface RecommendPersonListReply{
 }
 export interface RecommendPersonInfo{
     /**  查询目标的ID */
-    personID?:string;
+    personId?:string;
     /**  类型 */
     personType?:string;
     /**  昵称 */
@@ -549,4 +549,11 @@ export interface RecommendPersonInfo{
     /**  是否在线 */
     isOnline?:boolean;
 }
+export interface FindRecommendRequest{
+    /**  数量 */
+    num?:number;
+    /**  类型 */
+    type?:string;
+    sex?:number;
+}
 

+ 1 - 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,AddPartnerBalanceRequest,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest} from "./partner_pb";
-import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,CreateChatRoomParam,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,RoomIDRequest} from "../common/common_pb";
+import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,CreateChatRoomParam,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,RoomIDRequest,FindRecommendRequest} from "../common/common_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
 import {RoomReply,PartnerFindRoomListReply} from "../chat/chat_pb";
 

+ 1 - 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,CreateChatRoomParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest,ReportChatRequest} from "../common/common_pb";
+import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,CreateChatRoomParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest,ReportChatRequest,FindRecommendRequest} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

Some files were not shown because too many files changed in this diff