Quellcode durchsuchen

获取聊天的信息

wfz vor 3 Jahren
Ursprung
Commit
0bc68e6d69

+ 1 - 1
api/common/common.pb.go

@@ -1348,7 +1348,7 @@ type ListPageAndSexRequest struct {
 
 	NextId int64 `protobuf:"varint,1,opt,name=nextId,proto3" json:"nextId"`
 	Offset int64 `protobuf:"varint,2,opt,name=offset,proto3" json:"offset"`
-	Sex    int64 `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"`
+	Sex    int64 `protobuf:"varint,3,opt,name=sex,proto3" json:"sex"` // 对方的性别
 }
 
 func (x *ListPageAndSexRequest) Reset() {

+ 1 - 1
api/common/common.proto

@@ -148,7 +148,7 @@ message ListPageRequest{
 message ListPageAndSexRequest{
   int64 nextId = 1;
   int64 offset = 2;
-  int64 sex = 3;
+  int64 sex = 3;// 对方的性别
 }
 
 

+ 100 - 58
api/user/user.pb.go

@@ -737,7 +737,7 @@ var file_user_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65,
 	0x72, 0x49, 0x64, 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, 0xd4, 0x1b, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15,
+	0x6b, 0x65, 0x79, 0x32, 0x89, 0x1f, 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, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
@@ -958,12 +958,39 @@ var file_user_proto_rawDesc = []byte{
 	0x75, 0x63, 0x65, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x12, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x50, 0x61, 0x72,
 	0x61, 0x6d, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 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,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x64, 0x0a, 0x0e, 0x46, 0x69,
+	0x6e, 0x64, 0x4d, 0x65, 0x6d, 0x65, 0x42, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x66,
+	0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d, 0x65, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x01, 0x2a,
+	0x12, 0x6e, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69,
+	0x63, 0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c,
+	0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x22,
+	0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x22, 0x14, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
+	0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x3a, 0x01, 0x2a,
+	0x12, 0x66, 0x0a, 0x0a, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4d, 0x65, 0x6d, 0x65, 0x12, 0x15,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e, 0x64,
+	0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73,
+	0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x75, 0x73, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f, 0x6d, 0x65, 0x6d, 0x65, 0x2f, 0x72,
+	0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x3a, 0x01, 0x2a, 0x12, 0x75, 0x0a, 0x12, 0x52, 0x61, 0x6e, 0x64,
+	0x6f, 0x6d, 0x53, 0x77, 0x69, 0x66, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1b,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e, 0x64,
+	0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x1a, 0x1a, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54,
+	0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x22,
+	0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x66, 0x69, 0x6e, 0x64, 0x2f,
+	0x74, 0x6f, 0x70, 0x69, 0x63, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 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,
 }
 
 var (
@@ -1002,22 +1029,29 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.ListPage2Request)(nil),                  // 19: api.common.ListPage2Request
 	(*common.FindChatRecordListRequest)(nil),         // 20: api.common.FindChatRecordListRequest
 	(*common.FindChatRoomMsgRequest)(nil),            // 21: api.common.FindChatRoomMsgRequest
-	(*common.PersonMsg)(nil),                         // 22: api.common.PersonMsg
-	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 23: api.chat.CheckUserPartnerIsRelationshipReply
-	(*chat.RoomReply)(nil),                           // 24: api.chat.RoomReply
-	(*common.AddFriendMessageInfo)(nil),              // 25: api.common.AddFriendMessageInfo
-	(*common.HomeInfo)(nil),                          // 26: api.common.HomeInfo
-	(*common.PersonDBReply)(nil),                     // 27: api.common.PersonDBReply
-	(*statistics.LookAndLikeListReply)(nil),          // 28: api.statistics.LookAndLikeListReply
-	(*statistics.LookAndLikeMessageReply)(nil),       // 29: api.statistics.LookAndLikeMessageReply
-	(*common.WxConfResponse)(nil),                    // 30: api.common.WxConfResponse
-	(*common.TagListReply)(nil),                      // 31: api.common.TagListReply
-	(*common.OnlinePersonListReply)(nil),             // 32: api.common.OnlinePersonListReply
-	(*common.LookedAndLikedNum)(nil),                 // 33: api.common.LookedAndLikedNum
-	(*statistics.LookMessageReply)(nil),              // 34: api.statistics.LookMessageReply
-	(*common.ChatRecordListReply)(nil),               // 35: api.common.ChatRecordListReply
-	(*common.ChatRoomMsg)(nil),                       // 36: api.common.ChatRoomMsg
-	(*common.IsLike)(nil),                            // 37: api.common.IsLike
+	(*common.MemeRequest)(nil),                       // 22: api.common.MemeRequest
+	(*common.ListPageAndSexRequest)(nil),             // 23: api.common.ListPageAndSexRequest
+	(*common.RandomNum)(nil),                         // 24: api.common.RandomNum
+	(*common.RandomNumAndSex)(nil),                   // 25: api.common.RandomNumAndSex
+	(*common.PersonMsg)(nil),                         // 26: api.common.PersonMsg
+	(*chat.CheckUserPartnerIsRelationshipReply)(nil), // 27: api.chat.CheckUserPartnerIsRelationshipReply
+	(*chat.RoomReply)(nil),                           // 28: api.chat.RoomReply
+	(*common.AddFriendMessageInfo)(nil),              // 29: api.common.AddFriendMessageInfo
+	(*common.HomeInfo)(nil),                          // 30: api.common.HomeInfo
+	(*common.PersonDBReply)(nil),                     // 31: api.common.PersonDBReply
+	(*statistics.LookAndLikeListReply)(nil),          // 32: api.statistics.LookAndLikeListReply
+	(*statistics.LookAndLikeMessageReply)(nil),       // 33: api.statistics.LookAndLikeMessageReply
+	(*common.WxConfResponse)(nil),                    // 34: api.common.WxConfResponse
+	(*common.TagListReply)(nil),                      // 35: api.common.TagListReply
+	(*common.OnlinePersonListReply)(nil),             // 36: api.common.OnlinePersonListReply
+	(*common.LookedAndLikedNum)(nil),                 // 37: api.common.LookedAndLikedNum
+	(*statistics.LookMessageReply)(nil),              // 38: api.statistics.LookMessageReply
+	(*common.ChatRecordListReply)(nil),               // 39: api.common.ChatRecordListReply
+	(*common.ChatRoomMsg)(nil),                       // 40: api.common.ChatRoomMsg
+	(*common.IsLike)(nil),                            // 41: api.common.IsLike
+	(*common.MemeList)(nil),                          // 42: api.common.MemeList
+	(*common.ChatTopicList)(nil),                     // 43: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),                    // 44: api.common.CommonTextList
 }
 var file_user_proto_depIdxs = []int32{
 	7,  // 0: api.user.ChatCardInfo.tagList:type_name -> api.common.TagList
@@ -1055,41 +1089,49 @@ var file_user_proto_depIdxs = []int32{
 	14, // 32: api.user.User.UserUnLike:input_type -> api.common.PersonParam
 	14, // 33: api.user.User.UnlockLookRecord:input_type -> api.common.PersonParam
 	14, // 34: api.user.User.SendMsgReduceCredit:input_type -> api.common.PersonParam
-	9,  // 35: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	5,  // 36: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	22, // 37: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	9,  // 38: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	9,  // 39: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	23, // 40: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	24, // 41: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
-	25, // 42: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	26, // 43: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	27, // 44: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	28, // 45: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	28, // 46: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	28, // 47: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	29, // 48: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	30, // 49: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	31, // 50: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	32, // 51: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
-	3,  // 52: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	3,  // 53: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	33, // 54: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	2,  // 55: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	34, // 56: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	35, // 57: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	36, // 58: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	37, // 59: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
-	9,  // 60: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
-	1,  // 61: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
-	9,  // 62: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
-	0,  // 63: api.user.User.UserGetChatCard:output_type -> api.user.ChatCardInfo
-	9,  // 64: api.user.User.UserLike:output_type -> google.protobuf.Empty
-	9,  // 65: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
-	9,  // 66: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
-	9,  // 67: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
-	35, // [35:68] is the sub-list for method output_type
-	2,  // [2:35] is the sub-list for method input_type
+	22, // 35: api.user.User.FindMemeByType:input_type -> api.common.MemeRequest
+	23, // 36: api.user.User.FindChatTopic:input_type -> api.common.ListPageAndSexRequest
+	24, // 37: api.user.User.RandomMeme:input_type -> api.common.RandomNum
+	25, // 38: api.user.User.RandomSwiftMessage:input_type -> api.common.RandomNumAndSex
+	9,  // 39: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	5,  // 40: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	26, // 41: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	9,  // 42: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	9,  // 43: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	27, // 44: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	28, // 45: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
+	29, // 46: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	30, // 47: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	31, // 48: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	32, // 49: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	32, // 50: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	32, // 51: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	33, // 52: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	34, // 53: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	35, // 54: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	36, // 55: api.user.User.FindOnlineList:output_type -> api.common.OnlinePersonListReply
+	3,  // 56: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	3,  // 57: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	37, // 58: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	2,  // 59: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	38, // 60: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	39, // 61: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	40, // 62: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	41, // 63: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
+	9,  // 64: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
+	1,  // 65: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
+	9,  // 66: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
+	0,  // 67: api.user.User.UserGetChatCard:output_type -> api.user.ChatCardInfo
+	9,  // 68: api.user.User.UserLike:output_type -> google.protobuf.Empty
+	9,  // 69: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
+	9,  // 70: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
+	9,  // 71: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
+	42, // 72: api.user.User.FindMemeByType:output_type -> api.common.MemeList
+	43, // 73: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
+	44, // 74: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
+	44, // 75: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	39, // [39:76] is the sub-list for method output_type
+	2,  // [2:39] 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

+ 29 - 0
api/user/user.proto

@@ -229,6 +229,35 @@ service User {
     };
   };
   rpc SendMsgReduceCredit (common.PersonParam) returns (google.protobuf.Empty);
+
+  // 通过类型获取表情包列表
+  rpc FindMemeByType (common.MemeRequest) returns (common.MemeList){
+    option (google.api.http) = {
+      post: "/api/user/find/meme/type",
+      body:"*"
+    };
+  };
+  // 获取对方性别的聊天话题
+  rpc FindChatTopic (common.ListPageAndSexRequest) returns (common.ChatTopicList){
+    option (google.api.http) = {
+      post: "/api/user/find/topic",
+      body:"*"
+    };
+  };
+  // 随机表情包
+  rpc RandomMeme (common.RandomNum) returns (common.CommonTextList){
+    option (google.api.http) = {
+      post: "/api/user/find/meme/random",
+      body:"*"
+    };
+  };
+  // 随机打招呼
+  rpc RandomSwiftMessage (common.RandomNumAndSex) returns (common.CommonTextList){
+    option (google.api.http) = {
+      post: "/api/user/find/topic/random",
+      body:"*"
+    };
+  };
 }
 
 message ChatCardInfo{

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

@@ -87,6 +87,14 @@ type UserClient interface {
 	// 解锁"看过我的"的记录
 	UnlockLookRecord(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	SendMsgReduceCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 通过类型获取表情包列表
+	FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error)
+	// 获取对方性别的聊天话题
+	FindChatTopic(ctx context.Context, in *common.ListPageAndSexRequest, opts ...grpc.CallOption) (*common.ChatTopicList, error)
+	// 随机表情包
+	RandomMeme(ctx context.Context, in *common.RandomNum, opts ...grpc.CallOption) (*common.CommonTextList, error)
+	// 随机打招呼
+	RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error)
 }
 
 type userClient struct {
@@ -394,6 +402,42 @@ func (c *userClient) SendMsgReduceCredit(ctx context.Context, in *common.PersonP
 	return out, nil
 }
 
+func (c *userClient) FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error) {
+	out := new(common.MemeList)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindMemeByType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) FindChatTopic(ctx context.Context, in *common.ListPageAndSexRequest, opts ...grpc.CallOption) (*common.ChatTopicList, error) {
+	out := new(common.ChatTopicList)
+	err := c.cc.Invoke(ctx, "/api.user.User/FindChatTopic", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...grpc.CallOption) (*common.CommonTextList, error) {
+	out := new(common.CommonTextList)
+	err := c.cc.Invoke(ctx, "/api.user.User/RandomMeme", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error) {
+	out := new(common.CommonTextList)
+	err := c.cc.Invoke(ctx, "/api.user.User/RandomSwiftMessage", 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
@@ -463,6 +507,14 @@ type UserServer interface {
 	// 解锁"看过我的"的记录
 	UnlockLookRecord(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error)
+	// 通过类型获取表情包列表
+	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
+	// 获取对方性别的聊天话题
+	FindChatTopic(context.Context, *common.ListPageAndSexRequest) (*common.ChatTopicList, error)
+	// 随机表情包
+	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
+	// 随机打招呼
+	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -569,6 +621,18 @@ func (UnimplementedUserServer) UnlockLookRecord(context.Context, *common.PersonP
 func (UnimplementedUserServer) SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendMsgReduceCredit not implemented")
 }
+func (UnimplementedUserServer) FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindMemeByType not implemented")
+}
+func (UnimplementedUserServer) FindChatTopic(context.Context, *common.ListPageAndSexRequest) (*common.ChatTopicList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatTopic not implemented")
+}
+func (UnimplementedUserServer) RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RandomMeme not implemented")
+}
+func (UnimplementedUserServer) RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RandomSwiftMessage not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -1176,6 +1240,78 @@ func _User_SendMsgReduceCredit_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_FindMemeByType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.MemeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindMemeByType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindMemeByType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindMemeByType(ctx, req.(*common.MemeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_FindChatTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageAndSexRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).FindChatTopic(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/FindChatTopic",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).FindChatTopic(ctx, req.(*common.ListPageAndSexRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_RandomMeme_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RandomNum)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).RandomMeme(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/RandomMeme",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).RandomMeme(ctx, req.(*common.RandomNum))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_RandomSwiftMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RandomNumAndSex)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).RandomSwiftMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/RandomSwiftMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).RandomSwiftMessage(ctx, req.(*common.RandomNumAndSex))
+	}
+	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)
@@ -1315,6 +1451,22 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendMsgReduceCredit",
 			Handler:    _User_SendMsgReduceCredit_Handler,
 		},
