改版

api/account/account.proto

@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "api/common/common.proto";
 //import "api/base/base.proto";
 //import "google/protobuf/struct.proto";
-//import "google/protobuf/empty.proto";
+import "google/protobuf/empty.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/account;account";
 option java_multiple_files = true;
@@ -40,10 +40,8 @@ service Account {
   rpc RandomAvatarList (common.SexReq) returns (RandomAvatarListReply){};
   // 通过openID和appID查询
   rpc GetIdentityByOpenIDAndAppID (OpenIDAndAppIDRequest) returns (IdentityInfo);
-  // 通过type和PID查询
-  rpc GetIdentityByTypeAndPID (common.PersonParam) returns (IdentityInfo);
-  // 通过原公众号openID和appID查询
-  rpc GetIdentityByFromOpenIDAndAppID (OpenIDAndAppIDRequest) returns (IdentityInfo);
+  // 通过openID和appID查询 未查到就创建
+  rpc GetIdentityByOpenIDAndAppIDAndCreate (OpenIDAndAppIDRequest) returns (IdentityInfo);
   // 通过分组名和性别查询标签
   rpc FindTagListBySex (common.SexReq) returns (common.TagListReply);
   // 通过标签IDs查询标签
@@ -79,6 +77,21 @@ service Account {
       body:"*"
     };
   };
