From 128b63826c364a17780bff5842ed1c2c42f8bc42 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 21 Aug 2023 19:20:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=90=8C=E6=84=8F=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/friend/api_cross_agree.go | 2 +- modules/friend/api_cross_apply.go | 2 +- pb/friend_msg.pb.go | 36 +++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/friend/api_cross_agree.go b/modules/friend/api_cross_agree.go index 151949d67..3b66bf39e 100644 --- a/modules/friend/api_cross_agree.go +++ b/modules/friend/api_cross_agree.go @@ -60,7 +60,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e //把设置的助战英雄推送给好友 push := &pb.FriendAddAgreePush{ TargetUid: friendId, - Info: self, + Info: this.setDefaultFriendUserBaseInfo(friendId), } this.module.Debug("推送加好友成功", diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index 03bb6045a..47d65289c 100644 --- a/modules/friend/api_cross_apply.go +++ b/modules/friend/api_cross_apply.go @@ -141,7 +141,7 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (e // 申请推送 push := &pb.FriendAddApplyPush{ TargetUid: self.Uid, - Info: self, + Info: this.setDefaultFriendUserBaseInfo(self.Uid), } this.module.Debug("推送加好友成功", diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index e978664f2..69a7f77d7 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -2125,8 +2125,8 @@ type FriendAddAgreePush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` // 好友id - Info *DBFriend `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` + TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` // 好友id + Info *FriendBase `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` } func (x *FriendAddAgreePush) Reset() { @@ -2168,7 +2168,7 @@ func (x *FriendAddAgreePush) GetTargetUid() string { return "" } -func (x *FriendAddAgreePush) GetInfo() *DBFriend { +func (x *FriendAddAgreePush) GetInfo() *FriendBase { if x != nil { return x.Info } @@ -2180,8 +2180,8 @@ type FriendAddApplyPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` // 好友id - Info *DBFriend `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` + TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` // 好友id + Info *FriendBase `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` } func (x *FriendAddApplyPush) Reset() { @@ -2223,7 +2223,7 @@ func (x *FriendAddApplyPush) GetTargetUid() string { return "" } -func (x *FriendAddApplyPush) GetInfo() *DBFriend { +func (x *FriendAddApplyPush) GetInfo() *FriendBase { if x != nil { return x.Info } @@ -2391,19 +2391,19 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x51, 0x0a, 0x12, 0x46, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x53, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, - 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x51, - 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, - 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, - 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x09, 0x2e, 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, - 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, + 0x22, 0x53, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x70, 0x70, + 0x6c, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, + 0x74, 0x55, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2479,8 +2479,8 @@ var file_friend_friend_msg_proto_depIdxs = []int32{ 45, // 8: FriendAssistlistResp.record:type_name -> AssistRecord 0, // 9: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase 0, // 10: FriendAssistHeroListResp.friends:type_name -> FriendBase - 44, // 11: FriendAddAgreePush.info:type_name -> DBFriend - 44, // 12: FriendAddApplyPush.info:type_name -> DBFriend + 0, // 11: FriendAddAgreePush.info:type_name -> FriendBase + 0, // 12: FriendAddApplyPush.info:type_name -> FriendBase 13, // [13:13] is the sub-list for method output_type 13, // [13:13] is the sub-list for method input_type 13, // [13:13] is the sub-list for extension type_name