diff --git a/modules/friend/api_cross_apply.go b/modules/friend/api_cross_apply.go index ce967054b..525d5a373 100644 --- a/modules/friend/api_cross_apply.go +++ b/modules/friend/api_cross_apply.go @@ -169,8 +169,9 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (e } resp := &pb.FriendApplyResp{ - UserId: session.GetUserId(), - FriendId: req.FriendId, + UserId: session.GetUserId(), + FriendId: req.FriendId, + Weapplyids: self.Weapplyids, } session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, resp) diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index c1630366b..773aec533 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -404,8 +404,9 @@ type FriendApplyResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` //用户ID - FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID + UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` //用户ID + FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID + Weapplyids []string `protobuf:"bytes,3,rep,name=weapplyids,proto3" json:"weapplyids"` // 我申请的用户ID } func (x *FriendApplyResp) Reset() { @@ -454,6 +455,13 @@ func (x *FriendApplyResp) GetFriendId() string { return "" } +func (x *FriendApplyResp) GetWeapplyids() []string { + if x != nil { + return x.Weapplyids + } + return nil +} + //删除好友 type FriendDelReq struct { state protoimpl.MessageState @@ -2394,11 +2402,13 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, + 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x65, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x12, 0x1e, 0x0a, 0x0a, 0x77, 0x65, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x69, 0x64, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x77, 0x65, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x69, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d,