+		{
+			MethodName: "FindMemeByType",
+			Handler:    _User_FindMemeByType_Handler,
+		},
+		{
+			MethodName: "FindChatTopic",
+			Handler:    _User_FindChatTopic_Handler,
+		},
+		{
+			MethodName: "RandomMeme",
+			Handler:    _User_RandomMeme_Handler,
+		},
+		{
+			MethodName: "RandomSwiftMessage",
+			Handler:    _User_RandomSwiftMessage_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

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

@@ -35,9 +35,11 @@ type UserHTTPServer interface {
 	CreateUserPersonRoom(context.Context, *common.PersonParam) (*chat.RoomReply, error)
 	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
 	FindChatRoomMsg(context.Context, *common.FindChatRoomMsgRequest) (*common.ChatRoomMsg, error)
+	FindChatTopic(context.Context, *common.ListPageAndSexRequest) (*common.ChatTopicList, 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)
+	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
 	FindOnlineList(context.Context, *common.ListPage2Request) (*common.OnlinePersonListReply, error)
 	FindOverSevenDayRoomList(context.Context, *common.ListPageRequest) (*UserFindChatListReply, error)
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
@@ -48,6 +50,8 @@ type UserHTTPServer interface {
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
 	GetUserIsLike(context.Context, *common.PersonParam) (*common.IsLike, error)
 	GetUserLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
+	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
+	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	SendPhoneCode(context.Context, *common.SendPhoneCodeRequest) (*emptypb.Empty, error)
 	UnlockLookRecord(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	UpdateUserInformation(context.Context, *common.UpdateInformationRequest) (*emptypb.Empty, error)
@@ -94,6 +98,10 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/like", _User_UserLike0_HTTP_Handler(srv))
 	r.POST("/api/user/unlike", _User_UserUnLike0_HTTP_Handler(srv))
 	r.POST("/api/user/look/unlock", _User_UnlockLookRecord0_HTTP_Handler(srv))
+	r.POST("/api/user/find/meme/type", _User_FindMemeByType0_HTTP_Handler(srv))
+	r.POST("/api/user/find/topic", _User_FindChatTopic0_HTTP_Handler(srv))
+	r.POST("/api/user/find/meme/random", _User_RandomMeme0_HTTP_Handler(srv))
+	r.POST("/api/user/find/topic/random", _User_RandomSwiftMessage0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -906,15 +914,125 @@ func _User_UnlockLookRecord0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Cont
 	}
 }
 
+func _User_FindMemeByType0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.MemeRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/FindMemeByType")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindMemeByType(ctx, req.(*common.MemeRequest))
+		})
+		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_FindChatTopic0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.ListPageAndSexRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/FindChatTopic")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.FindChatTopic(ctx, req.(*common.ListPageAndSexRequest))
+		})
+		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_RandomMeme0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.RandomNum
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/RandomMeme")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.RandomMeme(ctx, req.(*common.RandomNum))
+		})
+		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_RandomSwiftMessage0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.RandomNumAndSex
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/RandomSwiftMessage")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.RandomSwiftMessage(ctx, req.(*common.RandomNumAndSex))
+		})
+		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)
 	CreateUserPersonRoom(ctx context.Context, req *common.PersonParam, 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)
