获取用户详情websocket专用

api/user/user.proto

@@ -532,8 +532,9 @@ service User {
   // 5、更新上次登录时间
   rpc UpdateUserLastLoginTime (common.PersonIDParam) returns (google.protobuf.Empty){};
   // 6、通过userID查询用户
-  rpc GetUserDBMsgByUserID (common.IDParam) returns (common.PersonMsg);
-
+  rpc GetUserDBMsgByAccountID (common.IDParam) returns (common.PersonMsg);
+  // 获取用户详情websocket专用
+  rpc GetUserDBMsgFromWebsocket (common.PersonIDParam) returns (GetUserDBMsgFromWebsocketReply);
   // 发送消息扣费
   rpc SendMsgReduceCredit (common.PersonParam) returns (google.protobuf.Empty);
   // 回看纸条扣费
@@ -552,6 +553,14 @@ service User {
   rpc UpdateUserMatchedNum (UpdateUserMatchedNumRequest) returns (google.protobuf.Empty){};
 }
 
+message GetUserDBMsgFromWebsocketReply{
+  string id = 1; // id
+  int64 sex = 2;// 性别
+  int64 weight = 3;// 权重
+  string workingStatus = 4;// 工作状态
+  int64 todayMatchedNum = 5;// 今日被匹配数
+}
+
 message UpdateUserMatchedNumRequest{
   int64 num = 1;// 今日被匹配数
   string userId = 2;

api/user/user_grpc.pb.go

@@ -179,7 +179,9 @@ type UserClient interface {
 	// 5、更新上次登录时间
 	UpdateUserLastLoginTime(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 6、通过userID查询用户
-	GetUserDBMsgByUserID(ctx context.Context, in *common.IDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
+	GetUserDBMsgByAccountID(ctx context.Context, in *common.IDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
+	// 获取用户详情websocket专用
+	GetUserDBMsgFromWebsocket(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*GetUserDBMsgFromWebsocketReply, error)
 	// 发送消息扣费
 	SendMsgReduceCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 回看纸条扣费
@@ -890,9 +892,18 @@ func (c *userClient) UpdateUserLastLoginTime(ctx context.Context, in *common.Per
 	return out, nil
 }
 
-func (c *userClient) GetUserDBMsgByUserID(ctx context.Context, in *common.IDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
+func (c *userClient) GetUserDBMsgByAccountID(ctx context.Context, in *common.IDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
 	out := new(common.PersonMsg)
-	err := c.cc.Invoke(ctx, "/api.user.User/GetUserDBMsgByUserID", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.user.User/GetUserDBMsgByAccountID", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) GetUserDBMsgFromWebsocket(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*GetUserDBMsgFromWebsocketReply, error) {
+	out := new(GetUserDBMsgFromWebsocketReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/GetUserDBMsgFromWebsocket", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1132,7 +1143,9 @@ type UserServer interface {
 	// 5、更新上次登录时间
 	UpdateUserLastLoginTime(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
 	// 6、通过userID查询用户
-	GetUserDBMsgByUserID(context.Context, *common.IDParam) (*common.PersonMsg, error)
+	GetUserDBMsgByAccountID(context.Context, *common.IDParam) (*common.PersonMsg, error)
+	// 获取用户详情websocket专用
+	GetUserDBMsgFromWebsocket(context.Context, *common.PersonIDParam) (*GetUserDBMsgFromWebsocketReply, error)
 	// 发送消息扣费
 	SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	// 回看纸条扣费
@@ -1384,8 +1397,11 @@ func (UnimplementedUserServer) FindRecommendUserDBList(context.Context, *common.
 func (UnimplementedUserServer) UpdateUserLastLoginTime(context.Context, *common.PersonIDParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateUserLastLoginTime not implemented")
 }
-func (UnimplementedUserServer) GetUserDBMsgByUserID(context.Context, *common.IDParam) (*common.PersonMsg, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUserDBMsgByUserID not implemented")
+func (UnimplementedUserServer) GetUserDBMsgByAccountID(context.Context, *common.IDParam) (*common.PersonMsg, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetUserDBMsgByAccountID not implemented")
+}
+func (UnimplementedUserServer) GetUserDBMsgFromWebsocket(context.Context, *common.PersonIDParam) (*GetUserDBMsgFromWebsocketReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetUserDBMsgFromWebsocket not implemented")
 }
 func (UnimplementedUserServer) SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendMsgReduceCredit not implemented")
@@ -2792,20 +2808,38 @@ func _User_UpdateUserLastLoginTime_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
-func _User_GetUserDBMsgByUserID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _User_GetUserDBMsgByAccountID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.IDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(UserServer).GetUserDBMsgByUserID(ctx, in)
+		return srv.(UserServer).GetUserDBMsgByAccountID(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/api.user.User/GetUserDBMsgByUserID",
+		FullMethod: "/api.user.User/GetUserDBMsgByAccountID",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).GetUserDBMsgByUserID(ctx, req.(*common.IDParam))
+		return srv.(UserServer).GetUserDBMsgByAccountID(ctx, req.(*common.IDParam))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_GetUserDBMsgFromWebsocket_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 {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).GetUserDBMsgFromWebsocket(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/GetUserDBMsgFromWebsocket",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).GetUserDBMsgFromWebsocket(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -3266,8 +3300,12 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _User_UpdateUserLastLoginTime_Handler,
 		},
 		{
-			MethodName: "GetUserDBMsgByUserID",
-			Handler:    _User_GetUserDBMsgByUserID_Handler,
+			MethodName: "GetUserDBMsgByAccountID",
+			Handler:    _User_GetUserDBMsgByAccountID_Handler,
+		},
+		{
+			MethodName: "GetUserDBMsgFromWebsocket",
+			Handler:    _User_GetUserDBMsgFromWebsocket_Handler,
 		},
 		{
 			MethodName: "SendMsgReduceCredit",

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,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest} 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,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

js/api/user/user_pb.ts

@@ -1,5 +1,17 @@
 import {Message} from "../common/common_pb";
 
+export interface GetUserDBMsgFromWebsocketReply{
+    /**  id */
+    id?:string;
+    /**  性别 */
+    sex?:number;
+    /**  权重 */
+    weight?:number;
+    /**  工作状态 */
+    workingStatus?:string;
+    /**  今日被匹配数 */
+    todayMatchedNum?:number;
+}
 export interface UpdateUserMatchedNumRequest{
     /**  今日被匹配数 */
     num?:number;