From 0ae51dfa292c9bd4498675f6492ae507ce173526 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Mon, 4 Jul 2022 10:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=8D=E5=BA=94=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/friend.go | 22 +- cmd/robot/hero.go | 4 +- cmd/robot/login.go | 2 +- cmd/robot/notify.go | 2 +- cmd/robot/pack.go | 2 +- cmd/robot/user.go | 4 +- modules/friend/api_addblack.go | 6 +- modules/friend/api_agree.go | 6 +- modules/friend/api_apply.go | 8 +- modules/friend/api_applylist.go | 6 +- modules/friend/api_blacklist.go | 6 +- modules/friend/api_delblack.go | 6 +- modules/friend/api_list.go | 6 +- modules/friend/api_refuse.go | 6 +- modules/friend/api_search.go | 6 +- pb/friend_msg.pb.go | 493 ++++++++++++++++--------------- pb/hero_db.pb.go | 2 +- pb/proto/friend/friend_msg.proto | 26 +- 18 files changed, 307 insertions(+), 306 deletions(-) diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go index 5c57ef68c..f17577b20 100644 --- a/cmd/robot/friend.go +++ b/cmd/robot/friend.go @@ -15,14 +15,14 @@ var ( mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeList, req: &pb.FriendListReq{}, - rsp: &pb.FriendListRsp{}, - enabled: true, + rsp: &pb.FriendListResp{}, + // enabled: true, }, { //blacklist mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeBlacklist, req: &pb.FriendBlackListReq{}, - rsp: &pb.FriendBlackListRsp{}, + rsp: &pb.FriendBlackListResp{}, }, { //search mainType: string(comm.ModuleFriend), @@ -30,33 +30,33 @@ var ( req: &pb.FriendSearchReq{ NickName: "", //设置测试参数 }, - rsp: &pb.FriendSearchRsp{}, - enabled: true, + rsp: &pb.FriendSearchResp{}, + // enabled: true, }, { //apply mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeApply, req: &pb.FriendApplyReq{}, - rsp: &pb.FriendApplyRsp{}, + rsp: &pb.FriendApplyResp{}, // enabled: true, }, { //applylist mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeApplyList, req: &pb.FriendApplyListReq{}, - rsp: &pb.FriendApplyListRsp{}, + rsp: &pb.FriendApplyListResp{}, }, { //agree mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeAgree, req: &pb.FriendAgreeReq{}, - rsp: &pb.FriendAgreeRsp{}, + rsp: &pb.FriendAgreeResp{}, }, { //refuse mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeRefuse, req: &pb.FriendAgreeReq{}, - rsp: &pb.FriendAgreeRsp{}, + rsp: &pb.FriendAgreeResp{}, }, { //addblack mainType: string(comm.ModuleFriend), @@ -64,14 +64,14 @@ var ( req: &pb.FriendBlackAddReq{ FriendId: "0_62be9f40f67327fb53039b70", }, - rsp: &pb.FriendBlackAddRsp{}, + rsp: &pb.FriendBlackAddResp{}, // enabled: true, }, { //delblack mainType: string(comm.ModuleFriend), subType: friend.FriendSubTypeDelBlack, req: &pb.FriendDelBlackReq{}, - rsp: &pb.FriendDelBlackRsp{}, + rsp: &pb.FriendDelBlackResp{}, }, } ) diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index e131373af..fa5170ad2 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -17,14 +17,14 @@ var ( mainType: string(comm.ModuleHero), subType: hero.HeroSubTypeList, req: &pb.HeroListReq{}, - rsp: &pb.HeroListRsp{}, + rsp: &pb.HeroListRsp{}, print: func(rsp proto.Message) { out := rsp.(*pb.HeroListRsp) for i, v := range out.List { fmt.Printf("%d- %v\n", (i + 1), v) } }, - // enabled: true, + enabled: true, }, { mainType: string(comm.ModuleHero), subType: hero.HeroSubTypeInfo, diff --git a/cmd/robot/login.go b/cmd/robot/login.go index 7100eaf65..e700d5de9 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -43,7 +43,7 @@ func (r *Robot) AccountLogin() { Account: r.opts.Account, Sid: r.opts.ServerId, }, - rsp: &pb.UserLoginResp{}, + rsp: &pb.UserLoginResp{}, enabled: true, }, } diff --git a/cmd/robot/notify.go b/cmd/robot/notify.go index effd2412e..345c3b547 100644 --- a/cmd/robot/notify.go +++ b/cmd/robot/notify.go @@ -10,7 +10,7 @@ var notify_builders = []*TestCase{ //create mainType: comm.MainTypeNotify, subType: comm.SubTypeErrorNotify, - rsp: &pb.NotifyErrorNotifyPush{}, + rsp: &pb.NotifyErrorNotifyPush{}, enabled: true, }, } diff --git a/cmd/robot/pack.go b/cmd/robot/pack.go index 565b8b2dc..19e3a03b7 100644 --- a/cmd/robot/pack.go +++ b/cmd/robot/pack.go @@ -12,7 +12,7 @@ var pack_builders = []*TestCase{ mainType: string(comm.ModulePack), subType: "queryuserpackreq", // req: &pb.Pack_Getlist_Req{IType: 1}, - rsp: &pb.UserCreateRsp{}, + rsp: &pb.UserCreateRsp{}, enabled: true, }, } diff --git a/cmd/robot/user.go b/cmd/robot/user.go index e69d0d740..6494812e1 100644 --- a/cmd/robot/user.go +++ b/cmd/robot/user.go @@ -26,8 +26,8 @@ var user_builders = []*TestCase{ ResType: comm.ResGold, Count: 100, }, - rsp: &pb.UserAddResResp{}, - enabled: true, + rsp: &pb.UserAddResResp{}, + // enabled: true, }, } diff --git a/modules/friend/api_addblack.go b/modules/friend/api_addblack.go index 71d29b83e..6fb568712 100644 --- a/modules/friend/api_addblack.go +++ b/modules/friend/api_addblack.go @@ -21,15 +21,15 @@ func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendBlackAddR err error self *pb.DBFriend target *pb.DBFriend - rsp *pb.FriendBlackAddRsp + Resp *pb.FriendBlackAddResp ) defer func() { - rsp = &pb.FriendBlackAddRsp{ + Resp = &pb.FriendBlackAddResp{ FriendId: req.FriendId, UserId: session.GetUserId(), } - session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, rsp) + session.SendMsg(string(this.module.GetType()), FriendSubTypeAddBlack, Resp) }() self = this.module.modelFriend.GetFriend(session.GetUserId()) diff --git a/modules/friend/api_agree.go b/modules/friend/api_agree.go index b013ea8aa..a6a0225ed 100644 --- a/modules/friend/api_agree.go +++ b/modules/friend/api_agree.go @@ -22,15 +22,15 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (c err error self *pb.DBFriend target *pb.DBFriend - rsp *pb.FriendAgreeRsp + Resp *pb.FriendAgreeResp optNum int32 ) defer func() { - rsp = &pb.FriendAgreeRsp{ + Resp = &pb.FriendAgreeResp{ Num: optNum, } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_apply.go b/modules/friend/api_apply.go index 938997d1d..444d30955 100644 --- a/modules/friend/api_apply.go +++ b/modules/friend/api_apply.go @@ -22,21 +22,21 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (c err error self *pb.DBFriend target *pb.DBFriend - rsp *pb.FriendApplyRsp + Resp *pb.FriendApplyResp ) defer func() { - utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, rsp) + utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), FriendSubTypeApply, req, Resp) }() defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.FriendApplyRsp{ + Resp = &pb.FriendApplyResp{ UserId: session.GetUserId(), FriendId: req.FriendId, } } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApply, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_applylist.go b/modules/friend/api_applylist.go index eb06c5ab3..b7c235208 100644 --- a/modules/friend/api_applylist.go +++ b/modules/friend/api_applylist.go @@ -15,17 +15,17 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyLis var ( err error self *pb.DBFriend - rsp *pb.FriendApplyListRsp + Resp *pb.FriendApplyListResp list []*pb.FriendBase ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.FriendApplyListRsp{ + Resp = &pb.FriendApplyListResp{ List: list, } } - if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeApplyList, Resp); err != nil { code = pb.ErrorCode_SystemError } }() diff --git a/modules/friend/api_blacklist.go b/modules/friend/api_blacklist.go index 000f5c957..91c9174d6 100644 --- a/modules/friend/api_blacklist.go +++ b/modules/friend/api_blacklist.go @@ -16,16 +16,16 @@ func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackLis var ( err error self *pb.DBFriend - rsp *pb.FriendBlackListRsp + Resp *pb.FriendBlackListResp list []*pb.FriendBase ) defer func() { - rsp = &pb.FriendBlackListRsp{ + Resp = &pb.FriendBlackListResp{ Friends: list, } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeBlacklist, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_delblack.go b/modules/friend/api_delblack.go index 91f579c1c..bd4cbaf59 100644 --- a/modules/friend/api_delblack.go +++ b/modules/friend/api_delblack.go @@ -20,16 +20,16 @@ func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackR var ( err error self *pb.DBFriend - rsp *pb.FriendDelBlackRsp + Resp *pb.FriendDelBlackResp ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.FriendDelBlackRsp{ + Resp = &pb.FriendDelBlackResp{ FriendId: req.FriendId, UserId: session.GetUserId(), } } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeDelBlack, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_list.go b/modules/friend/api_list.go index dec98cbd3..e625e5414 100644 --- a/modules/friend/api_list.go +++ b/modules/friend/api_list.go @@ -15,15 +15,15 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq) func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) { var ( self *pb.DBFriend - rsp *pb.FriendListRsp + Resp *pb.FriendListResp list []*pb.FriendBase ) defer func() { - rsp = &pb.FriendListRsp{ + Resp = &pb.FriendListResp{ List: list, } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeList, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_refuse.go b/modules/friend/api_refuse.go index 95b9f5ea9..c84b7d14a 100644 --- a/modules/friend/api_refuse.go +++ b/modules/friend/api_refuse.go @@ -22,15 +22,15 @@ func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) var ( err error self *pb.DBFriend - rsp *pb.FriendRefuseRsp + Resp *pb.FriendRefuseResp optNum int32 ) defer func() { - rsp = &pb.FriendRefuseRsp{ + Resp = &pb.FriendRefuseResp{ Num: optNum, } - err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, rsp) + err := session.SendMsg(string(this.module.GetType()), FriendSubTypeRefuse, Resp) if err != nil { code = pb.ErrorCode_SystemError return diff --git a/modules/friend/api_search.go b/modules/friend/api_search.go index eada9698d..6c649c314 100644 --- a/modules/friend/api_search.go +++ b/modules/friend/api_search.go @@ -18,16 +18,16 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch //搜索 func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data proto.Message) { var ( - rsp *pb.FriendSearchRsp + Resp *pb.FriendSearchResp friend *pb.FriendBase ) defer func() { if code == pb.ErrorCode_Success { - rsp = &pb.FriendSearchRsp{ + Resp = &pb.FriendSearchResp{ Friend: friend, } } - if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, rsp); err != nil { + if err := session.SendMsg(string(this.module.GetType()), FriendSubTypeSearch, Resp); err != nil { code = pb.ErrorCode_SystemError } }() diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index 2c393abc6..efee3d021 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -154,7 +154,7 @@ func (*FriendListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{1} } -type FriendListRsp struct { +type FriendListResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -162,8 +162,8 @@ type FriendListRsp struct { List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } -func (x *FriendListRsp) Reset() { - *x = FriendListRsp{} +func (x *FriendListResp) Reset() { + *x = FriendListResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -171,13 +171,13 @@ func (x *FriendListRsp) Reset() { } } -func (x *FriendListRsp) String() string { +func (x *FriendListResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendListRsp) ProtoMessage() {} +func (*FriendListResp) ProtoMessage() {} -func (x *FriendListRsp) ProtoReflect() protoreflect.Message { +func (x *FriendListResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -189,12 +189,12 @@ func (x *FriendListRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendListRsp.ProtoReflect.Descriptor instead. -func (*FriendListRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendListResp.ProtoReflect.Descriptor instead. +func (*FriendListResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{2} } -func (x *FriendListRsp) GetList() []*FriendBase { +func (x *FriendListResp) GetList() []*FriendBase { if x != nil { return x.List } @@ -249,7 +249,7 @@ func (x *FriendApplyReq) GetFriendId() string { return "" } -type FriendApplyRsp struct { +type FriendApplyResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -258,8 +258,8 @@ type FriendApplyRsp struct { FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID } -func (x *FriendApplyRsp) Reset() { - *x = FriendApplyRsp{} +func (x *FriendApplyResp) Reset() { + *x = FriendApplyResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -267,13 +267,13 @@ func (x *FriendApplyRsp) Reset() { } } -func (x *FriendApplyRsp) String() string { +func (x *FriendApplyResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendApplyRsp) ProtoMessage() {} +func (*FriendApplyResp) ProtoMessage() {} -func (x *FriendApplyRsp) ProtoReflect() protoreflect.Message { +func (x *FriendApplyResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -285,19 +285,19 @@ func (x *FriendApplyRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendApplyRsp.ProtoReflect.Descriptor instead. -func (*FriendApplyRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyResp.ProtoReflect.Descriptor instead. +func (*FriendApplyResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{4} } -func (x *FriendApplyRsp) GetUserId() string { +func (x *FriendApplyResp) GetUserId() string { if x != nil { return x.UserId } return "" } -func (x *FriendApplyRsp) GetFriendId() string { +func (x *FriendApplyResp) GetFriendId() string { if x != nil { return x.FriendId } @@ -352,7 +352,7 @@ func (x *FriendDelReq) GetFriendId() string { return "" } -type FriendDelRsp struct { +type FriendDelResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -361,8 +361,8 @@ type FriendDelRsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` //用户ID } -func (x *FriendDelRsp) Reset() { - *x = FriendDelRsp{} +func (x *FriendDelResp) Reset() { + *x = FriendDelResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -370,13 +370,13 @@ func (x *FriendDelRsp) Reset() { } } -func (x *FriendDelRsp) String() string { +func (x *FriendDelResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendDelRsp) ProtoMessage() {} +func (*FriendDelResp) ProtoMessage() {} -func (x *FriendDelRsp) ProtoReflect() protoreflect.Message { +func (x *FriendDelResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -388,19 +388,19 @@ func (x *FriendDelRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendDelRsp.ProtoReflect.Descriptor instead. -func (*FriendDelRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelResp.ProtoReflect.Descriptor instead. +func (*FriendDelResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{6} } -func (x *FriendDelRsp) GetFriendId() string { +func (x *FriendDelResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendDelRsp) GetUserId() string { +func (x *FriendDelResp) GetUserId() string { if x != nil { return x.UserId } @@ -455,7 +455,7 @@ func (x *FriendAgreeReq) GetFriendIds() []string { return nil } -type FriendAgreeRsp struct { +type FriendAgreeResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -463,8 +463,8 @@ type FriendAgreeRsp struct { Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } -func (x *FriendAgreeRsp) Reset() { - *x = FriendAgreeRsp{} +func (x *FriendAgreeResp) Reset() { + *x = FriendAgreeResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -472,13 +472,13 @@ func (x *FriendAgreeRsp) Reset() { } } -func (x *FriendAgreeRsp) String() string { +func (x *FriendAgreeResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendAgreeRsp) ProtoMessage() {} +func (*FriendAgreeResp) ProtoMessage() {} -func (x *FriendAgreeRsp) ProtoReflect() protoreflect.Message { +func (x *FriendAgreeResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -490,12 +490,12 @@ func (x *FriendAgreeRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendAgreeRsp.ProtoReflect.Descriptor instead. -func (*FriendAgreeRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendAgreeResp.ProtoReflect.Descriptor instead. +func (*FriendAgreeResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{8} } -func (x *FriendAgreeRsp) GetNum() int32 { +func (x *FriendAgreeResp) GetNum() int32 { if x != nil { return x.Num } @@ -550,7 +550,7 @@ func (x *FriendRefuseReq) GetFriendIds() []string { return nil } -type FriendRefuseRsp struct { +type FriendRefuseResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -558,8 +558,8 @@ type FriendRefuseRsp struct { Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } -func (x *FriendRefuseRsp) Reset() { - *x = FriendRefuseRsp{} +func (x *FriendRefuseResp) Reset() { + *x = FriendRefuseResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -567,13 +567,13 @@ func (x *FriendRefuseRsp) Reset() { } } -func (x *FriendRefuseRsp) String() string { +func (x *FriendRefuseResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendRefuseRsp) ProtoMessage() {} +func (*FriendRefuseResp) ProtoMessage() {} -func (x *FriendRefuseRsp) ProtoReflect() protoreflect.Message { +func (x *FriendRefuseResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -585,12 +585,12 @@ func (x *FriendRefuseRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendRefuseRsp.ProtoReflect.Descriptor instead. -func (*FriendRefuseRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendRefuseResp.ProtoReflect.Descriptor instead. +func (*FriendRefuseResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{10} } -func (x *FriendRefuseRsp) GetNum() int32 { +func (x *FriendRefuseResp) GetNum() int32 { if x != nil { return x.Num } @@ -636,7 +636,7 @@ func (*FriendApplyListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{11} } -type FriendApplyListRsp struct { +type FriendApplyListResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -644,8 +644,8 @@ type FriendApplyListRsp struct { List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } -func (x *FriendApplyListRsp) Reset() { - *x = FriendApplyListRsp{} +func (x *FriendApplyListResp) Reset() { + *x = FriendApplyListResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -653,13 +653,13 @@ func (x *FriendApplyListRsp) Reset() { } } -func (x *FriendApplyListRsp) String() string { +func (x *FriendApplyListResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendApplyListRsp) ProtoMessage() {} +func (*FriendApplyListResp) ProtoMessage() {} -func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message { +func (x *FriendApplyListResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -671,12 +671,12 @@ func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendApplyListRsp.ProtoReflect.Descriptor instead. -func (*FriendApplyListRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendApplyListResp.ProtoReflect.Descriptor instead. +func (*FriendApplyListResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{12} } -func (x *FriendApplyListRsp) GetList() []*FriendBase { +func (x *FriendApplyListResp) GetList() []*FriendBase { if x != nil { return x.List } @@ -731,7 +731,7 @@ func (x *FriendSearchReq) GetNickName() string { return "" } -type FriendSearchRsp struct { +type FriendSearchResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -739,8 +739,8 @@ type FriendSearchRsp struct { Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"` } -func (x *FriendSearchRsp) Reset() { - *x = FriendSearchRsp{} +func (x *FriendSearchResp) Reset() { + *x = FriendSearchResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -748,13 +748,13 @@ func (x *FriendSearchRsp) Reset() { } } -func (x *FriendSearchRsp) String() string { +func (x *FriendSearchResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendSearchRsp) ProtoMessage() {} +func (*FriendSearchResp) ProtoMessage() {} -func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message { +func (x *FriendSearchResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -766,12 +766,12 @@ func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendSearchRsp.ProtoReflect.Descriptor instead. -func (*FriendSearchRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendSearchResp.ProtoReflect.Descriptor instead. +func (*FriendSearchResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{14} } -func (x *FriendSearchRsp) GetFriend() *FriendBase { +func (x *FriendSearchResp) GetFriend() *FriendBase { if x != nil { return x.Friend } @@ -817,7 +817,7 @@ func (*FriendBlackListReq) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{15} } -type FriendBlackListRsp struct { +type FriendBlackListResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -825,8 +825,8 @@ type FriendBlackListRsp struct { Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"` } -func (x *FriendBlackListRsp) Reset() { - *x = FriendBlackListRsp{} +func (x *FriendBlackListResp) Reset() { + *x = FriendBlackListResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -834,13 +834,13 @@ func (x *FriendBlackListRsp) Reset() { } } -func (x *FriendBlackListRsp) String() string { +func (x *FriendBlackListResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendBlackListRsp) ProtoMessage() {} +func (*FriendBlackListResp) ProtoMessage() {} -func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message { +func (x *FriendBlackListResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -852,12 +852,12 @@ func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendBlackListRsp.ProtoReflect.Descriptor instead. -func (*FriendBlackListRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackListResp.ProtoReflect.Descriptor instead. +func (*FriendBlackListResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{16} } -func (x *FriendBlackListRsp) GetFriends() []*FriendBase { +func (x *FriendBlackListResp) GetFriends() []*FriendBase { if x != nil { return x.Friends } @@ -912,7 +912,7 @@ func (x *FriendBlackAddReq) GetFriendId() string { return "" } -type FriendBlackAddRsp struct { +type FriendBlackAddResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -921,8 +921,8 @@ type FriendBlackAddRsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *FriendBlackAddRsp) Reset() { - *x = FriendBlackAddRsp{} +func (x *FriendBlackAddResp) Reset() { + *x = FriendBlackAddResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -930,13 +930,13 @@ func (x *FriendBlackAddRsp) Reset() { } } -func (x *FriendBlackAddRsp) String() string { +func (x *FriendBlackAddResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendBlackAddRsp) ProtoMessage() {} +func (*FriendBlackAddResp) ProtoMessage() {} -func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message { +func (x *FriendBlackAddResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -948,19 +948,19 @@ func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendBlackAddRsp.ProtoReflect.Descriptor instead. -func (*FriendBlackAddRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendBlackAddResp.ProtoReflect.Descriptor instead. +func (*FriendBlackAddResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{18} } -func (x *FriendBlackAddRsp) GetFriendId() string { +func (x *FriendBlackAddResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendBlackAddRsp) GetUserId() string { +func (x *FriendBlackAddResp) GetUserId() string { if x != nil { return x.UserId } @@ -1015,7 +1015,7 @@ func (x *FriendDelBlackReq) GetFriendId() string { return "" } -type FriendDelBlackRsp struct { +type FriendDelBlackResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1024,8 +1024,8 @@ type FriendDelBlackRsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *FriendDelBlackRsp) Reset() { - *x = FriendDelBlackRsp{} +func (x *FriendDelBlackResp) Reset() { + *x = FriendDelBlackResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1033,13 +1033,13 @@ func (x *FriendDelBlackRsp) Reset() { } } -func (x *FriendDelBlackRsp) String() string { +func (x *FriendDelBlackResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendDelBlackRsp) ProtoMessage() {} +func (*FriendDelBlackResp) ProtoMessage() {} -func (x *FriendDelBlackRsp) ProtoReflect() protoreflect.Message { +func (x *FriendDelBlackResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1051,19 +1051,19 @@ func (x *FriendDelBlackRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendDelBlackRsp.ProtoReflect.Descriptor instead. -func (*FriendDelBlackRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendDelBlackResp.ProtoReflect.Descriptor instead. +func (*FriendDelBlackResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{20} } -func (x *FriendDelBlackRsp) GetFriendId() string { +func (x *FriendDelBlackResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendDelBlackRsp) GetUserId() string { +func (x *FriendDelBlackResp) GetUserId() string { if x != nil { return x.UserId } @@ -1118,7 +1118,7 @@ func (x *FriendReceiveReq) GetFriendId() string { return "" } -type FriendReceiveRsp struct { +type FriendReceiveResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1127,8 +1127,8 @@ type FriendReceiveRsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *FriendReceiveRsp) Reset() { - *x = FriendReceiveRsp{} +func (x *FriendReceiveResp) Reset() { + *x = FriendReceiveResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1136,13 +1136,13 @@ func (x *FriendReceiveRsp) Reset() { } } -func (x *FriendReceiveRsp) String() string { +func (x *FriendReceiveResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendReceiveRsp) ProtoMessage() {} +func (*FriendReceiveResp) ProtoMessage() {} -func (x *FriendReceiveRsp) ProtoReflect() protoreflect.Message { +func (x *FriendReceiveResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1154,19 +1154,19 @@ func (x *FriendReceiveRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendReceiveRsp.ProtoReflect.Descriptor instead. -func (*FriendReceiveRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendReceiveResp.ProtoReflect.Descriptor instead. +func (*FriendReceiveResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{22} } -func (x *FriendReceiveRsp) GetFriendId() string { +func (x *FriendReceiveResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendReceiveRsp) GetUserId() string { +func (x *FriendReceiveResp) GetUserId() string { if x != nil { return x.UserId } @@ -1221,7 +1221,7 @@ func (x *FriendGiveReq) GetFriendId() string { return "" } -type FriendGiveRsp struct { +type FriendGiveResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1230,8 +1230,8 @@ type FriendGiveRsp struct { UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } -func (x *FriendGiveRsp) Reset() { - *x = FriendGiveRsp{} +func (x *FriendGiveResp) Reset() { + *x = FriendGiveResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1239,13 +1239,13 @@ func (x *FriendGiveRsp) Reset() { } } -func (x *FriendGiveRsp) String() string { +func (x *FriendGiveResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendGiveRsp) ProtoMessage() {} +func (*FriendGiveResp) ProtoMessage() {} -func (x *FriendGiveRsp) ProtoReflect() protoreflect.Message { +func (x *FriendGiveResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1257,19 +1257,19 @@ func (x *FriendGiveRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendGiveRsp.ProtoReflect.Descriptor instead. -func (*FriendGiveRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendGiveResp.ProtoReflect.Descriptor instead. +func (*FriendGiveResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{24} } -func (x *FriendGiveRsp) GetFriendId() string { +func (x *FriendGiveResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendGiveRsp) GetUserId() string { +func (x *FriendGiveResp) GetUserId() string { if x != nil { return x.UserId } @@ -1324,7 +1324,7 @@ func (x *FriendTotalReq) GetFriendId() string { return "" } -type FriendTotalRsp struct { +type FriendTotalResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1333,8 +1333,8 @@ type FriendTotalRsp struct { Total int32 `protobuf:"varint,2,opt,name=total,proto3" json:"total"` //好友数量 } -func (x *FriendTotalRsp) Reset() { - *x = FriendTotalRsp{} +func (x *FriendTotalResp) Reset() { + *x = FriendTotalResp{} if protoimpl.UnsafeEnabled { mi := &file_friend_friend_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1342,13 +1342,13 @@ func (x *FriendTotalRsp) Reset() { } } -func (x *FriendTotalRsp) String() string { +func (x *FriendTotalResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FriendTotalRsp) ProtoMessage() {} +func (*FriendTotalResp) ProtoMessage() {} -func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message { +func (x *FriendTotalResp) ProtoReflect() protoreflect.Message { mi := &file_friend_friend_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1360,19 +1360,19 @@ func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FriendTotalRsp.ProtoReflect.Descriptor instead. -func (*FriendTotalRsp) Descriptor() ([]byte, []int) { +// Deprecated: Use FriendTotalResp.ProtoReflect.Descriptor instead. +func (*FriendTotalResp) Descriptor() ([]byte, []int) { return file_friend_friend_msg_proto_rawDescGZIP(), []int{26} } -func (x *FriendTotalRsp) GetFriendId() string { +func (x *FriendTotalResp) GetFriendId() string { if x != nil { return x.FriendId } return "" } -func (x *FriendTotalRsp) GetTotal() int32 { +func (x *FriendTotalResp) GetTotal() int32 { if x != nil { return x.Total } @@ -1397,89 +1397,90 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x30, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 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, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 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, 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, 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, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, + 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, + 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x4e, 0x75, 0x6d, 0x22, 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, + 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, + 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x22, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, + 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, + 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, + 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, + 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, + 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 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, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, - 0x70, 0x70, 0x6c, 0x79, 0x52, 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, 0x22, 0x2a, 0x0a, 0x0c, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, + 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 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, 0x42, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, - 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, - 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, - 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, - 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, - 0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, - 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, - 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x12, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, - 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, - 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, - 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, - 0x65, 0x22, 0x36, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, - 0x68, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, - 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, - 0x3b, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, - 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, - 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 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, 0x47, 0x0a, - 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, + 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, + 0x6b, 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, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, + 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 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, 0x47, 0x0a, 0x11, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, + 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, + 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, + 0x65, 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, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 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, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 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, 0x46, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x52, 0x73, 0x70, 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, - 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 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, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, - 0x69, 0x76, 0x65, 0x52, 0x73, 0x70, 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, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 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, 0x42, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x73, 0x70, 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, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x54, 0x6f, 0x74, 0x61, 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, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, + 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 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, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1496,39 +1497,39 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte { var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_friend_friend_msg_proto_goTypes = []interface{}{ - (*FriendBase)(nil), // 0: FriendBase - (*FriendListReq)(nil), // 1: FriendListReq - (*FriendListRsp)(nil), // 2: FriendListRsp - (*FriendApplyReq)(nil), // 3: FriendApplyReq - (*FriendApplyRsp)(nil), // 4: FriendApplyRsp - (*FriendDelReq)(nil), // 5: FriendDelReq - (*FriendDelRsp)(nil), // 6: FriendDelRsp - (*FriendAgreeReq)(nil), // 7: FriendAgreeReq - (*FriendAgreeRsp)(nil), // 8: FriendAgreeRsp - (*FriendRefuseReq)(nil), // 9: FriendRefuseReq - (*FriendRefuseRsp)(nil), // 10: FriendRefuseRsp - (*FriendApplyListReq)(nil), // 11: FriendApplyListReq - (*FriendApplyListRsp)(nil), // 12: FriendApplyListRsp - (*FriendSearchReq)(nil), // 13: FriendSearchReq - (*FriendSearchRsp)(nil), // 14: FriendSearchRsp - (*FriendBlackListReq)(nil), // 15: FriendBlackListReq - (*FriendBlackListRsp)(nil), // 16: FriendBlackListRsp - (*FriendBlackAddReq)(nil), // 17: FriendBlackAddReq - (*FriendBlackAddRsp)(nil), // 18: FriendBlackAddRsp - (*FriendDelBlackReq)(nil), // 19: FriendDelBlackReq - (*FriendDelBlackRsp)(nil), // 20: FriendDelBlackRsp - (*FriendReceiveReq)(nil), // 21: FriendReceiveReq - (*FriendReceiveRsp)(nil), // 22: FriendReceiveRsp - (*FriendGiveReq)(nil), // 23: FriendGiveReq - (*FriendGiveRsp)(nil), // 24: FriendGiveRsp - (*FriendTotalReq)(nil), // 25: FriendTotalReq - (*FriendTotalRsp)(nil), // 26: FriendTotalRsp + (*FriendBase)(nil), // 0: FriendBase + (*FriendListReq)(nil), // 1: FriendListReq + (*FriendListResp)(nil), // 2: FriendListResp + (*FriendApplyReq)(nil), // 3: FriendApplyReq + (*FriendApplyResp)(nil), // 4: FriendApplyResp + (*FriendDelReq)(nil), // 5: FriendDelReq + (*FriendDelResp)(nil), // 6: FriendDelResp + (*FriendAgreeReq)(nil), // 7: FriendAgreeReq + (*FriendAgreeResp)(nil), // 8: FriendAgreeResp + (*FriendRefuseReq)(nil), // 9: FriendRefuseReq + (*FriendRefuseResp)(nil), // 10: FriendRefuseResp + (*FriendApplyListReq)(nil), // 11: FriendApplyListReq + (*FriendApplyListResp)(nil), // 12: FriendApplyListResp + (*FriendSearchReq)(nil), // 13: FriendSearchReq + (*FriendSearchResp)(nil), // 14: FriendSearchResp + (*FriendBlackListReq)(nil), // 15: FriendBlackListReq + (*FriendBlackListResp)(nil), // 16: FriendBlackListResp + (*FriendBlackAddReq)(nil), // 17: FriendBlackAddReq + (*FriendBlackAddResp)(nil), // 18: FriendBlackAddResp + (*FriendDelBlackReq)(nil), // 19: FriendDelBlackReq + (*FriendDelBlackResp)(nil), // 20: FriendDelBlackResp + (*FriendReceiveReq)(nil), // 21: FriendReceiveReq + (*FriendReceiveResp)(nil), // 22: FriendReceiveResp + (*FriendGiveReq)(nil), // 23: FriendGiveReq + (*FriendGiveResp)(nil), // 24: FriendGiveResp + (*FriendTotalReq)(nil), // 25: FriendTotalReq + (*FriendTotalResp)(nil), // 26: FriendTotalResp } var file_friend_friend_msg_proto_depIdxs = []int32{ - 0, // 0: FriendListRsp.list:type_name -> FriendBase - 0, // 1: FriendApplyListRsp.list:type_name -> FriendBase - 0, // 2: FriendSearchRsp.friend:type_name -> FriendBase - 0, // 3: FriendBlackListRsp.friends:type_name -> FriendBase + 0, // 0: FriendListResp.list:type_name -> FriendBase + 0, // 1: FriendApplyListResp.list:type_name -> FriendBase + 0, // 2: FriendSearchResp.friend:type_name -> FriendBase + 0, // 3: FriendBlackListResp.friends:type_name -> FriendBase 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -1567,7 +1568,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendListRsp); i { + switch v := v.(*FriendListResp); i { case 0: return &v.state case 1: @@ -1591,7 +1592,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyRsp); i { + switch v := v.(*FriendApplyResp); i { case 0: return &v.state case 1: @@ -1615,7 +1616,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelRsp); i { + switch v := v.(*FriendDelResp); i { case 0: return &v.state case 1: @@ -1639,7 +1640,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendAgreeRsp); i { + switch v := v.(*FriendAgreeResp); i { case 0: return &v.state case 1: @@ -1663,7 +1664,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendRefuseRsp); i { + switch v := v.(*FriendRefuseResp); i { case 0: return &v.state case 1: @@ -1687,7 +1688,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyListRsp); i { + switch v := v.(*FriendApplyListResp); i { case 0: return &v.state case 1: @@ -1711,7 +1712,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendSearchRsp); i { + switch v := v.(*FriendSearchResp); i { case 0: return &v.state case 1: @@ -1735,7 +1736,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackListRsp); i { + switch v := v.(*FriendBlackListResp); i { case 0: return &v.state case 1: @@ -1759,7 +1760,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackAddRsp); i { + switch v := v.(*FriendBlackAddResp); i { case 0: return &v.state case 1: @@ -1783,7 +1784,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelBlackRsp); i { + switch v := v.(*FriendDelBlackResp); i { case 0: return &v.state case 1: @@ -1807,7 +1808,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendReceiveRsp); i { + switch v := v.(*FriendReceiveResp); i { case 0: return &v.state case 1: @@ -1831,7 +1832,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendGiveRsp); i { + switch v := v.(*FriendGiveResp); i { case 0: return &v.state case 1: @@ -1855,7 +1856,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendTotalRsp); i { + switch v := v.(*FriendTotalResp); i { case 0: return &v.state case 1: diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 1fa8bc268..e4b177c6f 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -99,7 +99,7 @@ type DBHero struct { EquipID []string `protobuf:"bytes,17,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID ResonateNum int32 `protobuf:"varint,18,opt,name=resonateNum,proto3" json:"resonateNum" bson:"resonateNum"` //共鸣次数 DistributionResonate int32 `protobuf:"varint,19,opt,name=distributionResonate,proto3" json:"distributionResonate" bson:"distributionResonate"` //分配的共鸣能量 - Energy map[int32]int32 `protobuf:"bytes,20,rep,name=energy,proto3" json:"energy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // @go_tags(`bson:"energy"`)能量分配到哪里 + Energy map[int32]int32 `protobuf:"bytes,20,rep,name=energy,proto3" json:"energy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // @go_tags(`bson:"energy"`)能量分配到哪里[1,0] SameCount int32 `protobuf:"varint,21,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` // 卡片叠加数量 SuiteId int32 `protobuf:"varint,22,opt,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id SuiteExtId int32 `protobuf:"varint,23,opt,name=suiteExtId,proto3" json:"suiteExtId"` // go_tags(`bson:"suiteExtId"`) 扩展套装Id diff --git a/pb/proto/friend/friend_msg.proto b/pb/proto/friend/friend_msg.proto index 5b25eacdb..86ca75635 100644 --- a/pb/proto/friend/friend_msg.proto +++ b/pb/proto/friend/friend_msg.proto @@ -14,13 +14,13 @@ message FriendBase { //好友列表 message FriendListReq {} -message FriendListRsp { repeated FriendBase list = 1; } +message FriendListResp { repeated FriendBase list = 1; } //申请好友 message FriendApplyReq { string friendId = 1; //好友ID } -message FriendApplyRsp { +message FriendApplyResp { string userId = 1; //用户ID string friendId = 2; //好友ID } @@ -30,7 +30,7 @@ message FriendDelReq { string friendId = 1; //好友ID } -message FriendDelRsp { +message FriendDelResp { string friendId = 1; //好友ID string userId = 2; //用户ID } @@ -39,7 +39,7 @@ message FriendDelRsp { message FriendAgreeReq { repeated string friendIds = 1; //被同意的用户 } -message FriendAgreeRsp { +message FriendAgreeResp { int32 Num = 1; //操作的数量 } @@ -47,30 +47,30 @@ message FriendAgreeRsp { message FriendRefuseReq { repeated string friendIds = 1; //被拒绝的用户 } -message FriendRefuseRsp { +message FriendRefuseResp { int32 Num = 1; //操作的数量 } //好友申请列表 message FriendApplyListReq {} -message FriendApplyListRsp { repeated FriendBase list = 1; } +message FriendApplyListResp { repeated FriendBase list = 1; } //好友搜索 message FriendSearchReq { string nickName = 1; //好友昵称 } -message FriendSearchRsp { FriendBase friend = 1; } +message FriendSearchResp { FriendBase friend = 1; } //黑名单 message FriendBlackListReq {} -message FriendBlackListRsp { repeated FriendBase friends = 1; } +message FriendBlackListResp { repeated FriendBase friends = 1; } //添加黑名单 message FriendBlackAddReq { string friendId = 1; } -message FriendBlackAddRsp { +message FriendBlackAddResp { string friendId = 1; string userId = 2; } @@ -78,7 +78,7 @@ message FriendBlackAddRsp { //删除黑名单 message FriendDelBlackReq { string friendId = 1; } -message FriendDelBlackRsp { +message FriendDelBlackResp { string friendId = 1; string userId = 2; } @@ -86,7 +86,7 @@ message FriendDelBlackRsp { //接收 message FriendReceiveReq { string friendId = 1; } -message FriendReceiveRsp { +message FriendReceiveResp { string friendId = 1; string userId = 2; } @@ -94,7 +94,7 @@ message FriendReceiveRsp { //赠送 message FriendGiveReq { string friendId = 1; } -message FriendGiveRsp { +message FriendGiveResp { string friendId = 1; string userId = 2; } @@ -102,7 +102,7 @@ message FriendGiveRsp { //好友数量 message FriendTotalReq { string friendId = 1; } -message FriendTotalRsp { +message FriendTotalResp { string friendId = 1; int32 total = 2; //好友数量 } \ No newline at end of file