+  // 通过accountID获取Identify信息
+  rpc GetIdentifyByAccountID (GetIdentifyByAccountIDRequest) returns (GetIdentifyByAccountIDReply){};
+  // 用户关注
+  rpc UserSubscribe (OpenIDAndAppIDRequest) returns (google.protobuf.Empty){};
+  // 用户取关
+  rpc UserUnsubscribe (OpenIDAndAppIDRequest) returns (google.protobuf.Empty){};
+}
+
+message GetIdentifyByAccountIDRequest{
+  int64 accountId = 1;
+}
+
+message GetIdentifyByAccountIDReply{
+  string openId = 1;
+  string appid = 2;
 }
 
 message CheckTextRequest{
@@ -116,9 +129,6 @@ message OpenIDAndAppIDRequest{
 
 message IdentityInfo{
   string pid = 1;
-  string type = 2;
-  int64 identityID = 3;
-  string openId = 4;
 }
 
 message UserInfoDB{

api/account/account_grpc.pb.go

@@ -8,6 +8,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -26,10 +27,8 @@ type AccountClient interface {
 	RandomAvatarList(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomAvatarListReply, error)
 	// 通过openID和appID查询
 	GetIdentityByOpenIDAndAppID(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error)
-	// 通过type和PID查询
-	GetIdentityByTypeAndPID(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*IdentityInfo, error)
-	// 通过原公众号openID和appID查询
-	GetIdentityByFromOpenIDAndAppID(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error)
+	// 通过openID和appID查询 未查到就创建
+	GetIdentityByOpenIDAndAppIDAndCreate(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error)
 	// 通过分组名和性别查询标签
 	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
 	// 通过标签IDs查询标签
@@ -50,6 +49,12 @@ type AccountClient interface {
 	CheckText(ctx context.Context, in *CheckTextRequest, opts ...grpc.CallOption) (*CheckTextReply, error)
 	// 获取用户登录配置
 	GetUserLoginConfig(ctx context.Context, in *common.GetLoginConfigRequest, opts ...grpc.CallOption) (*common.GetLoginConfigReply, error)
+	// 通过accountID获取Identify信息
+	GetIdentifyByAccountID(ctx context.Context, in *GetIdentifyByAccountIDRequest, opts ...grpc.CallOption) (*GetIdentifyByAccountIDReply, error)
+	// 用户关注
+	UserSubscribe(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 用户取关
+	UserUnsubscribe(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type accountClient struct {
@@ -114,18 +119,9 @@ func (c *accountClient) GetIdentityByOpenIDAndAppID(ctx context.Context, in *Ope
 	return out, nil
 }
 
-func (c *accountClient) GetIdentityByTypeAndPID(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*IdentityInfo, error) {
+func (c *accountClient) GetIdentityByOpenIDAndAppIDAndCreate(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error) {
 	out := new(IdentityInfo)
-	err := c.cc.Invoke(ctx, "/api.account.Account/GetIdentityByTypeAndPID", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *accountClient) GetIdentityByFromOpenIDAndAppID(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*IdentityInfo, error) {
-	out := new(IdentityInfo)
-	err := c.cc.Invoke(ctx, "/api.account.Account/GetIdentityByFromOpenIDAndAppID", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.account.Account/GetIdentityByOpenIDAndAppIDAndCreate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -222,6 +218,33 @@ func (c *accountClient) GetUserLoginConfig(ctx context.Context, in *common.GetLo
 	return out, nil
 }
 
+func (c *accountClient) GetIdentifyByAccountID(ctx context.Context, in *GetIdentifyByAccountIDRequest, opts ...grpc.CallOption) (*GetIdentifyByAccountIDReply, error) {
+	out := new(GetIdentifyByAccountIDReply)
+	err := c.cc.Invoke(ctx, "/api.account.Account/GetIdentifyByAccountID", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountClient) UserSubscribe(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.account.Account/UserSubscribe", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *accountClient) UserUnsubscribe(ctx context.Context, in *OpenIDAndAppIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.account.Account/UserUnsubscribe", 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
@@ -233,10 +256,8 @@ type AccountServer interface {
 	RandomAvatarList(context.Context, *common.SexReq) (*RandomAvatarListReply, error)
 	// 通过openID和appID查询
 	GetIdentityByOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error)
-	// 通过type和PID查询
-	GetIdentityByTypeAndPID(context.Context, *common.PersonParam) (*IdentityInfo, error)
-	// 通过原公众号openID和appID查询
-	GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error)
+	// 通过openID和appID查询 未查到就创建
+	GetIdentityByOpenIDAndAppIDAndCreate(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error)
 	// 通过分组名和性别查询标签
 	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
 	// 通过标签IDs查询标签
@@ -257,6 +278,12 @@ type AccountServer interface {
 	CheckText(context.Context, *CheckTextRequest) (*CheckTextReply, error)
 	// 获取用户登录配置
 	GetUserLoginConfig(context.Context, *common.GetLoginConfigRequest) (*common.GetLoginConfigReply, error)
+	// 通过accountID获取Identify信息
+	GetIdentifyByAccountID(context.Context, *GetIdentifyByAccountIDRequest) (*GetIdentifyByAccountIDReply, error)
+	// 用户关注
+	UserSubscribe(context.Context, *OpenIDAndAppIDRequest) (*emptypb.Empty, error)
+	// 用户取关
+	UserUnsubscribe(context.Context, *OpenIDAndAppIDRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedAccountServer()
 }
 
@@ -282,11 +309,8 @@ func (UnimplementedAccountServer) RandomAvatarList(context.Context, *common.SexR
 func (UnimplementedAccountServer) GetIdentityByOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByOpenIDAndAppID not implemented")
 }
-func (UnimplementedAccountServer) GetIdentityByTypeAndPID(context.Context, *common.PersonParam) (*IdentityInfo, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByTypeAndPID not implemented")
-}
-func (UnimplementedAccountServer) GetIdentityByFromOpenIDAndAppID(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByFromOpenIDAndAppID not implemented")
+func (UnimplementedAccountServer) GetIdentityByOpenIDAndAppIDAndCreate(context.Context, *OpenIDAndAppIDRequest) (*IdentityInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetIdentityByOpenIDAndAppIDAndCreate not implemented")
 }
 func (UnimplementedAccountServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
@@ -318,6 +342,15 @@ func (UnimplementedAccountServer) CheckText(context.Context, *CheckTextRequest)
 func (UnimplementedAccountServer) GetUserLoginConfig(context.Context, *common.GetLoginConfigRequest) (*common.GetLoginConfigReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserLoginConfig not implemented")
 }
+func (UnimplementedAccountServer) GetIdentifyByAccountID(context.Context, *GetIdentifyByAccountIDRequest) (*GetIdentifyByAccountIDReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetIdentifyByAccountID not implemented")
+}
+func (UnimplementedAccountServer) UserSubscribe(context.Context, *OpenIDAndAppIDRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserSubscribe not implemented")
+}
+func (UnimplementedAccountServer) UserUnsubscribe(context.Context, *OpenIDAndAppIDRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserUnsubscribe not implemented")
+}
 func (UnimplementedAccountServer) mustEmbedUnimplementedAccountServer() {}
 
 // UnsafeAccountServer may be embedded to opt out of forward compatibility for this service.
@@ -439,38 +472,20 @@ func _Account_GetIdentityByOpenIDAndAppID_Handler(srv interface{}, ctx context.C
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Account_GetIdentityByTypeAndPID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.PersonParam)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AccountServer).GetIdentityByTypeAndPID(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.account.Account/GetIdentityByTypeAndPID",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AccountServer).GetIdentityByTypeAndPID(ctx, req.(*common.PersonParam))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Account_GetIdentityByFromOpenIDAndAppID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Account_GetIdentityByOpenIDAndAppIDAndCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(OpenIDAndAppIDRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(AccountServer).GetIdentityByFromOpenIDAndAppID(ctx, in)
+		return srv.(AccountServer).GetIdentityByOpenIDAndAppIDAndCreate(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/api.account.Account/GetIdentityByFromOpenIDAndAppID",
+		FullMethod: "/api.account.Account/GetIdentityByOpenIDAndAppIDAndCreate",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AccountServer).GetIdentityByFromOpenIDAndAppID(ctx, req.(*OpenIDAndAppIDRequest))
+		return srv.(AccountServer).GetIdentityByOpenIDAndAppIDAndCreate(ctx, req.(*OpenIDAndAppIDRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -655,6 +670,60 @@ func _Account_GetUserLoginConfig_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Account_GetIdentifyByAccountID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetIdentifyByAccountIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountServer).GetIdentifyByAccountID(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/GetIdentifyByAccountID",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).GetIdentifyByAccountID(ctx, req.(*GetIdentifyByAccountIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Account_UserSubscribe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(OpenIDAndAppIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountServer).UserSubscribe(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/UserSubscribe",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).UserSubscribe(ctx, req.(*OpenIDAndAppIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Account_UserUnsubscribe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(OpenIDAndAppIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountServer).UserUnsubscribe(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.account.Account/UserUnsubscribe",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServer).UserUnsubscribe(ctx, req.(*OpenIDAndAppIDRequest))
+	}
+	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)
@@ -687,12 +756,8 @@ var Account_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _Account_GetIdentityByOpenIDAndAppID_Handler,
 		},
 		{
-			MethodName: "GetIdentityByTypeAndPID",
-			Handler:    _Account_GetIdentityByTypeAndPID_Handler,
-		},
-		{
-			MethodName: "GetIdentityByFromOpenIDAndAppID",
-			Handler:    _Account_GetIdentityByFromOpenIDAndAppID_Handler,
+			MethodName: "GetIdentityByOpenIDAndAppIDAndCreate",
+			Handler:    _Account_GetIdentityByOpenIDAndAppIDAndCreate_Handler,
 		},
 		{
 			MethodName: "FindTagListBySex",
@@ -734,6 +799,18 @@ var Account_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "GetUserLoginConfig",
 			Handler:    _Account_GetUserLoginConfig_Handler,
 		},
+		{
+			MethodName: "GetIdentifyByAccountID",
+			Handler:    _Account_GetIdentifyByAccountID_Handler,
+		},
+		{
+			MethodName: "UserSubscribe",
+			Handler:    _Account_UserSubscribe_Handler,
+		},
+		{
+			MethodName: "UserUnsubscribe",
+			Handler:    _Account_UserUnsubscribe_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "account.proto",

api/chat/chat.proto

@@ -13,7 +13,7 @@ option java_package = "api.chat";
 
 service Chat {
   // 检查用户是否与接待员聊天
-  rpc CheckUserPartnerIsRelationship (common.UserAndPartnerIdentifyIdParam) returns (CheckUserPartnerIsRelationshipReply);
+  rpc CheckUserPartnerIsRelationship (common.UserIDsParam) returns (CheckUserPartnerIsRelationshipReply);
   // 创建聊天房间
   rpc CreateChatRoom (CreateChatRoomParam) returns (RoomReply);
   // 查询在线人的列表
@@ -40,7 +40,7 @@ service Chat {
   // 房间信息
   rpc FindRoomCardMsg (FindRoomCardMsgRequest) returns (common.RoomChatMsg){};
   // 查询未处理的数据
-  rpc FindNotReplyNum (common.IdentifyIdRequest) returns (FindNotReplyNumReply){};
+  rpc FindNotReplyNum (common.PersonIDParam) returns (FindNotReplyNumReply){};
   // 创建纸条
   rpc CreateScrip (common.CreateScripRequest) returns (common.ScripID){};
   // 删除纸条
@@ -78,13 +78,13 @@ service Chat {
   // 获取在线人数
   rpc GetOnlinePersonNum (google.protobuf.Empty) returns (GetOnlinePersonNumReply){};
   // 查询用户全部的未读数
-  rpc FindUserAllUnreadNum (common.IdentifyIdRequest) returns (UnreadNumReply){};
+  rpc FindUserAllUnreadNum (common.PersonIDParam) returns (UnreadNumReply){};
   // 查询接待员全部的未读数
-  rpc FindPartnerAllUnreadNum (common.IdentifyIdRequest) returns (UnreadNumReply){};
+  rpc FindPartnerAllUnreadNum (common.PersonIDParam) returns (UnreadNumReply){};
   // 用户查询与某人的房间
-  rpc GetUserRoomByPerson (common.IdentifyIDsParam) returns (UserRoomInfo){};
+  rpc GetUserRoomByPerson (common.UserIDsParam) returns (UserRoomInfo){};
   // 接待员查询与某人的房间
-  rpc GetPartnerRoomByPerson (common.IdentifyIDsParam) returns (PartnerRoomInfo){};
+  rpc GetPartnerRoomByPerson (common.UserIDsParam) returns (PartnerRoomInfo){};
   // 管理员查询房间列表
   rpc ManagerFindRoomList (common.ManagerFindRoomListRequest) returns (common.ManagerFindRoomListReply){};
   // 管理员查询聊天记录
@@ -110,7 +110,6 @@ message GetOnlinePersonNumReply{
 message GetMatchingPartnerInfoRequest{
   int64 sex = 1;// 性别
   string userID = 2; // 用户ID
-  string identifyId = 3;// 身份ID
   string openId = 4;
   string appId = 5;
 }
@@ -122,15 +121,12 @@ message GetRoomProfitReply{
 message UserUnlockRequest{
   int64 roomId = 1;// 房间ID
   string personId = 2;
-  string personType = 3;
-  string identifyId = 4;
 }
 
 message PartnerCollectIDsRequest{
   repeated int64 chatRecordIds = 1;// 记录ID
   string personId = 2;
   string personType = 3;
-  string identifyId = 4;
   int64 roomId = 5;// 房间ID
 }
 
@@ -166,12 +162,11 @@ message FindRecommendPersonListRequest{
   bool isRefresh = 2; // 是否刷新
   string personID = 3; // 查询目标的ID
   string personType = 4; // 类型
-  string identifyId = 5;// 身份ID
 }
 
 message FindRoomCardMsgRequest{
-  string userIdentifyId = 1; // 身份ID
-  string partnerIdentifyId = 2; // 身份ID
+  string userId = 1; // 身份ID
+  string partnerId = 2; // 身份ID
 }
 
 message PartnerGetAwardReply {
@@ -179,16 +174,15 @@ message PartnerGetAwardReply {
 }
 
 message PartnerGetAwardRequest{
-  string userIdentifyId = 1; // 身份ID
-  string partnerIdentifyId = 2; // 身份ID
+  string userId = 1; // 用户ID
   string awardType = 3;
-  string partnerId = 4;
+  string partnerId = 4;// 接待员ID
 }
 
 message PartnerFindRoomListRequest {
   int64 nextId = 1;
   int64 offset = 2;
-  string IdentifyId = 3;
+  string personId = 3;
   bool isFindNotReply = 4; // 是否查询没回复过的内容
   bool isWithinSevenDay = 5; // 是否在七日内
 }
@@ -196,7 +190,7 @@ message PartnerFindRoomListRequest {
 message UserFindRoomListRequest {
   int64 nextId = 1;
   int64 offset = 2;
-  string IdentifyId = 3;
+  string personId = 3;
   bool isWithinSevenDay = 4; // 是否在七日内
 }
 
@@ -239,16 +233,14 @@ message PartnerRoomInfo{
 
 message CreateChatRoomParam {
   string personId1 = 1;
-  string personIdentifyID1 = 2; // 身份ID
   string personType1 = 3; // 类型
   string personId2 = 4;
-  string personIdentifyID2 = 5; // 身份ID
   string personType2 = 6; // 类型
   string source = 7;// 来源
 }
 
 message SetBlackChatParam {
-  string personIdentifyId = 1; // 拉黑者的身份ID
+  string personId = 1; // 拉黑者的身份ID
   int64 roomId = 2; // 房间ID
 }
 

api/chat/chat_grpc.pb.go

@@ -21,7 +21,7 @@ const _ = grpc.SupportPackageIsVersion7
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type ChatClient interface {
 	// 检查用户是否与接待员聊天
-	CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdentifyIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error)
+	CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error)
 	// 创建聊天房间
 	CreateChatRoom(ctx context.Context, in *CreateChatRoomParam, opts ...grpc.CallOption) (*RoomReply, error)
 	// 查询在线人的列表
@@ -48,7 +48,7 @@ type ChatClient interface {
 	// 房间信息
 	FindRoomCardMsg(ctx context.Context, in *FindRoomCardMsgRequest, opts ...grpc.CallOption) (*common.RoomChatMsg, error)
 	// 查询未处理的数据
-	FindNotReplyNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*FindNotReplyNumReply, error)
+	FindNotReplyNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*FindNotReplyNumReply, error)
 	// 创建纸条
 	CreateScrip(ctx context.Context, in *common.CreateScripRequest, opts ...grpc.CallOption) (*common.ScripID, error)
 	// 删除纸条
@@ -86,13 +86,13 @@ type ChatClient interface {
 	// 获取在线人数
 	GetOnlinePersonNum(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetOnlinePersonNumReply, error)
 	// 查询用户全部的未读数
-	FindUserAllUnreadNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*UnreadNumReply, error)
+	FindUserAllUnreadNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*UnreadNumReply, error)
 	// 查询接待员全部的未读数
-	FindPartnerAllUnreadNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*UnreadNumReply, error)
+	FindPartnerAllUnreadNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*UnreadNumReply, error)
 	// 用户查询与某人的房间
-	GetUserRoomByPerson(ctx context.Context, in *common.IdentifyIDsParam, opts ...grpc.CallOption) (*UserRoomInfo, error)
+	GetUserRoomByPerson(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*UserRoomInfo, error)
 	// 接待员查询与某人的房间
-	GetPartnerRoomByPerson(ctx context.Context, in *common.IdentifyIDsParam, opts ...grpc.CallOption) (*PartnerRoomInfo, error)
+	GetPartnerRoomByPerson(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*PartnerRoomInfo, error)
 	// 管理员查询房间列表
 	ManagerFindRoomList(ctx context.Context, in *common.ManagerFindRoomListRequest, opts ...grpc.CallOption) (*common.ManagerFindRoomListReply, error)
 	// 管理员查询聊天记录
@@ -119,7 +119,7 @@ func NewChatClient(cc grpc.ClientConnInterface) ChatClient {
 	return &chatClient{cc}
 }
 
-func (c *chatClient) CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdentifyIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error) {
+func (c *chatClient) CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error) {
 	out := new(CheckUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/CheckUserPartnerIsRelationship", in, out, opts...)
 	if err != nil {
@@ -245,7 +245,7 @@ func (c *chatClient) FindRoomCardMsg(ctx context.Context, in *FindRoomCardMsgReq
 	return out, nil
 }
 
-func (c *chatClient) FindNotReplyNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*FindNotReplyNumReply, error) {
+func (c *chatClient) FindNotReplyNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*FindNotReplyNumReply, error) {
 	out := new(FindNotReplyNumReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindNotReplyNum", in, out, opts...)
 	if err != nil {
@@ -416,7 +416,7 @@ func (c *chatClient) GetOnlinePersonNum(ctx context.Context, in *emptypb.Empty,
 	return out, nil
 }
 
-func (c *chatClient) FindUserAllUnreadNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*UnreadNumReply, error) {
+func (c *chatClient) FindUserAllUnreadNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*UnreadNumReply, error) {
 	out := new(UnreadNumReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindUserAllUnreadNum", in, out, opts...)
 	if err != nil {
@@ -425,7 +425,7 @@ func (c *chatClient) FindUserAllUnreadNum(ctx context.Context, in *common.Identi
 	return out, nil
 }
 
-func (c *chatClient) FindPartnerAllUnreadNum(ctx context.Context, in *common.IdentifyIdRequest, opts ...grpc.CallOption) (*UnreadNumReply, error) {
+func (c *chatClient) FindPartnerAllUnreadNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*UnreadNumReply, error) {
 	out := new(UnreadNumReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/FindPartnerAllUnreadNum", in, out, opts...)
 	if err != nil {
@@ -434,7 +434,7 @@ func (c *chatClient) FindPartnerAllUnreadNum(ctx context.Context, in *common.Ide
 	return out, nil
 }
 
-func (c *chatClient) GetUserRoomByPerson(ctx context.Context, in *common.IdentifyIDsParam, opts ...grpc.CallOption) (*UserRoomInfo, error) {
+func (c *chatClient) GetUserRoomByPerson(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*UserRoomInfo, error) {
 	out := new(UserRoomInfo)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/GetUserRoomByPerson", in, out, opts...)
 	if err != nil {
@@ -443,7 +443,7 @@ func (c *chatClient) GetUserRoomByPerson(ctx context.Context, in *common.Identif
 	return out, nil
 }
 
-func (c *chatClient) GetPartnerRoomByPerson(ctx context.Context, in *common.IdentifyIDsParam, opts ...grpc.CallOption) (*PartnerRoomInfo, error) {
+func (c *chatClient) GetPartnerRoomByPerson(ctx context.Context, in *common.UserIDsParam, opts ...grpc.CallOption) (*PartnerRoomInfo, error) {
 	out := new(PartnerRoomInfo)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/GetPartnerRoomByPerson", in, out, opts...)
 	if err != nil {
@@ -529,7 +529,7 @@ func (c *chatClient) ManagerFindReportDetailsList(ctx context.Context, in *commo
 // for forward compatibility
 type ChatServer interface {
 	// 检查用户是否与接待员聊天
-	CheckUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdentifyIdParam) (*CheckUserPartnerIsRelationshipReply, error)
+	CheckUserPartnerIsRelationship(context.Context, *common.UserIDsParam) (*CheckUserPartnerIsRelationshipReply, error)
 	// 创建聊天房间
 	CreateChatRoom(context.Context, *CreateChatRoomParam) (*RoomReply, error)
 	// 查询在线人的列表
@@ -556,7 +556,7 @@ type ChatServer interface {
 	// 房间信息
 	FindRoomCardMsg(context.Context, *FindRoomCardMsgRequest) (*common.RoomChatMsg, error)
 	// 查询未处理的数据
-	FindNotReplyNum(context.Context, *common.IdentifyIdRequest) (*FindNotReplyNumReply, error)
+	FindNotReplyNum(context.Context, *common.PersonIDParam) (*FindNotReplyNumReply, error)
 	// 创建纸条
 	CreateScrip(context.Context, *common.CreateScripRequest) (*common.ScripID, error)
 	// 删除纸条
@@ -594,13 +594,13 @@ type ChatServer interface {
 	// 获取在线人数
 	GetOnlinePersonNum(context.Context, *emptypb.Empty) (*GetOnlinePersonNumReply, error)
 	// 查询用户全部的未读数
-	FindUserAllUnreadNum(context.Context, *common.IdentifyIdRequest) (*UnreadNumReply, error)
+	FindUserAllUnreadNum(context.Context, *common.PersonIDParam) (*UnreadNumReply, error)
 	// 查询接待员全部的未读数
-	FindPartnerAllUnreadNum(context.Context, *common.IdentifyIdRequest) (*UnreadNumReply, error)
+	FindPartnerAllUnreadNum(context.Context, *common.PersonIDParam) (*UnreadNumReply, error)
 	// 用户查询与某人的房间
-	GetUserRoomByPerson(context.Context, *common.IdentifyIDsParam) (*UserRoomInfo, error)
+	GetUserRoomByPerson(context.Context, *common.UserIDsParam) (*UserRoomInfo, error)
 	// 接待员查询与某人的房间
-	GetPartnerRoomByPerson(context.Context, *common.IdentifyIDsParam) (*PartnerRoomInfo, error)
+	GetPartnerRoomByPerson(context.Context, *common.UserIDsParam) (*PartnerRoomInfo, error)
 	// 管理员查询房间列表
 	ManagerFindRoomList(context.Context, *common.ManagerFindRoomListRequest) (*common.ManagerFindRoomListReply, error)
 	// 管理员查询聊天记录
@@ -624,7 +624,7 @@ type ChatServer interface {
 type UnimplementedChatServer struct {
 }
 
-func (UnimplementedChatServer) CheckUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdentifyIdParam) (*CheckUserPartnerIsRelationshipReply, error) {
+func (UnimplementedChatServer) CheckUserPartnerIsRelationship(context.Context, *common.UserIDsParam) (*CheckUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckUserPartnerIsRelationship not implemented")
 }
 func (UnimplementedChatServer) CreateChatRoom(context.Context, *CreateChatRoomParam) (*RoomReply, error) {
@@ -666,7 +666,7 @@ func (UnimplementedChatServer) PartnerGetAward(context.Context, *PartnerGetAward
 func (UnimplementedChatServer) FindRoomCardMsg(context.Context, *FindRoomCardMsgRequest) (*common.RoomChatMsg, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindRoomCardMsg not implemented")
 }
-func (UnimplementedChatServer) FindNotReplyNum(context.Context, *common.IdentifyIdRequest) (*FindNotReplyNumReply, error) {
+func (UnimplementedChatServer) FindNotReplyNum(context.Context, *common.PersonIDParam) (*FindNotReplyNumReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindNotReplyNum not implemented")
 }
 func (UnimplementedChatServer) CreateScrip(context.Context, *common.CreateScripRequest) (*common.ScripID, error) {
@@ -723,16 +723,16 @@ func (UnimplementedChatServer) GetRoomProfit(context.Context, *common.RoomIDRequ
 func (UnimplementedChatServer) GetOnlinePersonNum(context.Context, *emptypb.Empty) (*GetOnlinePersonNumReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetOnlinePersonNum not implemented")
 }
-func (UnimplementedChatServer) FindUserAllUnreadNum(context.Context, *common.IdentifyIdRequest) (*UnreadNumReply, error) {
+func (UnimplementedChatServer) FindUserAllUnreadNum(context.Context, *common.PersonIDParam) (*UnreadNumReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserAllUnreadNum not implemented")
 }
-func (UnimplementedChatServer) FindPartnerAllUnreadNum(context.Context, *common.IdentifyIdRequest) (*UnreadNumReply, error) {
+func (UnimplementedChatServer) FindPartnerAllUnreadNum(context.Context, *common.PersonIDParam) (*UnreadNumReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindPartnerAllUnreadNum not implemented")
 }
-func (UnimplementedChatServer) GetUserRoomByPerson(context.Context, *common.IdentifyIDsParam) (*UserRoomInfo, error) {
+func (UnimplementedChatServer) GetUserRoomByPerson(context.Context, *common.UserIDsParam) (*UserRoomInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserRoomByPerson not implemented")
 }
-func (UnimplementedChatServer) GetPartnerRoomByPerson(context.Context, *common.IdentifyIDsParam) (*PartnerRoomInfo, error) {
+func (UnimplementedChatServer) GetPartnerRoomByPerson(context.Context, *common.UserIDsParam) (*PartnerRoomInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerRoomByPerson not implemented")
 }
 func (UnimplementedChatServer) ManagerFindRoomList(context.Context, *common.ManagerFindRoomListRequest) (*common.ManagerFindRoomListReply, error) {
@@ -773,7 +773,7 @@ func RegisterChatServer(s grpc.ServiceRegistrar, srv ChatServer) {
 }
 
 func _Chat_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.UserAndPartnerIdentifyIdParam)
+	in := new(common.UserIDsParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -785,7 +785,7 @@ func _Chat_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.C
 		FullMethod: "/api.chat.Chat/CheckUserPartnerIsRelationship",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).CheckUserPartnerIsRelationship(ctx, req.(*common.UserAndPartnerIdentifyIdParam))
+		return srv.(ChatServer).CheckUserPartnerIsRelationship(ctx, req.(*common.UserIDsParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1025,7 +1025,7 @@ func _Chat_FindRoomCardMsg_Handler(srv interface{}, ctx context.Context, dec fun
 }
 
 func _Chat_FindNotReplyNum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.IdentifyIdRequest)
+	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1037,7 +1037,7 @@ func _Chat_FindNotReplyNum_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/api.chat.Chat/FindNotReplyNum",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).FindNotReplyNum(ctx, req.(*common.IdentifyIdRequest))
+		return srv.(ChatServer).FindNotReplyNum(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1367,7 +1367,7 @@ func _Chat_GetOnlinePersonNum_Handler(srv interface{}, ctx context.Context, dec
 }
 
 func _Chat_FindUserAllUnreadNum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.IdentifyIdRequest)
+	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1379,13 +1379,13 @@ func _Chat_FindUserAllUnreadNum_Handler(srv interface{}, ctx context.Context, de
 		FullMethod: "/api.chat.Chat/FindUserAllUnreadNum",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).FindUserAllUnreadNum(ctx, req.(*common.IdentifyIdRequest))
+		return srv.(ChatServer).FindUserAllUnreadNum(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Chat_FindPartnerAllUnreadNum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.IdentifyIdRequest)
+	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1397,13 +1397,13 @@ func _Chat_FindPartnerAllUnreadNum_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.chat.Chat/FindPartnerAllUnreadNum",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).FindPartnerAllUnreadNum(ctx, req.(*common.IdentifyIdRequest))
+		return srv.(ChatServer).FindPartnerAllUnreadNum(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Chat_GetUserRoomByPerson_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.IdentifyIDsParam)
+	in := new(common.UserIDsParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1415,13 +1415,13 @@ func _Chat_GetUserRoomByPerson_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/api.chat.Chat/GetUserRoomByPerson",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).GetUserRoomByPerson(ctx, req.(*common.IdentifyIDsParam))
+		return srv.(ChatServer).GetUserRoomByPerson(ctx, req.(*common.UserIDsParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Chat_GetPartnerRoomByPerson_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.IdentifyIDsParam)
+	in := new(common.UserIDsParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1433,7 +1433,7 @@ func _Chat_GetPartnerRoomByPerson_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.chat.Chat/GetPartnerRoomByPerson",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).GetPartnerRoomByPerson(ctx, req.(*common.IdentifyIDsParam))
+		return srv.(ChatServer).GetPartnerRoomByPerson(ctx, req.(*common.UserIDsParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/common/common.proto

@@ -137,7 +137,6 @@ message PersonMsg {
   int64 weight = 16;// 权重
   string workingStatus = 17;// 工作状态
   int64 lastScripID = 18;// 上次观看小纸条ID
-  string identifyId = 19;// 身份ID
 }
 
 message LookedAndLikedNum{
@@ -191,7 +190,6 @@ message PersonDB{
   string signature = 12;//介绍
   bool isFinishInformation = 13;//是否完善消息
   repeated int64 tagList = 14;// 标签列表
-  string identifyId = 15;// 身份ID
   int64 personId = 16;// 用户id（number）
 }
 
@@ -271,7 +269,6 @@ message GetMatchingPartnerInfoReply{
   string nickname = 2;// 昵称
   string avatarUrl =3;// 头像链接
   int64 sex = 4;// 性别
-  string identifyId = 5;// 身份ID
   string personType = 6;// 身份类型
 }
 
@@ -415,10 +412,8 @@ message ReportChatRequest{
 }
 
 message ReportRequest{
-  string identifyId = 1;// 发起举报的人的身份ID
   string personId = 2; // 发起举报的人的ID
   string personType = 3; // 发起举报的人的类型
-  string reportedIdentifyId = 4; // 被举报的人的身份ID
   string reportedPersonId = 5; // 被举报的人的ID
   string reportedPersonType = 6; // 被举报的人的类型
   string contactInformation = 7; // 联系方式
@@ -465,17 +460,13 @@ message FindRecommendRequest{
   int64 num = 1;// 数量
   string type = 2;// 类型
   int64 sex = 3;
-  string identifyId = 4;// 发起举报的人的身份ID
+  string personId = 4;// ID
 }
 
 message FindOverSevenDayAvatarReply{
   repeated string list = 1;// 头像列表
 }
 
-message IdentifyIdRequest{
-  string identifyId = 1;// 发起举报的人的身份ID
-}
-
 message PersonLookScripRequest{
   string personId = 1;
   string personType = 2;
@@ -535,7 +526,6 @@ message DeleteScripRequest {
 message CreateScripRequest {
   string personId = 1;
   string personType = 2;
-  string PersonIdentifyId = 3;
   string text = 4;
   string pictureUrl = 5;
 }
@@ -547,7 +537,6 @@ message ScripID {
 message ReplyScripRequest {
   string personId = 1;
   string personType = 2;
-  string PersonIdentifyId = 3;
   int64 scripId = 4; // 小纸条ID
   Message message = 5; // 回复内容
   string msgType = 6;
@@ -565,14 +554,13 @@ message UpdateLastScripIDDBRequest{
 message MatchingRequest{
   string personId = 1; // 查询目标的ID
   string personType = 2; // 类型
-  string identifyId = 3; // 身份ID
   int64 sex = 4;// 性别
   bool isNeedCheckSex = 5;// 是否跟性别强相关
 }
 
-message IdentifyIDsParam{
-  string myIdentifyID = 1;
-  string otherIdentifyID = 2;
+message UserIDsParam{
+  string myUserID = 1;
+  string otherUserID = 2;
 }
 
 message ManagerFindPersonListReply {
@@ -603,7 +591,6 @@ message ManagerFindPersonInfo {
   bool isBlack = 15;// 是否被封禁
   int64 weight = 16;// 权重
   int64 lastLoginTime = 17;// 上次登录时间
-  string identifyId = 19;// 身份ID
   int64 personId = 13; // 用户id（Number）
 }
 

api/statistics/statistics.pb.go

@@ -579,10 +579,9 @@ type GetLookAndLikeListRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PersonID   string `protobuf:"bytes,1,opt,name=personID,proto3" json:"personID"`     // 查询目标的ID
-	PersonType string `protobuf:"bytes,2,opt,name=personType,proto3" json:"personType"` // 类型
-	NextId     int64  `protobuf:"varint,3,opt,name=nextId,proto3" json:"nextId"`
-	Offset     int64  `protobuf:"varint,4,opt,name=offset,proto3" json:"offset"`
+	PersonID string `protobuf:"bytes,1,opt,name=personID,proto3" json:"personID"` // 查询目标的ID
+	NextId   int64  `protobuf:"varint,3,opt,name=nextId,proto3" json:"nextId"`
+	Offset   int64  `protobuf:"varint,4,opt,name=offset,proto3" json:"offset"`
 }
 
 func (x *GetLookAndLikeListRequest) Reset() {
@@ -624,13 +623,6 @@ func (x *GetLookAndLikeListRequest) GetPersonID() string {
 	return ""
 }
 
-func (x *GetLookAndLikeListRequest) GetPersonType() string {
-	if x != nil {
-		return x.PersonType
-	}
-	return ""
-}
-
 func (x *GetLookAndLikeListRequest) GetNextId() int64 {
 	if x != nil {
 		return x.NextId
@@ -866,6 +858,61 @@ func (x *PersonMessage) GetBePersonType() string {
 	return ""
 }
 
+type UnlockLookRecordRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PersonID   string `protobuf:"bytes,1,opt,name=personID,proto3" json:"personID"`     // 关注者、浏览者的ID
+	BePersonID string `protobuf:"bytes,2,opt,name=bePersonID,proto3" json:"bePersonID"` // 被关注者、被浏览者的ID
+}
+
+func (x *UnlockLookRecordRequest) Reset() {
+	*x = UnlockLookRecordRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_statistics_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UnlockLookRecordRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UnlockLookRecordRequest) ProtoMessage() {}
+
+func (x *UnlockLookRecordRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_statistics_proto_msgTypes[12]
+	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 UnlockLookRecordRequest.ProtoReflect.Descriptor instead.
+func (*UnlockLookRecordRequest) Descriptor() ([]byte, []int) {
+	return file_statistics_proto_rawDescGZIP(), []int{12}
+}
+
+func (x *UnlockLookRecordRequest) GetPersonID() string {
+	if x != nil {
+		return x.PersonID
+	}
+	return ""
+}
+
+func (x *UnlockLookRecordRequest) GetBePersonID() string {
+	if x != nil {
+		return x.BePersonID
+	}
+	return ""
+}
+
 type ReceptionMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -878,7 +925,7 @@ type ReceptionMessage struct {
 func (x *ReceptionMessage) Reset() {
 	*x = ReceptionMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_statistics_proto_msgTypes[12]
+		mi := &file_statistics_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -891,7 +938,7 @@ func (x *ReceptionMessage) String() string {
 func (*ReceptionMessage) ProtoMessage() {}
 
 func (x *ReceptionMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_statistics_proto_msgTypes[12]
+	mi := &file_statistics_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -904,7 +951,7 @@ func (x *ReceptionMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReceptionMessage.ProtoReflect.Descriptor instead.
 func (*ReceptionMessage) Descriptor() ([]byte, []int) {
-	return file_statistics_proto_rawDescGZIP(), []int{12}
+	return file_statistics_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *ReceptionMessage) GetPartnerID() string {
@@ -1000,87 +1047,91 @@ var file_statistics_proto_rawDesc = []byte{
 	0x63, 0x69, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x18, 0x0e,
 	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x18, 0x0a, 0x07,
 	0x74, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74,
-	0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x87, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4c, 0x6f,
-	0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
+	0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x67, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x6f,
+	0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12,
+	0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x22,
+	0xdd, 0x01, 0x0a, 0x17, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c,
+	0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x69,
+	0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75,
+	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75,
+	0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64,
+	0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6c, 0x69, 0x6b, 0x65, 0x64,
+	0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f,
+	0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b,
+	0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61,
+	0x64, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b,
+	0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x76, 0x61,
+	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0d, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x22,
+	0x76, 0x0a, 0x10, 0x4c, 0x6f, 0x6f, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a,
+	0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64,
+	0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x74, 0x6f, 0x64, 0x61, 0x79, 0x4c, 0x6f, 0x6f, 0x6b,
+	0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x74, 0x6f, 0x64, 0x61, 0x79,
+	0x4c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0x8f, 0x01, 0x0a, 0x0d, 0x50, 0x65, 0x72, 0x73,
+	0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72,
+	0x73, 0x6f, 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, 0x1e, 0x0a, 0x0a, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f,
+	0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x65, 0x50, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f,
+	0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x65, 0x50,
+	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x55, 0x0a, 0x17, 0x55, 0x6e, 0x6c,
+	0x6f, 0x63, 0x6b, 0x4c, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
 	0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 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, 0x16, 0x0a, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x06, 0x6e, 0x65, 0x78, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73,
-	0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
-	0x22, 0xdd, 0x01, 0x0a, 0x17, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65,
-	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07,
-	0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c,
-	0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e,
-	0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e,
-	0x75, 0x6d, 0x12, 0x26, 0x0a, 0x0e, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x55, 0x6e, 0x72, 0x65, 0x61,
-	0x64, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x6c, 0x69, 0x6b, 0x65,
-	0x64, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f,
-	0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f,
-	0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65,
-	0x61, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6c, 0x6f, 0x6f,
-	0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x76,
-	0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0d, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x4c, 0x69, 0x73, 0x74,
-	0x22, 0x76, 0x0a, 0x10, 0x4c, 0x6f, 0x6f, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x24,
-	0x0a, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6c, 0x6f, 0x6f, 0x6b, 0x55, 0x6e, 0x72, 0x65, 0x61,
-	0x64, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x74, 0x6f, 0x64, 0x61, 0x79, 0x4c, 0x6f, 0x6f,
-	0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x74, 0x6f, 0x64, 0x61,
-	0x79, 0x4c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0x8f, 0x01, 0x0a, 0x0d, 0x50, 0x65, 0x72,
-	0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65,
-	0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65,
-	0x72, 0x73, 0x6f, 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, 0x1e, 0x0a, 0x0a, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x65, 0x50, 0x65,
-	0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x65,
-	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x48, 0x0a, 0x10, 0x52, 0x65,
-	0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1c,
-	0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06,
-	0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
-	0x65, 0x72, 0x49, 0x44, 0x32, 0xe8, 0x0b, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74,
-	0x69, 0x63, 0x73, 0x12, 0x43, 0x0a, 0x0a, 0x4c, 0x6f, 0x6f, 0x6b, 0x50, 0x65, 0x72, 0x73, 0x6f,
-	0x6e, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69,
-	0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	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, 0x43, 0x0a, 0x0a, 0x4c, 0x69, 0x6b, 0x65,
-	0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61,
-	0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x45, 0x0a,
-	0x0c, 0x55, 0x6e, 0x4c, 0x69, 0x6b, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x12, 0x1d, 0x2e,
+	0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x44,
+	0x22, 0x48, 0x0a, 0x10, 0x52, 0x65, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
+	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x32, 0xf2, 0x0b, 0x0a, 0x0a, 0x53,
+	0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x43, 0x0a, 0x0a, 0x4c, 0x6f, 0x6f,
+	0x6b, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74,
+	0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x43,
+	0x0a, 0x0a, 0x4c, 0x69, 0x6b, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x50, 0x65,
+	0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x45, 0x0a, 0x0c, 0x55, 0x6e, 0x4c, 0x69, 0x6b, 0x65, 0x50, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73,
+	0x74, 0x69, 0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 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, 0x82, 0x01, 0x0a, 0x1f, 0x47,
+	0x65, 0x74, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x53, 0x74, 0x61,
+	0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e,
+	0x47, 0x65, 0x74, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61,
+	0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c,
+	0x69, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+	0x55, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x6f, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73,
+	0x74, 0x69, 0x63, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69,
+	0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x4c, 0x0a, 0x13, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65,
+	0x4c, 0x69, 0x6b, 0x65, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x1d, 0x2e,
 	0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x50,
 	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x82, 0x01, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x6f, 0x6b,
-	0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63,
-	0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f, 0x6f,
-	0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69,
-	0x63, 0x73, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x27, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63,
-	0x73, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x41, 0x6e, 0x64, 0x4c, 0x69, 0x6b, 0x65, 0x4d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x55, 0x0a, 0x18, 0x47, 0x65, 0x74,
-	0x4c, 0x6f, 0x6f, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x20,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e,
-	0x4c, 0x6f, 0x6f, 0x6b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x4c, 0x0a, 0x13, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x4c, 0x69, 0x6b, 0x65, 0x55, 0x6e,
-	0x72, 0x65, 0x61, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74,
-	0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x10, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4c, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74,
-	0x69, 0x63, 0x73, 0x2e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x6d, 0x70, 0x74, 0x79, 0x12, 0x53, 0x0a, 0x10, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4c, 0x6f,
+	0x6f, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x27, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x73,
+	0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b,
+	0x4c, 0x6f, 0x6f, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x12, 0x5f, 0x0a, 0x0c, 0x46, 0x69, 0x6e,
 	0x64, 0x4c, 0x6f, 0x6f, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e,
 	0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x6f,
@@ -1159,7 +1210,7 @@ func file_statistics_proto_rawDescGZIP() []byte {
 	return file_statistics_proto_rawDescData
 }
 
-var file_statistics_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_statistics_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_statistics_proto_goTypes = []interface{}{
 	(*GetPartnerReplyMsgReply)(nil),                // 0: api.statistics.GetPartnerReplyMsgReply
 	(*PartnerReplyUserRequest)(nil),                // 1: api.statistics.PartnerReplyUserRequest
@@ -1173,11 +1224,12 @@ var file_statistics_proto_goTypes = []interface{}{
 	(*LookAndLikeMessageReply)(nil),                // 9: api.statistics.LookAndLikeMessageReply
 	(*LookMessageReply)(nil),                       // 10: api.statistics.LookMessageReply
 	(*PersonMessage)(nil),                          // 11: api.statistics.PersonMessage
-	(*ReceptionMessage)(nil),                       // 12: api.statistics.ReceptionMessage
-	(*common.PersonParam)(nil),                     // 13: api.common.PersonParam
-	(*common.PartnerIDParam)(nil),                  // 14: api.common.PartnerIDParam
-	(*emptypb.Empty)(nil),                          // 15: google.protobuf.Empty
-	(*common.IsLike)(nil),                          // 16: api.common.IsLike
+	(*UnlockLookRecordRequest)(nil),                // 12: api.statistics.UnlockLookRecordRequest
+	(*ReceptionMessage)(nil),                       // 13: api.statistics.ReceptionMessage
+	(*common.PersonParam)(nil),                     // 14: api.common.PersonParam
+	(*common.PartnerIDParam)(nil),                  // 15: api.common.PartnerIDParam
+	(*emptypb.Empty)(nil),                          // 16: google.protobuf.Empty
+	(*common.IsLike)(nil),                          // 17: api.common.IsLike
 }
 var file_statistics_proto_depIdxs = []int32{
 	7,  // 0: api.statistics.LookAndLikeListReply.list:type_name -> api.statistics.LookAndLikeListInfo
@@ -1185,37 +1237,37 @@ var file_statistics_proto_depIdxs = []int32{
 	11, // 2: api.statistics.Statistics.LikePerson:input_type -> api.statistics.PersonMessage
 	11, // 3: api.statistics.Statistics.UnLikePerson:input_type -> api.statistics.PersonMessage
 	3,  // 4: api.statistics.Statistics.GetLookAndLikeStatisticsMessage:input_type -> api.statistics.GetLookAndLikeStatisticsMessageRequest
-	13, // 5: api.statistics.Statistics.GetLookStatisticsMessage:input_type -> api.common.PersonParam
+	14, // 5: api.statistics.Statistics.GetLookStatisticsMessage:input_type -> api.common.PersonParam
 	11, // 6: api.statistics.Statistics.ReduceLikeUnreadNum:input_type -> api.statistics.PersonMessage
-	11, // 7: api.statistics.Statistics.UnlockLookRecord:input_type -> api.statistics.PersonMessage
+	12, // 7: api.statistics.Statistics.UnlockLookRecord:input_type -> api.statistics.UnlockLookRecordRequest
 	8,  // 8: api.statistics.Statistics.FindLookList:input_type -> api.statistics.GetLookAndLikeListRequest
 	8,  // 9: api.statistics.Statistics.FindLikeList:input_type -> api.statistics.GetLookAndLikeListRequest
 	8,  // 10: api.statistics.Statistics.FindLikedList:input_type -> api.statistics.GetLookAndLikeListRequest
-	12, // 11: api.statistics.Statistics.ReceptionPerson:input_type -> api.statistics.ReceptionMessage
+	13, // 11: api.statistics.Statistics.ReceptionPerson:input_type -> api.statistics.ReceptionMessage
 	2,  // 12: api.statistics.Statistics.AddTodayProfit:input_type -> api.statistics.AddTodayProfitRequest
-	14, // 13: api.statistics.Statistics.GetReceptionMsg:input_type -> api.common.PartnerIDParam
-	14, // 14: api.statistics.Statistics.GetTodayProfit:input_type -> api.common.PartnerIDParam
+	15, // 13: api.statistics.Statistics.GetReceptionMsg:input_type -> api.common.PartnerIDParam
+	15, // 14: api.statistics.Statistics.GetTodayProfit:input_type -> api.common.PartnerIDParam
 	11, // 15: api.statistics.Statistics.GetIsLike:input_type -> api.statistics.PersonMessage
-	14, // 16: api.statistics.Statistics.UserSendToPartner:input_type -> api.common.PartnerIDParam
+	15, // 16: api.statistics.Statistics.UserSendToPartner:input_type -> api.common.PartnerIDParam
 	1,  // 17: api.statistics.Statistics.PartnerReplyUser:input_type -> api.statistics.PartnerReplyUserRequest
-	14, // 18: api.statistics.Statistics.GetPartnerReplyMsg:input_type -> api.common.PartnerIDParam
-	15, // 19: api.statistics.Statistics.LookPerson:output_type -> google.protobuf.Empty
-	15, // 20: api.statistics.Statistics.LikePerson:output_type -> google.protobuf.Empty
-	15, // 21: api.statistics.Statistics.UnLikePerson:output_type -> google.protobuf.Empty
+	15, // 18: api.statistics.Statistics.GetPartnerReplyMsg:input_type -> api.common.PartnerIDParam
+	16, // 19: api.statistics.Statistics.LookPerson:output_type -> google.protobuf.Empty
+	16, // 20: api.statistics.Statistics.LikePerson:output_type -> google.protobuf.Empty
+	16, // 21: api.statistics.Statistics.UnLikePerson:output_type -> google.protobuf.Empty
 	9,  // 22: api.statistics.Statistics.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
 	10, // 23: api.statistics.Statistics.GetLookStatisticsMessage:output_type -> api.statistics.LookMessageReply
-	15, // 24: api.statistics.Statistics.ReduceLikeUnreadNum:output_type -> google.protobuf.Empty
-	15, // 25: api.statistics.Statistics.UnlockLookRecord:output_type -> google.protobuf.Empty
+	16, // 24: api.statistics.Statistics.ReduceLikeUnreadNum:output_type -> google.protobuf.Empty
+	16, // 25: api.statistics.Statistics.UnlockLookRecord:output_type -> google.protobuf.Empty
 	6,  // 26: api.statistics.Statistics.FindLookList:output_type -> api.statistics.LookAndLikeListReply
 	6,  // 27: api.statistics.Statistics.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
 	6,  // 28: api.statistics.Statistics.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	15, // 29: api.statistics.Statistics.ReceptionPerson:output_type -> google.protobuf.Empty
-	15, // 30: api.statistics.Statistics.AddTodayProfit:output_type -> google.protobuf.Empty
+	16, // 29: api.statistics.Statistics.ReceptionPerson:output_type -> google.protobuf.Empty
+	16, // 30: api.statistics.Statistics.AddTodayProfit:output_type -> google.protobuf.Empty
 	4,  // 31: api.statistics.Statistics.GetReceptionMsg:output_type -> api.statistics.ReceptionMsg
 	5,  // 32: api.statistics.Statistics.GetTodayProfit:output_type -> api.statistics.TodayProfitMsg
-	16, // 33: api.statistics.Statistics.GetIsLike:output_type -> api.common.IsLike
-	15, // 34: api.statistics.Statistics.UserSendToPartner:output_type -> google.protobuf.Empty
-	15, // 35: api.statistics.Statistics.PartnerReplyUser:output_type -> google.protobuf.Empty
+	17, // 33: api.statistics.Statistics.GetIsLike:output_type -> api.common.IsLike
+	16, // 34: api.statistics.Statistics.UserSendToPartner:output_type -> google.protobuf.Empty
+	16, // 35: api.statistics.Statistics.PartnerReplyUser:output_type -> google.protobuf.Empty
 	0,  // 36: api.statistics.Statistics.GetPartnerReplyMsg:output_type -> api.statistics.GetPartnerReplyMsgReply
 	19, // [19:37] is the sub-list for method output_type
 	1,  // [1:19] is the sub-list for method input_type
@@ -1375,6 +1427,18 @@ func file_statistics_proto_init() {
 			}
 		}
 		file_statistics_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnlockLookRecordRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_statistics_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReceptionMessage); i {
 			case 0:
 				return &v.state
@@ -1393,7 +1457,7 @@ func file_statistics_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_statistics_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   13,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

api/statistics/statistics.proto

@@ -25,7 +25,7 @@ service Statistics {
   // 减少"喜欢我的"的未读数
   rpc ReduceLikeUnreadNum (PersonMessage) returns (google.protobuf.Empty);
   // 解锁"看过我的"的记录
-  rpc UnlockLookRecord (PersonMessage) returns (google.protobuf.Empty);
+  rpc UnlockLookRecord (UnlockLookRecordRequest) returns (google.protobuf.Empty);
   // 查看看过我的列表
   rpc FindLookList (GetLookAndLikeListRequest) returns (LookAndLikeListReply);
   // 查看我喜欢的列表
@@ -106,7 +106,6 @@ message LookAndLikeListInfo{
 
 message GetLookAndLikeListRequest{
   string personID = 1; // 查询目标的ID
-  string personType = 2; // 类型
   int64 nextId = 3;
   int64 offset = 4;
 }
@@ -133,6 +132,11 @@ message PersonMessage{
   string bePersonType = 4; // 被关注者、被浏览者的类型
 }
 
+message UnlockLookRecordRequest{
+  string personID = 1; // 关注者、浏览者的ID
+  string bePersonID = 2; // 被关注者、被浏览者的ID
+}
+
 message ReceptionMessage{
   string partnerID = 1; // 接待者的ID
   string userID = 2; // 被接待者的ID

api/statistics/statistics_grpc.pb.go

@@ -33,7 +33,7 @@ type StatisticsClient interface {
 	// 减少"喜欢我的"的未读数
 	ReduceLikeUnreadNum(ctx context.Context, in *PersonMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 解锁"看过我的"的记录
-	UnlockLookRecord(ctx context.Context, in *PersonMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	UnlockLookRecord(ctx context.Context, in *UnlockLookRecordRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 查看看过我的列表
 	FindLookList(ctx context.Context, in *GetLookAndLikeListRequest, opts ...grpc.CallOption) (*LookAndLikeListReply, error)
 	// 查看我喜欢的列表
@@ -120,7 +120,7 @@ func (c *statisticsClient) ReduceLikeUnreadNum(ctx context.Context, in *PersonMe
 	return out, nil
 }
 
-func (c *statisticsClient) UnlockLookRecord(ctx context.Context, in *PersonMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *statisticsClient) UnlockLookRecord(ctx context.Context, in *UnlockLookRecordRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.statistics.Statistics/UnlockLookRecord", in, out, opts...)
 	if err != nil {
@@ -245,7 +245,7 @@ type StatisticsServer interface {
 	// 减少"喜欢我的"的未读数
 	ReduceLikeUnreadNum(context.Context, *PersonMessage) (*emptypb.Empty, error)
 	// 解锁"看过我的"的记录
-	UnlockLookRecord(context.Context, *PersonMessage) (*emptypb.Empty, error)
+	UnlockLookRecord(context.Context, *UnlockLookRecordRequest) (*emptypb.Empty, error)
 	// 查看看过我的列表
 	FindLookList(context.Context, *GetLookAndLikeListRequest) (*LookAndLikeListReply, error)
 	// 查看我喜欢的列表
@@ -293,7 +293,7 @@ func (UnimplementedStatisticsServer) GetLookStatisticsMessage(context.Context, *
 func (UnimplementedStatisticsServer) ReduceLikeUnreadNum(context.Context, *PersonMessage) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ReduceLikeUnreadNum not implemented")
 }
-func (UnimplementedStatisticsServer) UnlockLookRecord(context.Context, *PersonMessage) (*emptypb.Empty, error) {
+func (UnimplementedStatisticsServer) UnlockLookRecord(context.Context, *UnlockLookRecordRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UnlockLookRecord not implemented")
 }
 func (UnimplementedStatisticsServer) FindLookList(context.Context, *GetLookAndLikeListRequest) (*LookAndLikeListReply, error) {
@@ -451,7 +451,7 @@ func _Statistics_ReduceLikeUnreadNum_Handler(srv interface{}, ctx context.Contex
 }
 
 func _Statistics_UnlockLookRecord_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PersonMessage)
+	in := new(UnlockLookRecordRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -463,7 +463,7 @@ func _Statistics_UnlockLookRecord_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.statistics.Statistics/UnlockLookRecord",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(StatisticsServer).UnlockLookRecord(ctx, req.(*PersonMessage))
+		return srv.(StatisticsServer).UnlockLookRecord(ctx, req.(*UnlockLookRecordRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/websocket/websocket.pb.go

@@ -113,7 +113,7 @@ type CheckIsOnlineRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	IdentifyId string `protobuf:"bytes,1,opt,name=identifyId,proto3" json:"identifyId"` // 身份ID
+	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` // 身份ID
 }
 
 func (x *CheckIsOnlineRequest) Reset() {
@@ -148,9 +148,9 @@ func (*CheckIsOnlineRequest) Descriptor() ([]byte, []int) {
 	return file_websocket_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *CheckIsOnlineRequest) GetIdentifyId() string {
+func (x *CheckIsOnlineRequest) GetUserId() string {
 	if x != nil {
-		return x.IdentifyId
+		return x.UserId
 	}
 	return ""
 }
@@ -648,92 +648,91 @@ var file_websocket_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x70,
 	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x18, 0x06,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x4f, 0x74, 0x68,
-	0x65, 0x72, 0x4e, 0x75, 0x6d, 0x22, 0x36, 0x0a, 0x14, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73,
-	0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a,
-	0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x49, 0x64, 0x22, 0x30, 0x0a,
-	0x12, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22,
-	0x52, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a,
-	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x24, 0x0a,
-	0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02,
+	0x65, 0x72, 0x4e, 0x75, 0x6d, 0x22, 0x2e, 0x0a, 0x14, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73,
+	0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a,
+	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x12, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73,
+	0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x69,
+	0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69,
+	0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x52, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x57, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x77, 0x6f,
+	0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x3d, 0x0a, 0x13, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x59, 0x0a, 0x0b, 0x4d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
+	0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49,
+	0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d,
+	0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73,
+	0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x9e, 0x01, 0x0a, 0x0e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
+	0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68,
+	0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x54,
+	0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x54, 0x61, 0x67, 0x22, 0x0e, 0x0a, 0x0c, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73,
+	0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x4c, 0x0a, 0x15, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+	0x33, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x4f, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+	0x6c, 0x69, 0x73, 0x74, 0x22, 0x9e, 0x01, 0x0a, 0x10, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50,
+	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70,
+	0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72,
+	0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x24, 0x0a,
+	0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x22, 0x3d, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x22, 0x59, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x9e, 0x01,
-	0x0a, 0x0e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
-	0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04,
-	0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65,
-	0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x54, 0x61, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x54, 0x61, 0x67, 0x22, 0x0e,
-	0x0a, 0x0c, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x4c,
-	0x0a, 0x15, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x33, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73,
-	0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x9e, 0x01, 0x0a,
-	0x10, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x77, 0x6f,
-	0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73,
-	0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xfc, 0x03,
-	0x0a, 0x09, 0x57, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x50, 0x0a, 0x10, 0x46,
-	0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 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, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65,
-	0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69,
-	0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x47, 0x0a,
-	0x07, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77,
-	0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65,
-	0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x57, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x29, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 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, 0x4c, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x12, 0x22, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 0x59, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x12, 0x23, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65,
-	0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62,
-	0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x73, 0x4f, 0x6e,
-	0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x13, 0x46,
-	0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4e,
-	0x75, 0x6d, 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, 0x20, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
-	0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x4c, 0x0a, 0x0d,
-	0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x01, 0x5a,
-	0x39, 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, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x3b, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x74, 0x75, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xfc, 0x03, 0x0a, 0x09, 0x57, 0x65, 0x62, 0x73, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x12, 0x50, 0x0a, 0x10, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
+	0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 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,
+	0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e,
+	0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x47, 0x0a, 0x07, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67,
+	0x12, 0x1d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e,
+	0x53, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5a,
+	0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x57, 0x6f, 0x72, 0x6b,
+	0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 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, 0x4c, 0x0a, 0x0c, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x22, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 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, 0x59, 0x0a, 0x0d, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x49, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x23, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49,
+	0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x49, 0x73, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x6c,
+	0x79, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x13, 0x46, 0x69, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e,
+	0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x4e, 0x75, 0x6d, 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, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x2e, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x42, 0x4c, 0x0a, 0x0d, 0x61, 0x70, 0x69, 0x2e, 0x77, 0x65, 0x62, 0x73,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x01, 0x5a, 0x39, 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, 0x77,
+	0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x3b, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

api/websocket/websocket.proto

@@ -35,7 +35,7 @@ message OnlinePersonReply{
 }
 
 message CheckIsOnlineRequest{
-  string identifyId = 1;// 身份ID
+  string userId = 1;// 身份ID
 }
 
 message CheckIsOnlineReply{

define/lock.go

@@ -6,4 +6,5 @@ var (
 	LockChatRoom       = "chat_room"       // 房间信息锁
 	LockCreateRoom     = "create_room"     // 房间信息锁
 	LockUserCredit     = "user_credit"     // 用户积分锁
+	LockCreateIdentify = "create_identify" // 身份创建锁
 )

js/api/account/account_http_pb.ts

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

js/api/account/account_pb.ts

@@ -1,3 +1,10 @@
+export interface GetIdentifyByAccountIDRequest{
+    accountId?:number;
+}
+export interface GetIdentifyByAccountIDReply{
+    openId?:string;
+    appid?:string;
+}
 export interface CheckTextRequest{
     /**  待审核的文本 */
     text?:string;
@@ -27,9 +34,6 @@ export interface OpenIDAndAppIDRequest{
 }
 export interface IdentityInfo{
     pid?:string;
-    type?:string;
-    identityID?:number;
-    openId?:string;
 }
 export interface UserInfoDB{
     /**  id */

js/api/chat/chat_pb.ts

@@ -6,8 +6,6 @@ export interface GetMatchingPartnerInfoRequest{
     sex?:number;
     /**  用户ID */
     userID?:string;
-    /**  身份ID */
-    identifyId?:string;
     openId?:string;
     appId?:string;
 }
@@ -19,15 +17,12 @@ export interface UserUnlockRequest{
     /**  房间ID */
     roomId?:number;
     personId?:string;
-    personType?:string;
-    identifyId?:string;
 }
 export interface PartnerCollectIDsRequest{
     /**  记录ID */
     chatRecordIds?:Array<number>;
     personId?:string;
     personType?:string;
-    identifyId?:string;
     /**  房间ID */
     roomId?:number;
 }
@@ -73,30 +68,27 @@ export interface FindRecommendPersonListRequest{
     personID?:string;
     /**  类型 */
     personType?:string;
-    /**  身份ID */
-    identifyId?:string;
 }
 export interface FindRoomCardMsgRequest{
     /**  身份ID */
-    userIdentifyId?:string;
+    userId?:string;
     /**  身份ID */
-    partnerIdentifyId?:string;
+    partnerId?:string;
 }
 export interface PartnerGetAwardReply{
     balance?:number;
 }
 export interface PartnerGetAwardRequest{
-    /**  身份ID */
-    userIdentifyId?:string;
-    /**  身份ID */
-    partnerIdentifyId?:string;
+    /**  用户ID */
+    userId?:string;
     awardType?:string;
+    /**  接待员ID */
     partnerId?:string;
 }
 export interface PartnerFindRoomListRequest{
     nextId?:number;
     offset?:number;
-    IdentifyId?:string;
+    personId?:string;
     /**  是否查询没回复过的内容 */
     isFindNotReply?:boolean;
     /**  是否在七日内 */
@@ -105,7 +97,7 @@ export interface PartnerFindRoomListRequest{
 export interface UserFindRoomListRequest{
     nextId?:number;
     offset?:number;
-    IdentifyId?:string;
+    personId?:string;
     /**  是否在七日内 */
     isWithinSevenDay?:boolean;
 }
@@ -165,13 +157,9 @@ export interface PartnerRoomInfo{
 }
 export interface CreateChatRoomParam{
     personId1?:string;
-    /**  身份ID */
-    personIdentifyID1?:string;
     /**  类型 */
     personType1?:string;
     personId2?:string;
-    /**  身份ID */
-    personIdentifyID2?:string;
     /**  类型 */
     personType2?:string;
     /**  来源 */
@@ -179,7 +167,7 @@ export interface CreateChatRoomParam{
 }
 export interface SetBlackChatParam{
     /**  拉黑者的身份ID */
-    personIdentifyId?:string;
+    personId?:string;
     /**  房间ID */
     roomId?:number;
 }

js/api/common/common_pb.ts

@@ -182,8 +182,6 @@ export interface PersonMsg{
     workingStatus?:string;
     /**  上次观看小纸条ID */
     lastScripID?:number;
-    /**  身份ID */
-    identifyId?:string;
 }
 export interface LookedAndLikedNum{
     /**  id */
@@ -266,8 +264,6 @@ export interface PersonDB{
     isFinishInformation?:boolean;
     /**  标签列表 */
     tagList?:Array<number>;
-    /**  身份ID */
-    identifyId?:string;
     /**  用户id（number） */
     personId?:number;
 }
@@ -348,8 +344,6 @@ export interface GetMatchingPartnerInfoReply{
     avatarUrl?:string;
     /**  性别 */
     sex?:number;
-    /**  身份ID */
-    identifyId?:string;
     /**  身份类型 */
     personType?:string;
 }
@@ -526,14 +520,10 @@ export interface ReportChatRequest{
     category?:Array<string>;
 }
 export interface ReportRequest{
-    /**  发起举报的人的身份ID */
-    identifyId?:string;
     /**  发起举报的人的ID */
     personId?:string;
     /**  发起举报的人的类型 */
     personType?:string;
-    /**  被举报的人的身份ID */
-    reportedIdentifyId?:string;
     /**  被举报的人的ID */
     reportedPersonId?:string;
     /**  被举报的人的类型 */
@@ -609,17 +599,13 @@ export interface FindRecommendRequest{
     /**  类型 */
     type?:string;
     sex?:number;
-    /**  发起举报的人的身份ID */
-    identifyId?:string;
+    /**  ID */
+    personId?:string;
 }
 export interface FindOverSevenDayAvatarReply{
     /**  头像列表 */
     list?:Array<string>;
 }
-export interface IdentifyIdRequest{
-    /**  发起举报的人的身份ID */
-    identifyId?:string;
-}
 export interface PersonLookScripRequest{
     personId?:string;
     personType?:string;
@@ -690,7 +676,6 @@ export interface DeleteScripRequest{
 export interface CreateScripRequest{
     personId?:string;
     personType?:string;
-    PersonIdentifyId?:string;
     text?:string;
     pictureUrl?:string;
 }
@@ -700,7 +685,6 @@ export interface ScripID{
 export interface ReplyScripRequest{
     personId?:string;
     personType?:string;
-    PersonIdentifyId?:string;
     /**  小纸条ID */
     scripId?:number;
     /**  回复内容 */
@@ -721,16 +705,14 @@ export interface MatchingRequest{
     personId?:string;
     /**  类型 */
     personType?:string;
-    /**  身份ID */
-    identifyId?:string;
     /**  性别 */
     sex?:number;
     /**  是否跟性别强相关 */
     isNeedCheckSex?:boolean;
 }
-export interface IdentifyIDsParam{
-    myIdentifyID?:string;
-    otherIdentifyID?:string;
+export interface UserIDsParam{
+    myUserID?:string;
+    otherUserID?:string;
 }
 export interface ManagerFindPersonListReply{
     list?:Array<ManagerFindPersonInfo>;
@@ -774,8 +756,6 @@ export interface ManagerFindPersonInfo{
     weight?:number;
     /**  上次登录时间 */
     lastLoginTime?:number;
-    /**  身份ID */
-    identifyId?:string;
     /**  用户id（Number） */
     personId?:number;
 }

js/api/statistics/statistics_pb.ts

@@ -73,8 +73,6 @@ export interface LookAndLikeListInfo{
 export interface GetLookAndLikeListRequest{
     /**  查询目标的ID */
     personID?:string;
-    /**  类型 */
-    personType?:string;
     nextId?:number;
     offset?:number;
 }
@@ -107,6 +105,12 @@ export interface PersonMessage{
     /**  被关注者、被浏览者的类型 */
     bePersonType?:string;
 }
+export interface UnlockLookRecordRequest{
+    /**  关注者、浏览者的ID */
+    personID?:string;
+    /**  被关注者、被浏览者的ID */
+    bePersonID?:string;
+}
 export interface ReceptionMessage{
     /**  接待者的ID */
     partnerID?:string;

js/api/websocket/websocket_pb.ts

@@ -14,7 +14,7 @@ export interface OnlinePersonReply{
 }
 export interface CheckIsOnlineRequest{
     /**  身份ID */
-    identifyId?:string;
+    userId?:string;
 }
 export interface CheckIsOnlineReply{
     /**  是否在线 */