Bladeren bron

获取素材

wfz 3 jaren geleden
bovenliggende
commit
87595212e8

+ 55 - 22
api/account/account.pb.go

@@ -804,7 +804,7 @@ var file_account_proto_rawDesc = []byte{
 	0x65, 0x22, 0x32, 0x0a, 0x0a, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
 	0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x69,
 	0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x32, 0xae, 0x08, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x32, 0xd0, 0x0a, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
 	0x74, 0x12, 0x62, 0x0a, 0x0a, 0x44, 0x65, 0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12,
 	0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, 0x44, 0x65,
 	0x62, 0x75, 0x67, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
@@ -871,12 +871,30 @@ var file_account_proto_rawDesc = []byte{
 	0x72, 0x69, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26,
 	0x22, 0x21, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x61,
 	0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x2f, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x2f, 0x76, 0x6f,
-	0x69, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x61, 0x63,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x61,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x3b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x41, 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, 0x00, 0x12, 0x49, 0x0a, 0x0d, 0x46, 0x69, 0x6e,
+	0x64, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x1b, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x67, 0x65,
+	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, 0x00, 0x12, 0x41, 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, 0x00, 0x12, 0x4f, 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, 0x00, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e,
+	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x3b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -908,8 +926,15 @@ var file_account_proto_goTypes = []interface{}{
 	(*common.SexReq)(nil),               // 12: api.common.SexReq
 	(*common.PersonParam)(nil),          // 13: api.common.PersonParam
 	(*common.Ids)(nil),                  // 14: api.common.Ids
-	(*common.TagListReply)(nil),         // 15: api.common.TagListReply
-	(*common.RandomIntroduceReply)(nil), // 16: api.common.RandomIntroduceReply
+	(*common.MemeRequest)(nil),          // 15: api.common.MemeRequest
+	(*common.ListPageRequest)(nil),      // 16: api.common.ListPageRequest
+	(*common.RandomNum)(nil),            // 17: api.common.RandomNum
+	(*common.RandomNumAndSex)(nil),      // 18: api.common.RandomNumAndSex
+	(*common.TagListReply)(nil),         // 19: api.common.TagListReply
+	(*common.RandomIntroduceReply)(nil), // 20: api.common.RandomIntroduceReply
+	(*common.MemeList)(nil),             // 21: api.common.MemeList
+	(*common.ChatTopicList)(nil),        // 22: api.common.ChatTopicList
+	(*common.CommonTextList)(nil),       // 23: api.common.CommonTextList
 }
 var file_account_proto_depIdxs = []int32{
 	10, // 0: api.account.Account.DebugLogin:input_type -> api.account.DebugLoginRequest
@@ -923,19 +948,27 @@ var file_account_proto_depIdxs = []int32{
 	14, // 8: api.account.Account.FindTagsByIDs:input_type -> api.common.Ids
 	12, // 9: api.account.Account.RandomIntroduce:input_type -> api.common.SexReq
 	0,  // 10: api.account.Account.UploadMaterialVoice:input_type -> api.account.MediaID
-	9,  // 11: api.account.Account.DebugLogin:output_type -> api.account.TokenReply
-	9,  // 12: api.account.Account.Authorization:output_type -> api.account.TokenReply
-	2,  // 13: api.account.Account.RandomNickname:output_type -> api.account.RandomNicknameReply
-	3,  // 14: api.account.Account.RandomAvatar:output_type -> api.account.RandomAvatarReply
-	5,  // 15: api.account.Account.GetIdentityByOpenIDAndAppID:output_type -> api.account.IdentityInfo
-	5,  // 16: api.account.Account.GetIdentityByTypeAndPID:output_type -> api.account.IdentityInfo
-	5,  // 17: api.account.Account.GetIdentityByFromOpenIDAndAppID:output_type -> api.account.IdentityInfo
-	15, // 18: api.account.Account.FindTagListBySex:output_type -> api.common.TagListReply
-	15, // 19: api.account.Account.FindTagsByIDs:output_type -> api.common.TagListReply
-	16, // 20: api.account.Account.RandomIntroduce:output_type -> api.common.RandomIntroduceReply
-	1,  // 21: api.account.Account.UploadMaterialVoice:output_type -> api.account.MaterialLink
-	11, // [11:22] is the sub-list for method output_type
-	0,  // [0:11] is the sub-list for method input_type
+	15, // 11: api.account.Account.FindMemeByType:input_type -> api.common.MemeRequest
+	16, // 12: api.account.Account.FindChatTopic:input_type -> api.common.ListPageRequest
+	17, // 13: api.account.Account.RandomMeme:input_type -> api.common.RandomNum
+	18, // 14: api.account.Account.RandomSwiftMessage:input_type -> api.common.RandomNumAndSex
+	9,  // 15: api.account.Account.DebugLogin:output_type -> api.account.TokenReply
+	9,  // 16: api.account.Account.Authorization:output_type -> api.account.TokenReply
+	2,  // 17: api.account.Account.RandomNickname:output_type -> api.account.RandomNicknameReply
+	3,  // 18: api.account.Account.RandomAvatar:output_type -> api.account.RandomAvatarReply
+	5,  // 19: api.account.Account.GetIdentityByOpenIDAndAppID:output_type -> api.account.IdentityInfo
+	5,  // 20: api.account.Account.GetIdentityByTypeAndPID:output_type -> api.account.IdentityInfo
+	5,  // 21: api.account.Account.GetIdentityByFromOpenIDAndAppID:output_type -> api.account.IdentityInfo
+	19, // 22: api.account.Account.FindTagListBySex:output_type -> api.common.TagListReply
+	19, // 23: api.account.Account.FindTagsByIDs:output_type -> api.common.TagListReply
+	20, // 24: api.account.Account.RandomIntroduce:output_type -> api.common.RandomIntroduceReply
+	1,  // 25: api.account.Account.UploadMaterialVoice:output_type -> api.account.MaterialLink
+	21, // 26: api.account.Account.FindMemeByType:output_type -> api.common.MemeList
+	22, // 27: api.account.Account.FindChatTopic:output_type -> api.common.ChatTopicList
+	23, // 28: api.account.Account.RandomMeme:output_type -> api.common.CommonTextList
+	23, // 29: api.account.Account.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	15, // [15:30] is the sub-list for method output_type
+	0,  // [0:15] is the sub-list for method input_type
 	0,  // [0:0] is the sub-list for extension type_name
 	0,  // [0:0] is the sub-list for extension extendee
 	0,  // [0:0] is the sub-list for field type_name

+ 9 - 0
api/account/account.proto

@@ -61,6 +61,15 @@ service Account {
       body:"*"
     };
   };
+  // 通过类型获取表情包列表
+  rpc FindMemeByType (common.MemeRequest) returns (common.MemeList){};
+  // 获取聊天话题
+  rpc FindChatTopic (common.ListPageRequest) returns (common.ChatTopicList){};
+  // 随机表情包
+  rpc RandomMeme (common.RandomNum) returns (common.CommonTextList){};
+  // 随机打招呼
+  rpc RandomSwiftMessage (common.RandomNumAndSex) returns (common.CommonTextList){};
+
 }
 
 message MediaID{

+ 152 - 0
api/account/account_grpc.pb.go

@@ -37,6 +37,14 @@ type AccountClient interface {
 	RandomIntroduce(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.RandomIntroduceReply, error)
 	// 通过微信下载语音并上传到七牛
 	UploadMaterialVoice(ctx context.Context, in *MediaID, opts ...grpc.CallOption) (*MaterialLink, error)
+	// 通过类型获取表情包列表
+	FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error)
+	// 获取聊天话题
+	FindChatTopic(ctx context.Context, in *common.ListPageRequest, 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 accountClient struct {
@@ -146,6 +154,42 @@ func (c *accountClient) UploadMaterialVoice(ctx context.Context, in *MediaID, op
 	return out, nil
 }
 
+func (c *accountClient) FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error) {
+	out := new(common.MemeList)
+	err := c.cc.Invoke(ctx, "/api.account.Account/FindMemeByType", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountClient) FindChatTopic(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*common.ChatTopicList, error) {
+	out := new(common.ChatTopicList)
+	err := c.cc.Invoke(ctx, "/api.account.Account/FindChatTopic", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountClient) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...grpc.CallOption) (*common.CommonTextList, error) {
+	out := new(common.CommonTextList)
+	err := c.cc.Invoke(ctx, "/api.account.Account/RandomMeme", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountClient) RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error) {
+	out := new(common.CommonTextList)
+	err := c.cc.Invoke(ctx, "/api.account.Account/RandomSwiftMessage", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // AccountServer is the server API for Account service.
 // All implementations must embed UnimplementedAccountServer
 // for forward compatibility
@@ -168,6 +212,14 @@ type AccountServer interface {
 	RandomIntroduce(context.Context, *common.SexReq) (*common.RandomIntroduceReply, error)
 	// 通过微信下载语音并上传到七牛
 	UploadMaterialVoice(context.Context, *MediaID) (*MaterialLink, error)
+	// 通过类型获取表情包列表
+	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
+	// 获取聊天话题
+	FindChatTopic(context.Context, *common.ListPageRequest) (*common.ChatTopicList, error)
+	// 随机表情包
+	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
+	// 随机打招呼
+	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	mustEmbedUnimplementedAccountServer()
 }
 
@@ -208,6 +260,18 @@ func (UnimplementedAccountServer) RandomIntroduce(context.Context, *common.SexRe
 func (UnimplementedAccountServer) UploadMaterialVoice(context.Context, *MediaID) (*MaterialLink, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UploadMaterialVoice not implemented")
 }
+func (UnimplementedAccountServer) FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindMemeByType not implemented")
+}
+func (UnimplementedAccountServer) FindChatTopic(context.Context, *common.ListPageRequest) (*common.ChatTopicList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindChatTopic not implemented")
+}
+func (UnimplementedAccountServer) RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RandomMeme not implemented")
+}
+func (UnimplementedAccountServer) RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RandomSwiftMessage not implemented")
+}
 func (UnimplementedAccountServer) mustEmbedUnimplementedAccountServer() {}
 
 // UnsafeAccountServer may be embedded to opt out of forward compatibility for this service.
@@ -419,6 +483,78 @@ func _Account_UploadMaterialVoice_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Account_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.(AccountServer).FindMemeByType(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/FindMemeByType",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).FindMemeByType(ctx, req.(*common.MemeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Account_FindChatTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.ListPageRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountServer).FindChatTopic(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/FindChatTopic",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).FindChatTopic(ctx, req.(*common.ListPageRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Account_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.(AccountServer).RandomMeme(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/RandomMeme",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).RandomMeme(ctx, req.(*common.RandomNum))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Account_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.(AccountServer).RandomSwiftMessage(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/RandomSwiftMessage",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).RandomSwiftMessage(ctx, req.(*common.RandomNumAndSex))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Account_ServiceDesc is the grpc.ServiceDesc for Account service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -470,6 +606,22 @@ var Account_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UploadMaterialVoice",
 			Handler:    _Account_UploadMaterialVoice_Handler,
 		},
+		{
+			MethodName: "FindMemeByType",
+			Handler:    _Account_FindMemeByType_Handler,
+		},
+		{
+			MethodName: "FindChatTopic",
+			Handler:    _Account_FindChatTopic_Handler,
+		},
+		{
+			MethodName: "RandomMeme",
+			Handler:    _Account_RandomMeme_Handler,
+		},
+		{
+			MethodName: "RandomSwiftMessage",
+			Handler:    _Account_RandomSwiftMessage_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "account.proto",

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

@@ -2822,6 +2822,328 @@ func (x *BalanceRequest) GetBalance() int64 {
 	return 0
 }
 
+type RandomNum struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Num int64 `protobuf:"varint,1,opt,name=num,proto3" json:"num"` // 随机的数量
+}
+
+func (x *RandomNum) Reset() {
+	*x = RandomNum{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[40]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RandomNum) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RandomNum) ProtoMessage() {}
+
+func (x *RandomNum) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[40]
+	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 RandomNum.ProtoReflect.Descriptor instead.
+func (*RandomNum) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{40}
+}
+
+func (x *RandomNum) GetNum() int64 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
+type RandomNumAndSex struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Num int64 `protobuf:"varint,1,opt,name=num,proto3" json:"num"` // 随机的数量
+	Sex int64 `protobuf:"varint,2,opt,name=sex,proto3" json:"sex"` // 性别
+}
+
+func (x *RandomNumAndSex) Reset() {
+	*x = RandomNumAndSex{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[41]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RandomNumAndSex) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RandomNumAndSex) ProtoMessage() {}
+
+func (x *RandomNumAndSex) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[41]
+	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 RandomNumAndSex.ProtoReflect.Descriptor instead.
+func (*RandomNumAndSex) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{41}
+}
+
+func (x *RandomNumAndSex) GetNum() int64 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
+func (x *RandomNumAndSex) GetSex() int64 {
+	if x != nil {
+		return x.Sex
+	}
+	return 0
+}
+
+type MemeRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	NextId int64  `protobuf:"varint,1,opt,name=nextId,proto3" json:"nextId"`
+	Offset int64  `protobuf:"varint,2,opt,name=offset,proto3" json:"offset"`
+	Type   string `protobuf:"bytes,3,opt,name=type,proto3" json:"type"`
+}
+
+func (x *MemeRequest) Reset() {
+	*x = MemeRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[42]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MemeRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MemeRequest) ProtoMessage() {}
+
+func (x *MemeRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[42]
+	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 MemeRequest.ProtoReflect.Descriptor instead.
+func (*MemeRequest) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{42}
+}
+
+func (x *MemeRequest) GetNextId() int64 {
+	if x != nil {
+		return x.NextId
+	}
+	return 0
+}
+
+func (x *MemeRequest) GetOffset() int64 {
+	if x != nil {
+		return x.Offset
+	}
+	return 0
+}
+
+func (x *MemeRequest) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+type CommonTextList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List []string `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` // 需要的数据集合(随机表情包、随机打招呼)
+}
+
+func (x *CommonTextList) Reset() {
+	*x = CommonTextList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[43]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CommonTextList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CommonTextList) ProtoMessage() {}
+
+func (x *CommonTextList) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[43]
+	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 CommonTextList.ProtoReflect.Descriptor instead.
+func (*CommonTextList) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{43}
+}
+
+func (x *CommonTextList) GetList() []string {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
+type MemeList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List   []string `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` // 表情包列表
+	NextId int64    `protobuf:"varint,2,opt,name=nextId,proto3" json:"nextId"`
+}
+
+func (x *MemeList) Reset() {
+	*x = MemeList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[44]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MemeList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MemeList) ProtoMessage() {}
+
+func (x *MemeList) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[44]
+	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 MemeList.ProtoReflect.Descriptor instead.
+func (*MemeList) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{44}
+}
+
+func (x *MemeList) GetList() []string {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
+func (x *MemeList) GetNextId() int64 {
+	if x != nil {
+		return x.NextId
+	}
+	return 0
+}
+
+type ChatTopicList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	List   []string `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` // 话题列表
+	NextId int64    `protobuf:"varint,2,opt,name=nextId,proto3" json:"nextId"`
+}
+
+func (x *ChatTopicList) Reset() {
+	*x = ChatTopicList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[45]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ChatTopicList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ChatTopicList) ProtoMessage() {}
+
+func (x *ChatTopicList) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[45]
+	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 ChatTopicList.ProtoReflect.Descriptor instead.
+func (*ChatTopicList) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{45}
+}
+
+func (x *ChatTopicList) GetList() []string {
+	if x != nil {
+		return x.List
+	}
+	return nil
+}
+
+func (x *ChatTopicList) GetNextId() int64 {
+	if x != nil {
+		return x.NextId
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -3141,12 +3463,32 @@ var file_common_proto_rawDesc = []byte{
 	0x6e, 0x49, 0x44, 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, 0x18, 0x0a, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x42, 0x43, 0x0a,
-	0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x01, 0x5a, 0x33, 0x67,
-	0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x3b, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x1d, 0x0a,
+	0x09, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75,
+	0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x22, 0x35, 0x0a, 0x0f,
+	0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x12,
+	0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6e, 0x75,
+	0x6d, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
+	0x73, 0x65, 0x78, 0x22, 0x51, 0x0a, 0x0b, 0x4d, 0x65, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66,
+	0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x24, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x36, 0x0a, 0x08,
+	0x4d, 0x65, 0x6d, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06,
+	0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65,
+	0x78, 0x74, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69,
+	0x63, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78,
+	0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49,
+	0x64, 0x42, 0x43, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50,
+	0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x3b,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3161,7 +3503,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 40)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 46)
 var file_common_proto_goTypes = []interface{}{
 	(*UserAndPartnerIdentifyIdParam)(nil), // 0: api.common.UserAndPartnerIdentifyIdParam
 	(*UserAndPartnerParam)(nil),           // 1: api.common.UserAndPartnerParam
@@ -3203,6 +3545,12 @@ var file_common_proto_goTypes = []interface{}{
 	(*FindChatRecordListRequest)(nil),     // 37: api.common.FindChatRecordListRequest
 	(*IsLike)(nil),                        // 38: api.common.IsLike
 	(*BalanceRequest)(nil),                // 39: api.common.BalanceRequest
+	(*RandomNum)(nil),                     // 40: api.common.RandomNum
+	(*RandomNumAndSex)(nil),               // 41: api.common.RandomNumAndSex
+	(*MemeRequest)(nil),                   // 42: api.common.MemeRequest
+	(*CommonTextList)(nil),                // 43: api.common.CommonTextList
+	(*MemeList)(nil),                      // 44: api.common.MemeList
+	(*ChatTopicList)(nil),                 // 45: api.common.ChatTopicList
 }
 var file_common_proto_depIdxs = []int32{
 	24, // 0: api.common.HomeInfo.tagList:type_name -> api.common.TagList
@@ -3706,6 +4054,78 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RandomNum); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RandomNumAndSex); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MemeRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CommonTextList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MemeList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ChatTopicList); 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{
@@ -3713,7 +4133,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   40,
+			NumMessages:   46,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 29 - 1
api/common/common.proto

@@ -243,7 +243,6 @@ message ChatPersonMsg{
   string type = 2; // 类型
   string nickname = 3; // 昵称
   string avatar = 4; // 头像
-
 }
 
 message ChatRecordInfo{
@@ -287,4 +286,33 @@ message BalanceRequest{
   string personID = 1; // 查询目标的ID
   string personType = 2; // 类型
   int64 balance = 3;// 充值或者减少的金额
+}
+
+message RandomNum {
+  int64 num = 1; // 随机的数量
+}
+
+message RandomNumAndSex {
+  int64 num = 1; // 随机的数量
+  int64 sex = 2; // 性别
+}
+
+message MemeRequest{
+  int64 nextId = 1;
+  int64 offset = 2;
+  string type = 3;
+}
+
+message CommonTextList {
+  repeated string list = 1;// 需要的数据集合(随机表情包、随机打招呼)
+}
+
+message MemeList {
+  repeated string list = 1;// 表情包列表
+  int64 nextId = 2;
+}
+
+message ChatTopicList {
+  repeated string list = 1;// 话题列表
+  int64 nextId = 2;
 }

+ 1 - 1
js/api/account/account_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import request from '@/libs/request';
 import {DebugLoginRequest,TokenReply,AuthorizationRequest,RandomNicknameReply,RandomAvatarReply,OpenIDAndAppIDRequest,IdentityInfo,MediaID,MaterialLink} from "./account_pb";
-import {SexReq,PersonParam,TagListReply,Ids,RandomIntroduceReply} from "../common/common_pb";
+import {SexReq,PersonParam,TagListReply,Ids,RandomIntroduceReply,MemeRequest,MemeList,ListPageRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex} from "../common/common_pb";
 
 const AccountService = {
   DebugLogin: async (req?: DebugLoginRequest) => {

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

@@ -356,4 +356,33 @@ export interface BalanceRequest{
     /**  充值或者减少的金额 */
     balance?:number;
 }
+export interface RandomNum{
+    /**  随机的数量 */
+    num?:number;
+}
+export interface RandomNumAndSex{
+    /**  随机的数量 */
+    num?:number;
+    /**  性别 */
+    sex?:number;
+}
+export interface MemeRequest{
+    nextId?:number;
+    offset?:number;
+    type?:string;
+}
+export interface CommonTextList{
+    /**  需要的数据集合(随机表情包、随机打招呼) */
+    list?:Array<string>;
+}
+export interface MemeList{
+    /**  表情包列表 */
+    list?:Array<string>;
+    nextId?:number;
+}
+export interface ChatTopicList{
+    /**  话题列表 */
+    list?:Array<string>;
+    nextId?:number;
+}