wfz 3 anni fa
parent
commit
ab36247381

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


+ 7 - 1
api/chat/chat.proto

@@ -62,7 +62,7 @@ service Chat {
   // 随机匹配
   rpc GetRandomMatching (common.MatchingRequest) returns (GetRandomMatchingReply){};
   // 随机匹配接待员
-  rpc GetMatchingPartnerInfo (common.SexReq) returns (common.GetMatchingPartnerInfoReply){};
+  rpc GetMatchingPartnerInfo (GetMatchingPartnerInfoRequest) returns (common.GetMatchingPartnerInfoReply){};
   // 接待员收藏某条记录
   rpc PartnerCollect (PartnerCollectIDsRequest) returns (google.protobuf.Empty){};
   // 接待员取消收藏某条记录
@@ -77,6 +77,12 @@ service Chat {
   rpc GetRoomProfit (common.RoomIDRequest) returns (GetRoomProfitReply){};
 }
 
+message GetMatchingPartnerInfoRequest{
+  int64 sex = 1;// 性别
+  string userID = 2; // 用户ID
+  string identifyID = 3;// 身份ID
+}
+
 message GetRoomProfitReply{
   int64 roomProfit = 1;// 房间收益
 }

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

@@ -70,7 +70,7 @@ type ChatClient interface {
 	// 随机匹配
 	GetRandomMatching(ctx context.Context, in *common.MatchingRequest, opts ...grpc.CallOption) (*GetRandomMatchingReply, error)
 	// 随机匹配接待员
-	GetMatchingPartnerInfo(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.GetMatchingPartnerInfoReply, error)
+	GetMatchingPartnerInfo(ctx context.Context, in *GetMatchingPartnerInfoRequest, opts ...grpc.CallOption) (*common.GetMatchingPartnerInfoReply, error)
 	// 接待员收藏某条记录
 	PartnerCollect(ctx context.Context, in *PartnerCollectIDsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
@@ -318,7 +318,7 @@ func (c *chatClient) GetRandomMatching(ctx context.Context, in *common.MatchingR
 	return out, nil
 }
 
-func (c *chatClient) GetMatchingPartnerInfo(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.GetMatchingPartnerInfoReply, error) {
+func (c *chatClient) GetMatchingPartnerInfo(ctx context.Context, in *GetMatchingPartnerInfoRequest, opts ...grpc.CallOption) (*common.GetMatchingPartnerInfoReply, error) {
 	out := new(common.GetMatchingPartnerInfoReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/GetMatchingPartnerInfo", in, out, opts...)
 	if err != nil {
@@ -435,7 +435,7 @@ type ChatServer interface {
 	// 随机匹配
 	GetRandomMatching(context.Context, *common.MatchingRequest) (*GetRandomMatchingReply, error)
 	// 随机匹配接待员
-	GetMatchingPartnerInfo(context.Context, *common.SexReq) (*common.GetMatchingPartnerInfoReply, error)
+	GetMatchingPartnerInfo(context.Context, *GetMatchingPartnerInfoRequest) (*common.GetMatchingPartnerInfoReply, error)
 	// 接待员收藏某条记录
 	PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error)
 	// 接待员取消收藏某条记录
@@ -530,7 +530,7 @@ func (UnimplementedChatServer) GetWindowInfo(context.Context, *common.MatchingRe
 func (UnimplementedChatServer) GetRandomMatching(context.Context, *common.MatchingRequest) (*GetRandomMatchingReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRandomMatching not implemented")
 }
-func (UnimplementedChatServer) GetMatchingPartnerInfo(context.Context, *common.SexReq) (*common.GetMatchingPartnerInfoReply, error) {
+func (UnimplementedChatServer) GetMatchingPartnerInfo(context.Context, *GetMatchingPartnerInfoRequest) (*common.GetMatchingPartnerInfoReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetMatchingPartnerInfo not implemented")
 }
 func (UnimplementedChatServer) PartnerCollect(context.Context, *PartnerCollectIDsRequest) (*emptypb.Empty, error) {
@@ -1015,7 +1015,7 @@ func _Chat_GetRandomMatching_Handler(srv interface{}, ctx context.Context, dec f
 }
 
 func _Chat_GetMatchingPartnerInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
+	in := new(GetMatchingPartnerInfoRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1027,7 +1027,7 @@ func _Chat_GetMatchingPartnerInfo_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.chat.Chat/GetMatchingPartnerInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).GetMatchingPartnerInfo(ctx, req.(*common.SexReq))
+		return srv.(ChatServer).GetMatchingPartnerInfo(ctx, req.(*GetMatchingPartnerInfoRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 141 - 131
api/user/user.pb.go

@@ -1806,7 +1806,7 @@ var file_user_proto_rawDesc = []byte{
 	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, 0xe8, 0x39, 0x0a, 0x04, 0x55, 0x73,
+	0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0xe1, 0x3a, 0x0a, 0x04, 0x55, 0x73,
 	0x65, 0x72, 0x12, 0x54, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 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, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e,
@@ -2221,59 +2221,67 @@ var file_user_proto_rawDesc = []byte{
 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70,
 	0x74, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69,
 	0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x67,
-	0x69, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x01, 0x2a, 0x12, 0x40, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55,
-	0x73, 0x65, 0x72, 0x44, 0x42, 0x4d, 0x73, 0x67, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x50, 0x61,
-	0x72, 0x61, 0x6d, 0x1a, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x73, 0x67, 0x12, 0x45, 0x0a, 0x0e, 0x46, 0x69,
-	0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x44, 0x42, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x2e, 0x61,
+	0x69, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x01, 0x2a, 0x12, 0x77, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x52, 0x6f, 0x6f,
+	0x6d, 0x12, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x61, 0x72,
+	0x61, 0x6d, 0x1a, 0x13, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x52, 0x6f,
+	0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22,
+	0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x2f, 0x72, 0x6f, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x3a, 0x01,
+	0x2a, 0x12, 0x40, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x44, 0x42, 0x4d, 0x73,
+	0x67, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50,
+	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x15, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,
-	0x49, 0x44, 0x4c, 0x69, 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, 0x12, 0x57, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x53,
-	0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 0x44, 0x42, 0x12, 0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x61, 0x73, 0x74,
-	0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 0x44, 0x42, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	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, 0x00, 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, 0x12, 0x4e, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73,
-	0x65, 0x72, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12,
+	0x4d, 0x73, 0x67, 0x12, 0x45, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x44,
+	0x42, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x4c, 0x69, 0x73, 0x74, 0x1a,
 	0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72,
-	0x73, 0x6f, 0x6e, 0x49, 0x44, 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, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x13, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52,
-	0x65, 0x64, 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, 0x12, 0x4c, 0x0a, 0x19,
-	0x4c, 0x6f, 0x6f, 0x6b, 0x42, 0x61, 0x63, 0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x64,
+	0x73, 0x6f, 0x6e, 0x44, 0x42, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x57, 0x0a, 0x13, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44, 0x44,
+	0x42, 0x12, 0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44,
+	0x44, 0x42, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 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, 0x00, 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, 0x12, 0x4e, 0x0a,
+	0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x61, 0x73, 0x74, 0x4c,
+	0x6f, 0x67, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 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, 0x22, 0x00, 0x12, 0x46, 0x0a,
+	0x13, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x64, 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, 0x12, 0x4c, 0x0a, 0x19, 0x4c, 0x6f, 0x6f, 0x6b, 0x42, 0x61, 0x63,
+	0x6b, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x64, 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, 0x12, 0x4a, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72,
+	0x69, 0x70, 0x52, 0x65, 0x64, 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, 0x12,
+	0x49, 0x0a, 0x16, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x64,
 	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, 0x12, 0x4a, 0x0a, 0x17, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x64, 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, 0x12, 0x49, 0x0a, 0x16, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53,
-	0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x64, 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, 0x12, 0x41, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 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, 0x41, 0x0a, 0x0e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 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,
 }
 
 var (
@@ -2436,88 +2444,90 @@ var file_user_proto_depIdxs = []int32{
 	45, // 62: api.user.User.UnlockVoice:input_type -> api.common.RoomIDRequest
 	45, // 63: api.user.User.UnlockPicture:input_type -> api.common.RoomIDRequest
 	26, // 64: api.user.User.UpdateUserIsRegister:input_type -> google.protobuf.Empty
-	47, // 65: api.user.User.GetUserDBMsg:input_type -> api.common.PersonIDParam
-	48, // 66: api.user.User.FindUserDBList:input_type -> api.common.PersonIDList
-	49, // 67: api.user.User.UpdateLastScripIDDB:input_type -> api.common.UpdateLastScripIDDBRequest
-	50, // 68: api.user.User.FindRecommendUserDBList:input_type -> api.common.FindRecommendRequest
-	47, // 69: api.user.User.UpdateUserLastLoginTime:input_type -> api.common.PersonIDParam
-	31, // 70: api.user.User.SendMsgReduceCredit:input_type -> api.common.PersonParam
-	31, // 71: api.user.User.LookBackScripReduceCredit:input_type -> api.common.PersonParam
-	31, // 72: api.user.User.CreateScripReduceCredit:input_type -> api.common.PersonParam
-	31, // 73: api.user.User.ReplyScripReduceCredit:input_type -> api.common.PersonParam
-	31, // 74: api.user.User.MatchingCredit:input_type -> api.common.PersonParam
-	16, // 75: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	26, // 76: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	26, // 77: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	26, // 78: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	51, // 79: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
-	13, // 80: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	52, // 81: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	53, // 82: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	54, // 83: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	55, // 84: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	56, // 85: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	57, // 86: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
-	14, // 87: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	14, // 88: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	58, // 89: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	59, // 90: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	60, // 91: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
-	61, // 92: api.user.User.FindMemeByType:output_type -> api.common.MemeList
-	62, // 93: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
-	63, // 94: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
-	63, // 95: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	64, // 96: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
-	65, // 97: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
-	64, // 98: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	26, // 99: api.user.User.UserLike:output_type -> google.protobuf.Empty
-	26, // 100: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
-	26, // 101: api.user.User.Report:output_type -> google.protobuf.Empty
-	66, // 102: api.user.User.FindOverSevenDayAvatar:output_type -> api.common.FindOverSevenDayAvatarReply
-	26, // 103: api.user.User.UpdateLastScripID:output_type -> google.protobuf.Empty
-	67, // 104: api.user.User.CreateScrip:output_type -> api.common.ScripID
-	26, // 105: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
-	68, // 106: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
-	68, // 107: api.user.User.FindOtherScrip:output_type -> api.common.ScripReply
-	68, // 108: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
-	26, // 109: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
-	69, // 110: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
-	70, // 111: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
-	26, // 112: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
-	26, // 113: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
-	71, // 114: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	72, // 115: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	54, // 116: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	54, // 117: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	73, // 118: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	74, // 119: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	26, // 120: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
-	12, // 121: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
-	26, // 122: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
-	26, // 123: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
-	19, // 124: api.user.User.UserRecharge:output_type -> api.user.PayInfo
-	10, // 125: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
-	21, // 126: api.user.User.FindPayList:output_type -> api.user.PayOrderList
-	57, // 127: api.user.User.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
-	7,  // 128: api.user.User.FindMatchingAvatarAndNum:output_type -> api.user.FindMatchingAvatarAndNumReply
-	75, // 129: api.user.User.GetWindowInfo:output_type -> api.chat.WindowInfo
-	1,  // 130: api.user.User.GetUserFreeNum:output_type -> api.user.UserFreeNum
-	76, // 131: api.user.User.GetRandomMatching:output_type -> api.chat.GetRandomMatchingReply
-	26, // 132: api.user.User.UnlockVoice:output_type -> google.protobuf.Empty
-	26, // 133: api.user.User.UnlockPicture:output_type -> google.protobuf.Empty
-	26, // 134: api.user.User.UpdateUserIsRegister:output_type -> google.protobuf.Empty
-	77, // 135: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	78, // 136: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	26, // 137: api.user.User.UpdateLastScripIDDB:output_type -> google.protobuf.Empty
-	78, // 138: api.user.User.FindRecommendUserDBList:output_type -> api.common.PersonDBReply
-	26, // 139: api.user.User.UpdateUserLastLoginTime:output_type -> google.protobuf.Empty
-	26, // 140: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
-	26, // 141: api.user.User.LookBackScripReduceCredit:output_type -> google.protobuf.Empty
-	26, // 142: api.user.User.CreateScripReduceCredit:output_type -> google.protobuf.Empty
-	26, // 143: api.user.User.ReplyScripReduceCredit:output_type -> google.protobuf.Empty
-	26, // 144: api.user.User.MatchingCredit:output_type -> google.protobuf.Empty
-	75, // [75:145] is the sub-list for method output_type
-	5,  // [5:75] is the sub-list for method input_type
+	30, // 65: api.user.User.CreateUserPartnerRoom:input_type -> api.common.CreateChatRoomParam
+	47, // 66: api.user.User.GetUserDBMsg:input_type -> api.common.PersonIDParam
+	48, // 67: api.user.User.FindUserDBList:input_type -> api.common.PersonIDList
+	49, // 68: api.user.User.UpdateLastScripIDDB:input_type -> api.common.UpdateLastScripIDDBRequest
+	50, // 69: api.user.User.FindRecommendUserDBList:input_type -> api.common.FindRecommendRequest
+	47, // 70: api.user.User.UpdateUserLastLoginTime:input_type -> api.common.PersonIDParam
+	31, // 71: api.user.User.SendMsgReduceCredit:input_type -> api.common.PersonParam
+	31, // 72: api.user.User.LookBackScripReduceCredit:input_type -> api.common.PersonParam
+	31, // 73: api.user.User.CreateScripReduceCredit:input_type -> api.common.PersonParam
+	31, // 74: api.user.User.ReplyScripReduceCredit:input_type -> api.common.PersonParam
+	31, // 75: api.user.User.MatchingCredit:input_type -> api.common.PersonParam
+	16, // 76: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	26, // 77: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	26, // 78: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	26, // 79: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	51, // 80: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
+	13, // 81: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	52, // 82: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	53, // 83: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	54, // 84: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	55, // 85: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	56, // 86: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	57, // 87: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
+	14, // 88: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	14, // 89: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	58, // 90: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	59, // 91: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	60, // 92: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
+	61, // 93: api.user.User.FindMemeByType:output_type -> api.common.MemeList
+	62, // 94: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
+	63, // 95: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
+	63, // 96: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	64, // 97: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
+	65, // 98: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
+	64, // 99: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	26, // 100: api.user.User.UserLike:output_type -> google.protobuf.Empty
+	26, // 101: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
+	26, // 102: api.user.User.Report:output_type -> google.protobuf.Empty
+	66, // 103: api.user.User.FindOverSevenDayAvatar:output_type -> api.common.FindOverSevenDayAvatarReply
+	26, // 104: api.user.User.UpdateLastScripID:output_type -> google.protobuf.Empty
+	67, // 105: api.user.User.CreateScrip:output_type -> api.common.ScripID
+	26, // 106: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
+	68, // 107: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
+	68, // 108: api.user.User.FindOtherScrip:output_type -> api.common.ScripReply
+	68, // 109: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
+	26, // 110: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
+	69, // 111: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
+	70, // 112: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	26, // 113: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
+	26, // 114: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
+	71, // 115: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	72, // 116: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	54, // 117: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	54, // 118: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	73, // 119: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	74, // 120: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	26, // 121: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
+	12, // 122: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
+	26, // 123: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
+	26, // 124: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
+	19, // 125: api.user.User.UserRecharge:output_type -> api.user.PayInfo
+	10, // 126: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
+	21, // 127: api.user.User.FindPayList:output_type -> api.user.PayOrderList
+	57, // 128: api.user.User.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
+	7,  // 129: api.user.User.FindMatchingAvatarAndNum:output_type -> api.user.FindMatchingAvatarAndNumReply
+	75, // 130: api.user.User.GetWindowInfo:output_type -> api.chat.WindowInfo
+	1,  // 131: api.user.User.GetUserFreeNum:output_type -> api.user.UserFreeNum
+	76, // 132: api.user.User.GetRandomMatching:output_type -> api.chat.GetRandomMatchingReply
+	26, // 133: api.user.User.UnlockVoice:output_type -> google.protobuf.Empty
+	26, // 134: api.user.User.UnlockPicture:output_type -> google.protobuf.Empty
+	26, // 135: api.user.User.UpdateUserIsRegister:output_type -> google.protobuf.Empty
+	51, // 136: api.user.User.CreateUserPartnerRoom:output_type -> api.chat.RoomReply
+	77, // 137: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	78, // 138: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	26, // 139: api.user.User.UpdateLastScripIDDB:output_type -> google.protobuf.Empty
+	78, // 140: api.user.User.FindRecommendUserDBList:output_type -> api.common.PersonDBReply
+	26, // 141: api.user.User.UpdateUserLastLoginTime:output_type -> google.protobuf.Empty
+	26, // 142: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
+	26, // 143: api.user.User.LookBackScripReduceCredit:output_type -> google.protobuf.Empty
+	26, // 144: api.user.User.CreateScripReduceCredit:output_type -> google.protobuf.Empty
+	26, // 145: api.user.User.ReplyScripReduceCredit:output_type -> google.protobuf.Empty
+	26, // 146: api.user.User.MatchingCredit:output_type -> google.protobuf.Empty
+	76, // [76:147] is the sub-list for method output_type
+	5,  // [5:76] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
 	5,  // [5:5] is the sub-list for extension extendee
 	0,  // [0:5] is the sub-list for field type_name

+ 8 - 1
api/user/user.proto

@@ -43,7 +43,7 @@ service User {
       body:"*"
     };
   };
-  // 5、创建用户与接待员的关联
+  // 5、创建用户与某人的关联
   rpc CreateUserPersonRoom (common.CreateChatRoomParam) returns (chat.RoomReply){
     option (google.api.http) = {
       post: "/api/user/create/room",
@@ -440,6 +440,13 @@ service User {
       body:"*"
     };
   };
+  // 创建用户与接待员的关联
+  rpc CreateUserPartnerRoom (common.CreateChatRoomParam) returns (chat.RoomReply){
+    option (google.api.http) = {
+      post: "/api/user/create/room/partner",
+      body:"*"
+    };
+  };
 
   // ---rpc---
   // 1、获取用户详情

+ 40 - 2
api/user/user_grpc.pb.go

@@ -30,7 +30,7 @@ type UserClient interface {
 	CheckPhoneCode(ctx context.Context, in *common.CheckPhoneCodeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 4、更新用户信息
 	UpdateUserInformation(ctx context.Context, in *common.UpdateInformationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 5、创建用户与接待员的关联
+	// 5、创建用户与某人的关联
 	CreateUserPersonRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...grpc.CallOption) (*chat.RoomReply, error)
 	// 6、获取用户的金额信息
 	GetUserBalance(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserBalance, error)
@@ -144,6 +144,8 @@ type UserClient interface {
 	UnlockPicture(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 更新用户注册状态
 	UpdateUserIsRegister(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 创建用户与接待员的关联
+	CreateUserPartnerRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...grpc.CallOption) (*chat.RoomReply, error)
 	// ---rpc---
 	// 1、获取用户详情
 	GetUserDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
@@ -715,6 +717,15 @@ func (c *userClient) UpdateUserIsRegister(ctx context.Context, in *emptypb.Empty
 	return out, nil
 }
 
+func (c *userClient) CreateUserPartnerRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...grpc.CallOption) (*chat.RoomReply, error) {
+	out := new(chat.RoomReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/CreateUserPartnerRoom", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *userClient) GetUserDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
 	out := new(common.PersonMsg)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetUserDBMsg", in, out, opts...)
@@ -817,7 +828,7 @@ type UserServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	// 4、更新用户信息
 	UpdateUserInformation(context.Context, *common.UpdateInformationRequest) (*emptypb.Empty, error)
-	// 5、创建用户与接待员的关联
+	// 5、创建用户与某人的关联
 	CreateUserPersonRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
 	// 6、获取用户的金额信息
 	GetUserBalance(context.Context, *emptypb.Empty) (*UserBalance, error)
@@ -931,6 +942,8 @@ type UserServer interface {
 	UnlockPicture(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
 	// 更新用户注册状态
 	UpdateUserIsRegister(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
+	// 创建用户与接待员的关联
+	CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
 	// ---rpc---
 	// 1、获取用户详情
 	GetUserDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error)
@@ -1139,6 +1152,9 @@ func (UnimplementedUserServer) UnlockPicture(context.Context, *common.RoomIDRequ
 func (UnimplementedUserServer) UpdateUserIsRegister(context.Context, *emptypb.Empty) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateUserIsRegister not implemented")
 }
+func (UnimplementedUserServer) CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerRoom not implemented")
+}
 func (UnimplementedUserServer) GetUserDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserDBMsg not implemented")
 }
@@ -2262,6 +2278,24 @@ func _User_UpdateUserIsRegister_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_CreateUserPartnerRoom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.CreateChatRoomParam)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).CreateUserPartnerRoom(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/CreateUserPartnerRoom",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).CreateUserPartnerRoom(ctx, req.(*common.CreateChatRoomParam))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _User_GetUserDBMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
@@ -2689,6 +2723,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateUserIsRegister",
 			Handler:    _User_UpdateUserIsRegister_Handler,
 		},
+		{
+			MethodName: "CreateUserPartnerRoom",
+			Handler:    _User_CreateUserPartnerRoom_Handler,
+		},
 		{
 			MethodName: "GetUserDBMsg",
 			Handler:    _User_GetUserDBMsg_Handler,

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

@@ -33,6 +33,7 @@ type UserHTTPServer interface {
 	CheckPhoneCode(context.Context, *common.CheckPhoneCodeRequest) (*emptypb.Empty, error)
 	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
 	CreateScrip(context.Context, *CreateScripRequest) (*common.ScripID, error)
+	CreateUserPartnerRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
 	CreateUserPersonRoom(context.Context, *common.CreateChatRoomParam) (*chat.RoomReply, error)
 	DeleteScrip(context.Context, *DeleteScripRequest) (*emptypb.Empty, error)
 	FindChatRecordList(context.Context, *common.FindChatRecordListRequest) (*common.ChatRecordListReply, error)
@@ -154,6 +155,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/unlock/voice", _User_UnlockVoice0_HTTP_Handler(srv))
 	r.POST("/api/user/unlock/picture", _User_UnlockPicture0_HTTP_Handler(srv))
 	r.POST("/api/user/update/register", _User_UpdateUserIsRegister0_HTTP_Handler(srv))
+	r.POST("/api/user/create/room/partner", _User_CreateUserPartnerRoom0_HTTP_Handler(srv))
 }
 
 func _User_GetUserInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -1776,10 +1778,38 @@ func _User_UpdateUserIsRegister0_HTTP_Handler(srv UserHTTPServer) func(ctx http.
 	}
 }
 
+func _User_CreateUserPartnerRoom0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.CreateChatRoomParam
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/CreateUserPartnerRoom")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.CreateUserPartnerRoom(ctx, req.(*common.CreateChatRoomParam))
+		})
+		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)
 	CreateScrip(ctx context.Context, req *CreateScripRequest, opts ...http.CallOption) (rsp *common.ScripID, err error)
+	CreateUserPartnerRoom(ctx context.Context, req *common.CreateChatRoomParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
 	CreateUserPersonRoom(ctx context.Context, req *common.CreateChatRoomParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
 	DeleteScrip(ctx context.Context, req *DeleteScripRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	FindChatRecordList(ctx context.Context, req *common.FindChatRecordListRequest, opts ...http.CallOption) (rsp *common.ChatRecordListReply, err error)
@@ -1886,6 +1916,19 @@ func (c *UserHTTPClientImpl) CreateScrip(ctx context.Context, in *CreateScripReq
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) CreateUserPartnerRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...http.CallOption) (*chat.RoomReply, error) {
+	var out chat.RoomReply
+	pattern := "/api/user/create/room/partner"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/CreateUserPartnerRoom"))
+	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) CreateUserPersonRoom(ctx context.Context, in *common.CreateChatRoomParam, opts ...http.CallOption) (*chat.RoomReply, error) {
 	var out chat.RoomReply
 	pattern := "/api/user/create/room"

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

@@ -1,3 +1,11 @@
+export interface GetMatchingPartnerInfoRequest{
+    /**  性别 */
+    sex?:number;
+    /**  用户ID */
+    userID?:string;
+    /**  身份ID */
+    identifyID?:string;
+}
 export interface GetRoomProfitReply{
     /**  房间收益 */
     roomProfit?:number;

+ 6 - 1
js/api/user/user_http_pb.ts

@@ -26,7 +26,7 @@ const UserService = {
 	const res = await request.post('/api/user/update/information', req);
     return res.data.data;
   },
-  /**  5、创建用户与接待员的关联 */
+  /**  5、创建用户与某人的关联 */
   CreateUserPersonRoom: async (req?: CreateChatRoomParam) => {
 	const res = await request.post<{ data: RoomReply, code: string, message: string }>('/api/user/create/room', req);
     return res.data.data;
@@ -308,6 +308,11 @@ const UserService = {
 	const res = await request.post('/api/user/update/register', req);
     return res.data.data;
   },
+  /**  创建用户与接待员的关联 */
+  CreateUserPartnerRoom: async (req?: CreateChatRoomParam) => {
+	const res = await request.post<{ data: RoomReply, code: string, message: string }>('/api/user/create/room/partner', req);
+    return res.data.data;
+  },
 
 };
 

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