wfz 3 anni fa
parent
commit
f48a0bd409

+ 36 - 30
api/chat/chat.pb.go

@@ -1629,7 +1629,7 @@ var file_chat_proto_rawDesc = []byte{
 	0x03, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12,
 	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65,
 	0x78, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x05, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x32, 0x96, 0x0e, 0x0a, 0x04, 0x43, 0x68, 0x61, 0x74,
+	0x52, 0x05, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x32, 0xd8, 0x0e, 0x0a, 0x04, 0x43, 0x68, 0x61, 0x74,
 	0x12, 0x7a, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72,
 	0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68,
 	0x69, 0x70, 0x12, 0x29, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
@@ -1743,11 +1743,15 @@ var file_chat_proto_rawDesc = []byte{
 	0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x53, 0x63, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
 	0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x00,
-	0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x50, 0x01, 0x5a, 0x2f,
-	0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61, 0x74, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x40, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x49, 0x6e, 0x66,
+	0x6f, 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, 0x14, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x49, 0x6e, 0x66, 0x6f,
+	0x22, 0x00, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x50, 0x01,
+	0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61,
+	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1829,30 +1833,32 @@ var file_chat_proto_depIdxs = []int32{
 	27, // 21: api.chat.Chat.PersonLookScrip:input_type -> api.common.PersonLookScripRequest
 	28, // 22: api.chat.Chat.PersonClickLookBack:input_type -> api.common.PersonParam
 	29, // 23: api.chat.Chat.PersonReplyScrip:input_type -> api.common.ReplyScripRequest
-	15, // 24: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	16, // 25: api.chat.Chat.CreateChatRoom:output_type -> api.chat.RoomReply
-	30, // 26: api.chat.Chat.FindOnlinePersonList:output_type -> api.common.RecommendPersonListReply
-	30, // 27: api.chat.Chat.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
-	9,  // 28: api.chat.Chat.PartnerFindRoomList:output_type -> api.chat.PartnerFindRoomListReply
-	7,  // 29: api.chat.Chat.UserFindRoomList:output_type -> api.chat.UserFindRoomListReply
-	14, // 30: api.chat.Chat.Receive:output_type -> api.chat.ReceiveReply
-	31, // 31: api.chat.Chat.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	32, // 32: api.chat.Chat.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	33, // 33: api.chat.Chat.SetBlackChat:output_type -> google.protobuf.Empty
-	33, // 34: api.chat.Chat.DeleteChat:output_type -> google.protobuf.Empty
-	33, // 35: api.chat.Chat.Report:output_type -> google.protobuf.Empty
-	3,  // 36: api.chat.Chat.PartnerGetAward:output_type -> api.chat.PartnerGetAwardReply
-	34, // 37: api.chat.Chat.FindRoomCardMsg:output_type -> api.common.RoomChatMsg
-	0,  // 38: api.chat.Chat.FindNotReplyNum:output_type -> api.chat.FindNotReplyNumReply
-	35, // 39: api.chat.Chat.CreateScrip:output_type -> api.common.ScripID
-	33, // 40: api.chat.Chat.DeleteScrip:output_type -> google.protobuf.Empty
-	36, // 41: api.chat.Chat.FindMyScrip:output_type -> api.common.ScripReply
-	36, // 42: api.chat.Chat.FindRecommendScrip:output_type -> api.common.ScripReply
-	33, // 43: api.chat.Chat.PersonLookScrip:output_type -> google.protobuf.Empty
-	37, // 44: api.chat.Chat.PersonClickLookBack:output_type -> api.common.ScripInfo
-	38, // 45: api.chat.Chat.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
-	24, // [24:46] is the sub-list for method output_type
-	2,  // [2:24] is the sub-list for method input_type
+	28, // 24: api.chat.Chat.GetWindowInfo:input_type -> api.common.PersonParam
+	15, // 25: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	16, // 26: api.chat.Chat.CreateChatRoom:output_type -> api.chat.RoomReply
+	30, // 27: api.chat.Chat.FindOnlinePersonList:output_type -> api.common.RecommendPersonListReply
+	30, // 28: api.chat.Chat.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
+	9,  // 29: api.chat.Chat.PartnerFindRoomList:output_type -> api.chat.PartnerFindRoomListReply
+	7,  // 30: api.chat.Chat.UserFindRoomList:output_type -> api.chat.UserFindRoomListReply
+	14, // 31: api.chat.Chat.Receive:output_type -> api.chat.ReceiveReply
+	31, // 32: api.chat.Chat.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	32, // 33: api.chat.Chat.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	33, // 34: api.chat.Chat.SetBlackChat:output_type -> google.protobuf.Empty
+	33, // 35: api.chat.Chat.DeleteChat:output_type -> google.protobuf.Empty
+	33, // 36: api.chat.Chat.Report:output_type -> google.protobuf.Empty
+	3,  // 37: api.chat.Chat.PartnerGetAward:output_type -> api.chat.PartnerGetAwardReply
+	34, // 38: api.chat.Chat.FindRoomCardMsg:output_type -> api.common.RoomChatMsg
+	0,  // 39: api.chat.Chat.FindNotReplyNum:output_type -> api.chat.FindNotReplyNumReply
+	35, // 40: api.chat.Chat.CreateScrip:output_type -> api.common.ScripID
+	33, // 41: api.chat.Chat.DeleteScrip:output_type -> google.protobuf.Empty
+	36, // 42: api.chat.Chat.FindMyScrip:output_type -> api.common.ScripReply
+	36, // 43: api.chat.Chat.FindRecommendScrip:output_type -> api.common.ScripReply
+	33, // 44: api.chat.Chat.PersonLookScrip:output_type -> google.protobuf.Empty
+	37, // 45: api.chat.Chat.PersonClickLookBack:output_type -> api.common.ScripInfo
+	38, // 46: api.chat.Chat.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	19, // 47: api.chat.Chat.GetWindowInfo:output_type -> api.chat.WindowInfo
+	25, // [25:48] is the sub-list for method output_type
+	2,  // [2:25] is the sub-list for method input_type
 	2,  // [2:2] is the sub-list for extension type_name
 	2,  // [2:2] is the sub-list for extension extendee
 	0,  // [0:2] is the sub-list for field type_name

+ 2 - 0
api/chat/chat.proto

@@ -55,6 +55,8 @@ service Chat {
   rpc PersonClickLookBack (common.PersonParam) returns (common.ScripInfo){};
   // 回复小纸条
   rpc PersonReplyScrip (common.ReplyScripRequest) returns (common.ChatRecordInfo){};
+  // 获取假弹窗
+  rpc GetWindowInfo (common.PersonParam) returns (chat.WindowInfo){};
 }
 
 message FindNotReplyNumReply{

+ 38 - 0
api/chat/chat_grpc.pb.go

@@ -63,6 +63,8 @@ type ChatClient interface {
 	PersonClickLookBack(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*common.ScripInfo, error)
 	// 回复小纸条
 	PersonReplyScrip(ctx context.Context, in *common.ReplyScripRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error)
+	// 获取假弹窗
+	GetWindowInfo(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*WindowInfo, error)
 }
 
 type chatClient struct {
@@ -271,6 +273,15 @@ func (c *chatClient) PersonReplyScrip(ctx context.Context, in *common.ReplyScrip
 	return out, nil
 }
 
+func (c *chatClient) GetWindowInfo(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*WindowInfo, error) {
+	out := new(WindowInfo)
+	err := c.cc.Invoke(ctx, "/api.chat.Chat/GetWindowInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ChatServer is the server API for Chat service.
 // All implementations must embed UnimplementedChatServer
 // for forward compatibility
@@ -318,6 +329,8 @@ type ChatServer interface {
 	PersonClickLookBack(context.Context, *common.PersonParam) (*common.ScripInfo, error)
 	// 回复小纸条
 	PersonReplyScrip(context.Context, *common.ReplyScripRequest) (*common.ChatRecordInfo, error)
+	// 获取假弹窗
+	GetWindowInfo(context.Context, *common.PersonParam) (*WindowInfo, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -391,6 +404,9 @@ func (UnimplementedChatServer) PersonClickLookBack(context.Context, *common.Pers
 func (UnimplementedChatServer) PersonReplyScrip(context.Context, *common.ReplyScripRequest) (*common.ChatRecordInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PersonReplyScrip not implemented")
 }
+func (UnimplementedChatServer) GetWindowInfo(context.Context, *common.PersonParam) (*WindowInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetWindowInfo not implemented")
+}
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
 
 // UnsafeChatServer may be embedded to opt out of forward compatibility for this service.
@@ -800,6 +816,24 @@ func _Chat_PersonReplyScrip_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Chat_GetWindowInfo_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.(ChatServer).GetWindowInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.chat.Chat/GetWindowInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChatServer).GetWindowInfo(ctx, req.(*common.PersonParam))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Chat_ServiceDesc is the grpc.ServiceDesc for Chat service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -895,6 +929,10 @@ var Chat_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PersonReplyScrip",
 			Handler:    _Chat_PersonReplyScrip_Handler,
 		},
+		{
+			MethodName: "GetWindowInfo",
+			Handler:    _Chat_GetWindowInfo_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "chat.proto",

+ 78 - 69
api/user/user.pb.go

@@ -1674,7 +1674,7 @@ var file_user_proto_rawDesc = []byte{
 	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x61, 0x79, 0x43, 0x61, 0x6c,
 	0x6c, 0x62, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65,
 	0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x32, 0xdc, 0x32, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15, 0x55,
+	0x6c, 0x74, 0x32, 0xc1, 0x33, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x7e, 0x0a, 0x15, 0x55,
 	0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
 	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
@@ -2080,11 +2080,17 @@ var file_user_proto_rawDesc = []byte{
 	0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x63, 0x72, 0x69, 0x70, 0x49, 0x44,
 	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, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x50, 0x01, 0x5a,
-	0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x00, 0x12, 0x63, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x14, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x49, 0x6e, 0x66, 0x6f,
+	0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75,
+	0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2f,
+	0x67, 0x65, 0x74, 0x3a, 0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73,
+	0x65, 0x72, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
+	0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2175,6 +2181,7 @@ var file_user_proto_goTypes = []interface{}{
 	(*common.ScripReply)(nil),                        // 71: api.common.ScripReply
 	(*common.ScripInfo)(nil),                         // 72: api.common.ScripInfo
 	(*common.ChatRecordInfo)(nil),                    // 73: api.common.ChatRecordInfo
+	(*chat.WindowInfo)(nil),                          // 74: api.chat.WindowInfo
 }
 var file_user_proto_depIdxs = []int32{
 	22, // 0: api.user.ReplyScripRequest.message:type_name -> api.common.Message
@@ -2243,69 +2250,71 @@ var file_user_proto_depIdxs = []int32{
 	31, // 63: api.user.User.PersonClickLookBack:input_type -> api.common.PersonParam
 	0,  // 64: api.user.User.PersonReplyScrip:input_type -> api.user.ReplyScripRequest
 	47, // 65: api.user.User.UpdateLastScripID:input_type -> api.common.UpdateLastScripIDRequest
-	25, // 66: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
-	14, // 67: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
-	48, // 68: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
-	25, // 69: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
-	25, // 70: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
-	49, // 71: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
-	50, // 72: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
-	51, // 73: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
-	52, // 74: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
-	53, // 75: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
-	54, // 76: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
-	54, // 77: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
-	54, // 78: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
-	55, // 79: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
-	56, // 80: api.user.User.WxConf:output_type -> api.common.WxConfResponse
-	57, // 81: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
-	58, // 82: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
-	12, // 83: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	12, // 84: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
-	59, // 85: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
-	11, // 86: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
-	60, // 87: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
-	61, // 88: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
-	62, // 89: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
-	63, // 90: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
-	25, // 91: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
-	10, // 92: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
-	25, // 93: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
-	64, // 94: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
-	25, // 95: api.user.User.UserLike:output_type -> google.protobuf.Empty
-	25, // 96: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
-	25, // 97: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
-	25, // 98: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
-	25, // 99: api.user.User.LookBackScripReduceCredit:output_type -> google.protobuf.Empty
-	25, // 100: api.user.User.CreateScripReduceCredit:output_type -> google.protobuf.Empty
-	25, // 101: api.user.User.ReplyScripReduceCredit:output_type -> google.protobuf.Empty
-	65, // 102: api.user.User.FindMemeByType:output_type -> api.common.MemeList
-	66, // 103: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
-	67, // 104: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
-	67, // 105: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	68, // 106: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
-	25, // 107: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
-	25, // 108: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
-	68, // 109: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
-	17, // 110: api.user.User.UserRecharge:output_type -> api.user.PayInfo
-	8,  // 111: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
-	19, // 112: api.user.User.FindPayList:output_type -> api.user.PayOrderList
-	25, // 113: api.user.User.Report:output_type -> google.protobuf.Empty
-	53, // 114: api.user.User.FindRecommendUserDBList:output_type -> api.common.PersonDBReply
-	58, // 115: api.user.User.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
-	69, // 116: api.user.User.FindOverSevenDayAvatar:output_type -> api.common.FindOverSevenDayAvatarReply
-	5,  // 117: api.user.User.FindMatchingAvatarAndNum:output_type -> api.user.FindMatchingAvatarAndNumReply
-	70, // 118: api.user.User.CreateScrip:output_type -> api.common.ScripID
-	25, // 119: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
-	71, // 120: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
-	71, // 121: api.user.User.FindUserScrip:output_type -> api.common.ScripReply
-	71, // 122: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
-	25, // 123: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
-	72, // 124: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
-	73, // 125: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
-	25, // 126: api.user.User.UpdateLastScripID:output_type -> google.protobuf.Empty
-	66, // [66:127] is the sub-list for method output_type
-	5,  // [5:66] is the sub-list for method input_type
+	25, // 66: api.user.User.GetWindowInfo:input_type -> google.protobuf.Empty
+	25, // 67: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
+	14, // 68: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
+	48, // 69: api.user.User.GetUserDBMsg:output_type -> api.common.PersonMsg
+	25, // 70: api.user.User.SendPhoneCode:output_type -> google.protobuf.Empty
+	25, // 71: api.user.User.CheckPhoneCode:output_type -> google.protobuf.Empty
+	49, // 72: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
+	50, // 73: api.user.User.CreateUserPersonRoom:output_type -> api.chat.RoomReply
+	51, // 74: api.user.User.GetPartnerCircleInfo:output_type -> api.common.AddFriendMessageInfo
+	52, // 75: api.user.User.UserGetHomeInfo:output_type -> api.common.HomeInfo
+	53, // 76: api.user.User.FindUserDBList:output_type -> api.common.PersonDBReply
+	54, // 77: api.user.User.FindLookList:output_type -> api.statistics.LookAndLikeListReply
+	54, // 78: api.user.User.FindLikeList:output_type -> api.statistics.LookAndLikeListReply
+	54, // 79: api.user.User.FindLikedList:output_type -> api.statistics.LookAndLikeListReply
+	55, // 80: api.user.User.GetLookAndLikeStatisticsMessage:output_type -> api.statistics.LookAndLikeMessageReply
+	56, // 81: api.user.User.WxConf:output_type -> api.common.WxConfResponse
+	57, // 82: api.user.User.FindTagListBySex:output_type -> api.common.TagListReply
+	58, // 83: api.user.User.FindOnlineList:output_type -> api.common.RecommendPersonListReply
+	12, // 84: api.user.User.FindWithinSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	12, // 85: api.user.User.FindOverSevenDayRoomList:output_type -> api.user.UserFindChatListReply
+	59, // 86: api.user.User.UserGetPersonLikedAndLooked:output_type -> api.common.LookedAndLikedNum
+	11, // 87: api.user.User.GetUserBalance:output_type -> api.user.UserBalance
+	60, // 88: api.user.User.GetUserLookNum:output_type -> api.statistics.LookMessageReply
+	61, // 89: api.user.User.FindChatRecordList:output_type -> api.common.ChatRecordListReply
+	62, // 90: api.user.User.FindChatRoomMsg:output_type -> api.common.ChatRoomMsg
+	63, // 91: api.user.User.GetUserIsLike:output_type -> api.common.IsLike
+	25, // 92: api.user.User.UserFinishInformation:output_type -> google.protobuf.Empty
+	10, // 93: api.user.User.UserInformationStatus:output_type -> api.user.InformationStatus
+	25, // 94: api.user.User.UserGetInformationAward:output_type -> google.protobuf.Empty
+	64, // 95: api.user.User.UserGetChatCard:output_type -> api.common.ChatCardInfo
+	25, // 96: api.user.User.UserLike:output_type -> google.protobuf.Empty
+	25, // 97: api.user.User.UserUnLike:output_type -> google.protobuf.Empty
+	25, // 98: api.user.User.UnlockLookRecord:output_type -> google.protobuf.Empty
+	25, // 99: api.user.User.SendMsgReduceCredit:output_type -> google.protobuf.Empty
+	25, // 100: api.user.User.LookBackScripReduceCredit:output_type -> google.protobuf.Empty
+	25, // 101: api.user.User.CreateScripReduceCredit:output_type -> google.protobuf.Empty
+	25, // 102: api.user.User.ReplyScripReduceCredit:output_type -> google.protobuf.Empty
+	65, // 103: api.user.User.FindMemeByType:output_type -> api.common.MemeList
+	66, // 104: api.user.User.FindChatTopic:output_type -> api.common.ChatTopicList
+	67, // 105: api.user.User.RandomMeme:output_type -> api.common.CommonTextList
+	67, // 106: api.user.User.RandomSwiftMessage:output_type -> api.common.CommonTextList
+	68, // 107: api.user.User.FindMemeTitle:output_type -> api.common.MemeTitleList
+	25, // 108: api.user.User.UserSetBlackChat:output_type -> google.protobuf.Empty
+	25, // 109: api.user.User.UserDeleteChat:output_type -> google.protobuf.Empty
+	68, // 110: api.user.User.FindChatTopicTitle:output_type -> api.common.MemeTitleList
+	17, // 111: api.user.User.UserRecharge:output_type -> api.user.PayInfo
+	8,  // 112: api.user.User.FindRechargeList:output_type -> api.user.RechargeList
+	19, // 113: api.user.User.FindPayList:output_type -> api.user.PayOrderList
+	25, // 114: api.user.User.Report:output_type -> google.protobuf.Empty
+	53, // 115: api.user.User.FindRecommendUserDBList:output_type -> api.common.PersonDBReply
+	58, // 116: api.user.User.FindRecommendPersonList:output_type -> api.common.RecommendPersonListReply
+	69, // 117: api.user.User.FindOverSevenDayAvatar:output_type -> api.common.FindOverSevenDayAvatarReply
+	5,  // 118: api.user.User.FindMatchingAvatarAndNum:output_type -> api.user.FindMatchingAvatarAndNumReply
+	70, // 119: api.user.User.CreateScrip:output_type -> api.common.ScripID
+	25, // 120: api.user.User.DeleteScrip:output_type -> google.protobuf.Empty
+	71, // 121: api.user.User.FindMyScrip:output_type -> api.common.ScripReply
+	71, // 122: api.user.User.FindUserScrip:output_type -> api.common.ScripReply
+	71, // 123: api.user.User.FindRecommendScrip:output_type -> api.common.ScripReply
+	25, // 124: api.user.User.PersonLookScrip:output_type -> google.protobuf.Empty
+	72, // 125: api.user.User.PersonClickLookBack:output_type -> api.common.ScripInfo
+	73, // 126: api.user.User.PersonReplyScrip:output_type -> api.common.ChatRecordInfo
+	25, // 127: api.user.User.UpdateLastScripID:output_type -> google.protobuf.Empty
+	74, // 128: api.user.User.GetWindowInfo:output_type -> api.chat.WindowInfo
+	67, // [67:129] is the sub-list for method output_type
+	5,  // [5:67] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
 	5,  // [5:5] is the sub-list for extension extendee
 	0,  // [0:5] is the sub-list for field type_name

+ 7 - 0
api/user/user.proto

@@ -403,6 +403,13 @@ service User {
   };
   // 更新上次访问的小纸条
   rpc UpdateLastScripID (common.UpdateLastScripIDRequest) returns (google.protobuf.Empty){};
+  // 获取假弹窗
+  rpc GetWindowInfo (google.protobuf.Empty) returns (chat.WindowInfo){
+    option (google.api.http) = {
+      post: "/api/user/chat/window/get",
+      body:"*"
+    };
+  };
 }
 
 message ReplyScripRequest {

+ 38 - 0
api/user/user_grpc.pb.go

@@ -144,6 +144,8 @@ type UserClient interface {
 	PersonReplyScrip(ctx context.Context, in *ReplyScripRequest, opts ...grpc.CallOption) (*common.ChatRecordInfo, error)
 	// 更新上次访问的小纸条
 	UpdateLastScripID(ctx context.Context, in *common.UpdateLastScripIDRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 获取假弹窗
+	GetWindowInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*chat.WindowInfo, error)
 }
 
 type userClient struct {
@@ -703,6 +705,15 @@ func (c *userClient) UpdateLastScripID(ctx context.Context, in *common.UpdateLas
 	return out, nil
 }
 
+func (c *userClient) GetWindowInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*chat.WindowInfo, error) {
+	out := new(chat.WindowInfo)
+	err := c.cc.Invoke(ctx, "/api.user.User/GetWindowInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UserServer is the server API for User service.
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
@@ -829,6 +840,8 @@ type UserServer interface {
 	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error)
 	// 更新上次访问的小纸条
 	UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error)
+	// 获取假弹窗
+	GetWindowInfo(context.Context, *emptypb.Empty) (*chat.WindowInfo, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -1019,6 +1032,9 @@ func (UnimplementedUserServer) PersonReplyScrip(context.Context, *ReplyScripRequ
 func (UnimplementedUserServer) UpdateLastScripID(context.Context, *common.UpdateLastScripIDRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateLastScripID not implemented")
 }
+func (UnimplementedUserServer) GetWindowInfo(context.Context, *emptypb.Empty) (*chat.WindowInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetWindowInfo not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -2130,6 +2146,24 @@ func _User_UpdateLastScripID_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_GetWindowInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(emptypb.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).GetWindowInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/GetWindowInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).GetWindowInfo(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // User_ServiceDesc is the grpc.ServiceDesc for User service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -2381,6 +2415,10 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateLastScripID",
 			Handler:    _User_UpdateLastScripID_Handler,
 		},
+		{
+			MethodName: "GetWindowInfo",
+			Handler:    _User_GetWindowInfo_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

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

@@ -62,6 +62,7 @@ type UserHTTPServer interface {
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
 	GetUserIsLike(context.Context, *common.PersonParam) (*common.IsLike, error)
 	GetUserLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
+	GetWindowInfo(context.Context, *emptypb.Empty) (*chat.WindowInfo, error)
 	PersonClickLookBack(context.Context, *common.PersonParam) (*common.ScripInfo, error)
 	PersonLookScrip(context.Context, *PersonLookScripRequest) (*emptypb.Empty, error)
 	PersonReplyScrip(context.Context, *ReplyScripRequest) (*common.ChatRecordInfo, error)
@@ -140,6 +141,7 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/user/scrip/look", _User_PersonLookScrip0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/look/back", _User_PersonClickLookBack0_HTTP_Handler(srv))
 	r.POST("/api/user/scrip/reply", _User_PersonReplyScrip0_HTTP_Handler(srv))
+	r.POST("/api/user/chat/window/get", _User_GetWindowInfo0_HTTP_Handler(srv))
 }
 
 func _User_UpdateUserInformation0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
@@ -1573,6 +1575,33 @@ func _User_PersonReplyScrip0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Cont
 	}
 }
 
+func _User_GetWindowInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in emptypb.Empty
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/GetWindowInfo")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.GetWindowInfo(ctx, req.(*emptypb.Empty))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type UserHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
@@ -1606,6 +1635,7 @@ type UserHTTPClient interface {
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
 	GetUserIsLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.IsLike, err error)
 	GetUserLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
+	GetWindowInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *chat.WindowInfo, err error)
 	PersonClickLookBack(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.ScripInfo, err error)
 	PersonLookScrip(ctx context.Context, req *PersonLookScripRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PersonReplyScrip(ctx context.Context, req *ReplyScripRequest, opts ...http.CallOption) (rsp *common.ChatRecordInfo, err error)
@@ -2053,6 +2083,19 @@ func (c *UserHTTPClientImpl) GetUserLookNum(ctx context.Context, in *emptypb.Emp
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) GetWindowInfo(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*chat.WindowInfo, error) {
+	var out chat.WindowInfo
+	pattern := "/api/user/chat/window/get"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/GetWindowInfo"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *UserHTTPClientImpl) PersonClickLookBack(ctx context.Context, in *common.PersonParam, opts ...http.CallOption) (*common.ScripInfo, error) {
 	var out common.ScripInfo
 	pattern := "/api/user/scrip/look/back"

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

@@ -2,7 +2,7 @@
 import request from '@/libs/request';
 import {UpdateInformationRequest,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,PartnerIDParam,CreateChatRoomParam,AddFriendMessageInfo,PersonParam,HomeInfo,PersonIDList,PersonDBReply,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,LookedAndLikedNum,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,ChatCardInfo,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,RoomIDRequest,ReportChatRequest,FindRecommendRequest,FindOverSevenDayAvatarReply,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,UpdateLastScripIDRequest} from "../common/common_pb";
 import {UserInfo,KeyRequest,UserFindChatListReply,UserBalance,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindRecommendPersonListRequest,FindMatchingAvatarAndNumReply,CreateScripRequest,DeleteScripRequest,FindScripRequest,PersonLookScripRequest,ReplyScripRequest} from "./user_pb";
-import {CheckUserPartnerIsRelationshipReply,RoomReply} from "../chat/chat_pb";
+import {CheckUserPartnerIsRelationshipReply,RoomReply,WindowInfo} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";
 
 const UserService = {
@@ -271,6 +271,11 @@ const UserService = {
 	const res = await request.post<{ data: ChatRecordInfo, code: string, message: string }>('/api/user/scrip/reply', req);
     return res.data.data;
   },
+  /**  获取假弹窗 */
+  GetWindowInfo: async (req?: undefined) => {
+	const res = await request.post<{ data: WindowInfo, code: string, message: string }>('/api/user/chat/window/get', req);
+    return res.data.data;
+  },
 
 };