wfz 3 years ago
parent
commit
7f74f63e09
5 changed files with 740 additions and 822 deletions
  1. 732 801
      api/user/user.pb.go
  2. 1 7
      api/user/user.proto
  3. 6 6
      api/user/user_grpc.pb.go
  4. 1 1
      js/api/user/user_http_pb.ts
  5. 0 7
      js/api/user/user_pb.ts

File diff suppressed because it is too large
+ 732 - 801
api/user/user.pb.go


+ 1 - 7
api/user/user.proto

@@ -489,13 +489,7 @@ service User {
   // 好友访问提醒
   rpc SendNewVisitorTemplateReminder (common.PersonIDParam) returns (google.protobuf.Empty){};
   // 用户已读
-  rpc UserRead (UserReadRequest) returns (google.protobuf.Empty){};
-}
-
-message UserReadRequest{
-  string personId  = 1;
-  string otherId = 2;// 发信息的人的ID
-  string otherType = 3;// 发信息的人的Type
+  rpc UserRead (common.PersonIDParam) returns (google.protobuf.Empty){};
 }
 
 message SendNewMessageUnreadReminderRequest{

+ 6 - 6
api/user/user_grpc.pb.go

@@ -176,7 +176,7 @@ type UserClient interface {
 	// 好友访问提醒
 	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)
+	UserRead(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type userClient struct {
@@ -862,7 +862,7 @@ func (c *userClient) SendNewVisitorTemplateReminder(ctx context.Context, in *com
 	return out, nil
 }
 
-func (c *userClient) UserRead(ctx context.Context, in *UserReadRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *userClient) UserRead(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.user.User/UserRead", in, out, opts...)
 	if err != nil {
@@ -1029,7 +1029,7 @@ type UserServer interface {
 	// 好友访问提醒
 	SendNewVisitorTemplateReminder(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
 	// 用户已读
-	UserRead(context.Context, *UserReadRequest) (*emptypb.Empty, error)
+	UserRead(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -1262,7 +1262,7 @@ func (UnimplementedUserServer) SendNewMessageUnreadReminder(context.Context, *Se
 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) {
+func (UnimplementedUserServer) UserRead(context.Context, *common.PersonIDParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserRead not implemented")
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
@@ -2629,7 +2629,7 @@ func _User_SendNewVisitorTemplateReminder_Handler(srv interface{}, ctx context.C
 }
 
 func _User_UserRead_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserReadRequest)
+	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -2641,7 +2641,7 @@ func _User_UserRead_Handler(srv interface{}, ctx context.Context, dec func(inter
 		FullMethod: "/api.user.User/UserRead",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).UserRead(ctx, req.(*UserReadRequest))
+		return srv.(UserServer).UserRead(ctx, req.(*common.PersonIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }

+ 1 - 1
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,UserReadRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendNewMessageUnreadReminderRequest} 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";

+ 0 - 7
js/api/user/user_pb.ts

@@ -1,12 +1,5 @@
 import {Message} from "../common/common_pb";
 
-export interface UserReadRequest{
-    personId?:string;
-    /**  发信息的人的ID */
-    otherId?:string;
-    /**  发信息的人的Type */
-    otherType?:string;
-}
 export interface SendNewMessageUnreadReminderRequest{
     personId?:string;
     sendPersonId?:string;

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