user

api/user/user.proto

@@ -486,15 +486,21 @@ service User {
   rpc MatchingCredit (common.PersonParam) returns (google.protobuf.Empty);
   // 未读发送模板消息
   rpc SendNewMessageUnreadReminder (SendNewMessageUnreadReminderRequest) returns (google.protobuf.Empty){};
-  // 召回提醒
-  rpc SendRecallReminder (SendNewMessageUnreadReminderRequest) returns (google.protobuf.Empty){};
   // 好友访问提醒
   rpc SendNewVisitorTemplateReminder (common.PersonIDParam) returns (google.protobuf.Empty){};
+  // 用户已读
+  rpc UserRead (UserReadRequest) returns (google.protobuf.Empty){};
+}
+
+message UserReadRequest{
+  string personId  = 1;
+  string name = 2;// 读了谁发的信息
 }
 
 message SendNewMessageUnreadReminderRequest{
   string personId  = 1;
-  repeated string nameList = 2;
+  string sendPersonId = 2;
+  string sendPersonType = 3;
 }
 
 message SendMsgReduceCreditReply{

api/user/user_grpc.pb.go

@@ -173,10 +173,10 @@ type UserClient interface {
 	MatchingCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 未读发送模板消息
 	SendNewMessageUnreadReminder(ctx context.Context, in *SendNewMessageUnreadReminderRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	// 召回提醒
-	SendRecallReminder(ctx context.Context, in *SendNewMessageUnreadReminderRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 好友访问提醒
 	SendNewVisitorTemplateReminder(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 用户已读
+	UserRead(ctx context.Context, in *UserReadRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type userClient struct {
@@ -853,18 +853,18 @@ func (c *userClient) SendNewMessageUnreadReminder(ctx context.Context, in *SendN
 	return out, nil
 }
 
-func (c *userClient) SendRecallReminder(ctx context.Context, in *SendNewMessageUnreadReminderRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *userClient) SendNewVisitorTemplateReminder(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/api.user.User/SendRecallReminder", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.user.User/SendNewVisitorTemplateReminder", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *userClient) SendNewVisitorTemplateReminder(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *userClient) UserRead(ctx context.Context, in *UserReadRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/api.user.User/SendNewVisitorTemplateReminder", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserRead", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1026,10 +1026,10 @@ type UserServer interface {
 	MatchingCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	// 未读发送模板消息
 	SendNewMessageUnreadReminder(context.Context, *SendNewMessageUnreadReminderRequest) (*emptypb.Empty, error)
-	// 召回提醒
-	SendRecallReminder(context.Context, *SendNewMessageUnreadReminderRequest) (*emptypb.Empty, error)
 	// 好友访问提醒
 	SendNewVisitorTemplateReminder(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
+	// 用户已读
+	UserRead(context.Context, *UserReadRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -1259,12 +1259,12 @@ func (UnimplementedUserServer) MatchingCredit(context.Context, *common.PersonPar
 func (UnimplementedUserServer) SendNewMessageUnreadReminder(context.Context, *SendNewMessageUnreadReminderRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendNewMessageUnreadReminder not implemented")
 }
-func (UnimplementedUserServer) SendRecallReminder(context.Context, *SendNewMessageUnreadReminderRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SendRecallReminder not implemented")
-}
 func (UnimplementedUserServer) SendNewVisitorTemplateReminder(context.Context, *common.PersonIDParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendNewVisitorTemplateReminder not implemented")
 }
+func (UnimplementedUserServer) UserRead(context.Context, *UserReadRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserRead not implemented")
+}
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
 
 // UnsafeUserServer may be embedded to opt out of forward compatibility for this service.
@@ -2610,38 +2610,38 @@ func _User_SendNewMessageUnreadReminder_Handler(srv interface{}, ctx context.Con
 	return interceptor(ctx, in, info, handler)
 }
 
-func _User_SendRecallReminder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendNewMessageUnreadReminderRequest)
+func _User_SendNewVisitorTemplateReminder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(UserServer).SendRecallReminder(ctx, in)
+		return srv.(UserServer).SendNewVisitorTemplateReminder(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/api.user.User/SendRecallReminder",
+		FullMethod: "/api.user.User/SendNewVisitorTemplateReminder",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).SendRecallReminder(ctx, req.(*SendNewMessageUnreadReminderRequest))
+		return srv.(UserServer).SendNewVisitorTemplateReminder(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _User_SendNewVisitorTemplateReminder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.PersonIDParam)
+func _User_UserRead_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserReadRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(UserServer).SendNewVisitorTemplateReminder(ctx, in)
+		return srv.(UserServer).UserRead(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/api.user.User/SendNewVisitorTemplateReminder",
+		FullMethod: "/api.user.User/UserRead",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).SendNewVisitorTemplateReminder(ctx, req.(*common.PersonIDParam))
+		return srv.(UserServer).UserRead(ctx, req.(*UserReadRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -2949,14 +2949,14 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendNewMessageUnreadReminder",
 			Handler:    _User_SendNewMessageUnreadReminder_Handler,
 		},
-		{
-			MethodName: "SendRecallReminder",
-			Handler:    _User_SendRecallReminder_Handler,
-		},
 		{
 			MethodName: "SendNewVisitorTemplateReminder",
 			Handler:    _User_SendNewVisitorTemplateReminder_Handler,
 		},
+		{
+			MethodName: "UserRead",
+			Handler:    _User_UserRead_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "user.proto",

js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendNewMessageUnreadReminderRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendNewMessageUnreadReminderRequest,UserReadRequest} from "./user_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

js/api/user/user_pb.ts

@@ -1,8 +1,14 @@
 import {Message} from "../common/common_pb";
 
+export interface UserReadRequest{
+    personId?:string;
+    /**  读了谁发的信息 */
+    name?:string;
+}
 export interface SendNewMessageUnreadReminderRequest{
     personId?:string;
-    nameList?:Array<string>;
+    sendPersonId?:string;
+    sendPersonType?:string;
 }
 export interface SendMsgReduceCreditReply{
     /**  是否发送免费次数用完提醒 */