+	FindChatTopic(ctx context.Context, req *common.ListPageAndSexRequest, opts ...http.CallOption) (rsp *common.ChatTopicList, 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)
+	FindMemeByType(ctx context.Context, req *common.MemeRequest, opts ...http.CallOption) (rsp *common.MemeList, 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 *UserFindChatListReply, err error)
 	FindTagListBySex(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.TagListReply, err error)
@@ -925,6 +1043,8 @@ type UserHTTPClient interface {
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
 	GetUserIsLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.IsLike, err error)
 	GetUserLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
+	RandomMeme(ctx context.Context, req *common.RandomNum, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
+	RandomSwiftMessage(ctx context.Context, req *common.RandomNumAndSex, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
 	SendPhoneCode(ctx context.Context, req *common.SendPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UnlockLookRecord(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UpdateUserInformation(ctx context.Context, req *common.UpdateInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1012,6 +1132,19 @@ func (c *UserHTTPClientImpl) FindChatRoomMsg(ctx context.Context, in *common.Fin
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) FindChatTopic(ctx context.Context, in *common.ListPageAndSexRequest, opts ...http.CallOption) (*common.ChatTopicList, error) {
+	var out common.ChatTopicList
+	pattern := "/api/user/find/topic"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/FindChatTopic"))
+	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"
@@ -1051,6 +1184,19 @@ func (c *UserHTTPClientImpl) FindLookList(ctx context.Context, in *common.ListPa
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...http.CallOption) (*common.MemeList, error) {
+	var out common.MemeList
+	pattern := "/api/user/find/meme/type"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/FindMemeByType"))
+	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) FindOnlineList(ctx context.Context, in *common.ListPage2Request, opts ...http.CallOption) (*common.OnlinePersonListReply, error) {
 	var out common.OnlinePersonListReply
 	pattern := "/api/user/list/online"
@@ -1181,6 +1327,32 @@ func (c *UserHTTPClientImpl) GetUserLookNum(ctx context.Context, in *emptypb.Emp
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...http.CallOption) (*common.CommonTextList, error) {
+	var out common.CommonTextList
+	pattern := "/api/user/find/meme/random"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/RandomMeme"))
+	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) RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...http.CallOption) (*common.CommonTextList, error) {
+	var out common.CommonTextList
+	pattern := "/api/user/find/topic/random"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/RandomSwiftMessage"))
+	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) SendPhoneCode(ctx context.Context, in *common.SendPhoneCodeRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/user/code/send"

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

@@ -185,6 +185,7 @@ export interface ListPageRequest{
 export interface ListPageAndSexRequest{
     nextId?:number;
     offset?:number;
+    /**  对方的性别 */
     sex?:number;
 }
 export interface ListPage2Request{

+ 21 - 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,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike} from "../common/common_pb";
+import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,PersonParam,AddFriendMessageInfo,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,OnlinePersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,ListPageAndSexRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,ChatCardInfo} from "./user_pb";
 import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -156,6 +156,26 @@ const UserService = {
 	const res = await request.post('/api/user/look/unlock', req);
     return res.data.data;
   },
+  /**  通过类型获取表情包列表 */
+  FindMemeByType: async (req?: MemeRequest) => {
+	const res = await request.post<{ data: MemeList, code: string, message: string }>('/api/user/find/meme/type', req);
+    return res.data.data;
+  },
+  /**  获取对方性别的聊天话题 */
+  FindChatTopic: async (req?: ListPageAndSexRequest) => {
+	const res = await request.post<{ data: ChatTopicList, code: string, message: string }>('/api/user/find/topic', req);
+    return res.data.data;
+  },
+  /**  随机表情包 */
+  RandomMeme: async (req?: RandomNum) => {
+	const res = await request.post<{ data: CommonTextList, code: string, message: string }>('/api/user/find/meme/random', req);
+    return res.data.data;
+  },
+  /**  随机打招呼 */
+  RandomSwiftMessage: async (req?: RandomNumAndSex) => {
+	const res = await request.post<{ data: CommonTextList, code: string, message: string }>('/api/user/find/topic/random', req);
+    return res.data.data;
+  },
 
 };