GetRandomMatchingRequest

api/user/user.proto

@@ -448,7 +448,7 @@ service User {
     };
   };
   // 随机速配
-  rpc GetRandomMatching (common.SexReq) returns (chat.GetRandomMatchingReply){
+  rpc GetRandomMatching (GetRandomMatchingRequest) returns (chat.GetRandomMatchingReply){
     option (google.api.http) = {
       post: "/api/user/random/matching",
       body:"*"
@@ -707,6 +707,14 @@ service User {
   rpc MatchUserDBWithoutMap (MatchUserDBWithoutMapRequest) returns (common.PersonDB){};
 }
 
+message GetRandomMatchingRequest{
+  int64 sex = 4;// 性别
+  string province = 7;// 省
+  string city = 8;// 市
+  int64 maxAge = 9;// 最大年龄
+  int64 minAge = 10;// 最小年龄
+}
+
 message MatchUserDBWithoutMapRequest{
   map <string,bool> isMatchingMap = 1;// 已经匹配过的map
   string province = 2;// 省

api/user/user_grpc.pb.go

@@ -147,7 +147,7 @@ type UserClient interface {
 	// 用户的每日免费数
 	GetUserFreeNum(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserFreeNum, error)
 	// 随机速配
-	GetRandomMatching(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*chat.GetRandomMatchingReply, error)
+	GetRandomMatching(ctx context.Context, in *GetRandomMatchingRequest, opts ...grpc.CallOption) (*chat.GetRandomMatchingReply, error)
 	// 解锁语音扣费
 	UnlockVoice(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 解锁图片扣费
@@ -813,7 +813,7 @@ func (c *userClient) GetUserFreeNum(ctx context.Context, in *emptypb.Empty, opts
 	return out, nil
 }
 
-func (c *userClient) GetRandomMatching(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*chat.GetRandomMatchingReply, error) {
+func (c *userClient) GetRandomMatching(ctx context.Context, in *GetRandomMatchingRequest, opts ...grpc.CallOption) (*chat.GetRandomMatchingReply, error) {
 	out := new(chat.GetRandomMatchingReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetRandomMatching", in, out, opts...)
 	if err != nil {
@@ -1419,7 +1419,7 @@ type UserServer interface {
 	// 用户的每日免费数
 	GetUserFreeNum(context.Context, *emptypb.Empty) (*UserFreeNum, error)
 	// 随机速配
-	GetRandomMatching(context.Context, *common.SexReq) (*chat.GetRandomMatchingReply, error)
+	GetRandomMatching(context.Context, *GetRandomMatchingRequest) (*chat.GetRandomMatchingReply, error)
 	// 解锁语音扣费
 	UnlockVoice(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	// 解锁图片扣费
@@ -1716,7 +1716,7 @@ func (UnimplementedUserServer) GetWindowInfo(context.Context, *emptypb.Empty) (*
 func (UnimplementedUserServer) GetUserFreeNum(context.Context, *emptypb.Empty) (*UserFreeNum, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserFreeNum not implemented")
 }
-func (UnimplementedUserServer) GetRandomMatching(context.Context, *common.SexReq) (*chat.GetRandomMatchingReply, error) {
+func (UnimplementedUserServer) GetRandomMatching(context.Context, *GetRandomMatchingRequest) (*chat.GetRandomMatchingReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRandomMatching not implemented")
 }
 func (UnimplementedUserServer) UnlockVoice(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error) {
@@ -2987,7 +2987,7 @@ func _User_GetUserFreeNum_Handler(srv interface{}, ctx context.Context, dec func
 }
 
 func _User_GetRandomMatching_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
+	in := new(GetRandomMatchingRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2999,7 +2999,7 @@ func _User_GetRandomMatching_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/api.user.User/GetRandomMatching",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).GetRandomMatching(ctx, req.(*common.SexReq))
+		return srv.(UserServer).GetRandomMatching(ctx, req.(*GetRandomMatchingRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/user/user_http.pb.go

@@ -62,7 +62,7 @@ type UserHTTPServer interface {
 	FindWithinSevenDayRoomList(context.Context, *common.ListPageRequest) (*UserFindChatListReply, error)
 	GetLookAndLikeStatisticsMessage(context.Context, *emptypb.Empty) (*statistics.LookAndLikeMessageReply, error)
 	GetPartnerCircleInfo(context.Context, *KeyRequest) (*common.AddFriendMessageInfo, error)
-	GetRandomMatching(context.Context, *common.SexReq) (*chat.GetRandomMatchingReply, error)
+	GetRandomMatching(context.Context, *GetRandomMatchingRequest) (*chat.GetRandomMatchingReply, error)
 	GetUserAllUnreadNum(context.Context, *emptypb.Empty) (*chat.UnreadNumReply, error)
 	GetUserBalance(context.Context, *emptypb.Empty) (*UserBalance, error)
 	GetUserFreeNum(context.Context, *emptypb.Empty) (*UserFreeNum, error)
@@ -1867,7 +1867,7 @@ func _User_GetUserFreeNum0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Contex
 
 func _User_GetRandomMatching0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in common.SexReq
+		var in GetRandomMatchingRequest
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -1876,7 +1876,7 @@ func _User_GetRandomMatching0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Con
 		}
 		http.SetOperation(ctx, "/api.user.User/GetRandomMatching")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.GetRandomMatching(ctx, req.(*common.SexReq))
+			return srv.GetRandomMatching(ctx, req.(*GetRandomMatchingRequest))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -2708,7 +2708,7 @@ type UserHTTPClient interface {
 	FindWithinSevenDayRoomList(ctx context.Context, req *common.ListPageRequest, opts ...http.CallOption) (rsp *UserFindChatListReply, err error)
 	GetLookAndLikeStatisticsMessage(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookAndLikeMessageReply, err error)
 	GetPartnerCircleInfo(ctx context.Context, req *KeyRequest, opts ...http.CallOption) (rsp *common.AddFriendMessageInfo, err error)
-	GetRandomMatching(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *chat.GetRandomMatchingReply, err error)
+	GetRandomMatching(ctx context.Context, req *GetRandomMatchingRequest, opts ...http.CallOption) (rsp *chat.GetRandomMatchingReply, err error)
 	GetUserAllUnreadNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *chat.UnreadNumReply, err error)
 	GetUserBalance(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserBalance, err error)
 	GetUserFreeNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserFreeNum, err error)
@@ -3193,7 +3193,7 @@ func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *KeyRe
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) GetRandomMatching(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*chat.GetRandomMatchingReply, error) {
+func (c *UserHTTPClientImpl) GetRandomMatching(ctx context.Context, in *GetRandomMatchingRequest, opts ...http.CallOption) (*chat.GetRandomMatchingReply, error) {
 	var out chat.GetRandomMatchingReply
 	pattern := "/api/user/random/matching"
 	path := binding.EncodeURL(pattern, in, false)

js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,MatchUserDBWithoutMapRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetRandomMatchingRequest,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,MatchUserDBWithoutMapRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,SendMessageReply,HandpickPersonListReply,PersonIDParam,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonMsg,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam,PersonDB} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -314,7 +314,7 @@ const UserService = {
     return res.data.data;
   },
   /**  随机速配 */
-  GetRandomMatching: async (req?: SexReq) => {
+  GetRandomMatching: async (req?: GetRandomMatchingRequest) => {
 	const res = await request.post<{ data: GetRandomMatchingReply, code: string, message: string }>('/api/user/random/matching', req);
     return res.data.data;
   },

js/api/user/user_pb.ts

@@ -1,5 +1,17 @@
 import {Message} from "../common/common_pb";
 
+export interface GetRandomMatchingRequest{
+    /**  性别 */
+    sex?:number;
+    /**  省 */
+    province?:string;
+    /**  市 */
+    city?:string;
+    /**  最大年龄 */
+    maxAge?:number;
+    /**  最小年龄 */
+    minAge?:number;
+}
 export interface MatchUserDBWithoutMapRequest{
     /**  已经匹配过的map */
     isMatchingMap?:any;