From 46016336052bc1fda0393c546afe22f692d603a7 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Fri, 14 Jan 2022 18:29:09 +0800 Subject: [PATCH] Refactor code --- internal/rpc/friend/firend.go | 9 + pkg/common/db/model_struct.go | 2 +- pkg/proto/friend/friend.pb.go | 188 +++++++------- pkg/proto/friend/friend.proto | 8 +- pkg/proto/sdk_ws/ws.pb.go | 471 +++++++++++++++++++--------------- pkg/proto/sdk_ws/ws.proto | 4 +- 6 files changed, 372 insertions(+), 310 deletions(-) diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go index 14de9bb20..4d54787e9 100644 --- a/internal/rpc/friend/firend.go +++ b/internal/rpc/friend/firend.go @@ -442,8 +442,17 @@ func (s *friendServer) GetFriendApplyList(ctx context.Context, req *pbFriend.Get for _, applyUserInfo := range ApplyUsersInfo { var userInfo sdkws.FriendRequest utils.CopyStructFields(&userInfo, applyUserInfo) + u, err := imdb.GetUserByUserID(userInfo.FromUserID) + if err != nil { + log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.FromUserID) + continue + } + userInfo.FromNickname = u.Nickname + userInfo.FromFaceURL = u.FaceURL + userInfo.FromGender = u.Gend appleUserList = append(appleUserList, &userInfo) } + log.NewInfo(req.CommID.OperationID, "rpc GetFriendApplyList ok", pbFriend.GetFriendApplyListResp{FriendRequestList: appleUserList}) return &pbFriend.GetFriendApplyListResp{FriendRequestList: appleUserList}, nil } diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 65a57b96a..0af3a6919 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -138,7 +138,7 @@ type GroupRequest struct { type User struct { UserID string `gorm:"column:user_id;primary_key;size:64"` Nickname string `gorm:"column:name;size:255"` - FaceUrl string `gorm:"column:face_url;size:255"` + FaceURL string `gorm:"column:face_url;size:255"` Gender int32 `gorm:"column:gender"` PhoneNumber string `gorm:"column:phone_number;size:32"` Birth time.Time `gorm:"column:birth"` diff --git a/pkg/proto/friend/friend.pb.go b/pkg/proto/friend/friend.pb.go index 1c46e62ec..0f13634a6 100644 --- a/pkg/proto/friend/friend.pb.go +++ b/pkg/proto/friend/friend.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{0} + return fileDescriptor_friend_33f7e79cb4454131, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -84,7 +84,7 @@ func (m *CommID) Reset() { *m = CommID{} } func (m *CommID) String() string { return proto.CompactTextString(m) } func (*CommID) ProtoMessage() {} func (*CommID) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{1} + return fileDescriptor_friend_33f7e79cb4454131, []int{1} } func (m *CommID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommID.Unmarshal(m, b) @@ -143,7 +143,7 @@ func (m *GetFriendsInfoReq) Reset() { *m = GetFriendsInfoReq{} } func (m *GetFriendsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetFriendsInfoReq) ProtoMessage() {} func (*GetFriendsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{2} + return fileDescriptor_friend_33f7e79cb4454131, []int{2} } func (m *GetFriendsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendsInfoReq.Unmarshal(m, b) @@ -183,7 +183,7 @@ func (m *GetFriendInfoResp) Reset() { *m = GetFriendInfoResp{} } func (m *GetFriendInfoResp) String() string { return proto.CompactTextString(m) } func (*GetFriendInfoResp) ProtoMessage() {} func (*GetFriendInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{3} + return fileDescriptor_friend_33f7e79cb4454131, []int{3} } func (m *GetFriendInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendInfoResp.Unmarshal(m, b) @@ -236,7 +236,7 @@ func (m *AddFriendReq) Reset() { *m = AddFriendReq{} } func (m *AddFriendReq) String() string { return proto.CompactTextString(m) } func (*AddFriendReq) ProtoMessage() {} func (*AddFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{4} + return fileDescriptor_friend_33f7e79cb4454131, []int{4} } func (m *AddFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendReq.Unmarshal(m, b) @@ -281,7 +281,7 @@ func (m *AddFriendResp) Reset() { *m = AddFriendResp{} } func (m *AddFriendResp) String() string { return proto.CompactTextString(m) } func (*AddFriendResp) ProtoMessage() {} func (*AddFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{5} + return fileDescriptor_friend_33f7e79cb4454131, []int{5} } func (m *AddFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResp.Unmarshal(m, b) @@ -322,7 +322,7 @@ func (m *ImportFriendReq) Reset() { *m = ImportFriendReq{} } func (m *ImportFriendReq) String() string { return proto.CompactTextString(m) } func (*ImportFriendReq) ProtoMessage() {} func (*ImportFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{6} + return fileDescriptor_friend_33f7e79cb4454131, []int{6} } func (m *ImportFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ImportFriendReq.Unmarshal(m, b) @@ -382,7 +382,7 @@ func (m *UserIDResult) Reset() { *m = UserIDResult{} } func (m *UserIDResult) String() string { return proto.CompactTextString(m) } func (*UserIDResult) ProtoMessage() {} func (*UserIDResult) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{7} + return fileDescriptor_friend_33f7e79cb4454131, []int{7} } func (m *UserIDResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserIDResult.Unmarshal(m, b) @@ -428,7 +428,7 @@ func (m *ImportFriendResp) Reset() { *m = ImportFriendResp{} } func (m *ImportFriendResp) String() string { return proto.CompactTextString(m) } func (*ImportFriendResp) ProtoMessage() {} func (*ImportFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{8} + return fileDescriptor_friend_33f7e79cb4454131, []int{8} } func (m *ImportFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ImportFriendResp.Unmarshal(m, b) @@ -473,7 +473,7 @@ func (m *GetFriendApplyListReq) Reset() { *m = GetFriendApplyListReq{} } func (m *GetFriendApplyListReq) String() string { return proto.CompactTextString(m) } func (*GetFriendApplyListReq) ProtoMessage() {} func (*GetFriendApplyListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{9} + return fileDescriptor_friend_33f7e79cb4454131, []int{9} } func (m *GetFriendApplyListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendApplyListReq.Unmarshal(m, b) @@ -513,7 +513,7 @@ func (m *GetFriendApplyListResp) Reset() { *m = GetFriendApplyListResp{} func (m *GetFriendApplyListResp) String() string { return proto.CompactTextString(m) } func (*GetFriendApplyListResp) ProtoMessage() {} func (*GetFriendApplyListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{10} + return fileDescriptor_friend_33f7e79cb4454131, []int{10} } func (m *GetFriendApplyListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendApplyListResp.Unmarshal(m, b) @@ -565,7 +565,7 @@ func (m *GetFriendListReq) Reset() { *m = GetFriendListReq{} } func (m *GetFriendListReq) String() string { return proto.CompactTextString(m) } func (*GetFriendListReq) ProtoMessage() {} func (*GetFriendListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{11} + return fileDescriptor_friend_33f7e79cb4454131, []int{11} } func (m *GetFriendListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendListReq.Unmarshal(m, b) @@ -605,7 +605,7 @@ func (m *GetFriendListResp) Reset() { *m = GetFriendListResp{} } func (m *GetFriendListResp) String() string { return proto.CompactTextString(m) } func (*GetFriendListResp) ProtoMessage() {} func (*GetFriendListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{12} + return fileDescriptor_friend_33f7e79cb4454131, []int{12} } func (m *GetFriendListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendListResp.Unmarshal(m, b) @@ -657,7 +657,7 @@ func (m *AddBlacklistReq) Reset() { *m = AddBlacklistReq{} } func (m *AddBlacklistReq) String() string { return proto.CompactTextString(m) } func (*AddBlacklistReq) ProtoMessage() {} func (*AddBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{13} + return fileDescriptor_friend_33f7e79cb4454131, []int{13} } func (m *AddBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddBlacklistReq.Unmarshal(m, b) @@ -695,7 +695,7 @@ func (m *AddBlacklistResp) Reset() { *m = AddBlacklistResp{} } func (m *AddBlacklistResp) String() string { return proto.CompactTextString(m) } func (*AddBlacklistResp) ProtoMessage() {} func (*AddBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{14} + return fileDescriptor_friend_33f7e79cb4454131, []int{14} } func (m *AddBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddBlacklistResp.Unmarshal(m, b) @@ -733,7 +733,7 @@ func (m *RemoveBlacklistReq) Reset() { *m = RemoveBlacklistReq{} } func (m *RemoveBlacklistReq) String() string { return proto.CompactTextString(m) } func (*RemoveBlacklistReq) ProtoMessage() {} func (*RemoveBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{15} + return fileDescriptor_friend_33f7e79cb4454131, []int{15} } func (m *RemoveBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveBlacklistReq.Unmarshal(m, b) @@ -771,7 +771,7 @@ func (m *RemoveBlacklistResp) Reset() { *m = RemoveBlacklistResp{} } func (m *RemoveBlacklistResp) String() string { return proto.CompactTextString(m) } func (*RemoveBlacklistResp) ProtoMessage() {} func (*RemoveBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{16} + return fileDescriptor_friend_33f7e79cb4454131, []int{16} } func (m *RemoveBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveBlacklistResp.Unmarshal(m, b) @@ -809,7 +809,7 @@ func (m *GetBlacklistReq) Reset() { *m = GetBlacklistReq{} } func (m *GetBlacklistReq) String() string { return proto.CompactTextString(m) } func (*GetBlacklistReq) ProtoMessage() {} func (*GetBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{17} + return fileDescriptor_friend_33f7e79cb4454131, []int{17} } func (m *GetBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBlacklistReq.Unmarshal(m, b) @@ -849,7 +849,7 @@ func (m *GetBlacklistResp) Reset() { *m = GetBlacklistResp{} } func (m *GetBlacklistResp) String() string { return proto.CompactTextString(m) } func (*GetBlacklistResp) ProtoMessage() {} func (*GetBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{18} + return fileDescriptor_friend_33f7e79cb4454131, []int{18} } func (m *GetBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBlacklistResp.Unmarshal(m, b) @@ -901,7 +901,7 @@ func (m *IsFriendReq) Reset() { *m = IsFriendReq{} } func (m *IsFriendReq) String() string { return proto.CompactTextString(m) } func (*IsFriendReq) ProtoMessage() {} func (*IsFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{19} + return fileDescriptor_friend_33f7e79cb4454131, []int{19} } func (m *IsFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsFriendReq.Unmarshal(m, b) @@ -941,7 +941,7 @@ func (m *IsFriendResp) Reset() { *m = IsFriendResp{} } func (m *IsFriendResp) String() string { return proto.CompactTextString(m) } func (*IsFriendResp) ProtoMessage() {} func (*IsFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{20} + return fileDescriptor_friend_33f7e79cb4454131, []int{20} } func (m *IsFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsFriendResp.Unmarshal(m, b) @@ -993,7 +993,7 @@ func (m *IsInBlackListReq) Reset() { *m = IsInBlackListReq{} } func (m *IsInBlackListReq) String() string { return proto.CompactTextString(m) } func (*IsInBlackListReq) ProtoMessage() {} func (*IsInBlackListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{21} + return fileDescriptor_friend_33f7e79cb4454131, []int{21} } func (m *IsInBlackListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsInBlackListReq.Unmarshal(m, b) @@ -1033,7 +1033,7 @@ func (m *IsInBlackListResp) Reset() { *m = IsInBlackListResp{} } func (m *IsInBlackListResp) String() string { return proto.CompactTextString(m) } func (*IsInBlackListResp) ProtoMessage() {} func (*IsInBlackListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{22} + return fileDescriptor_friend_33f7e79cb4454131, []int{22} } func (m *IsInBlackListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsInBlackListResp.Unmarshal(m, b) @@ -1085,7 +1085,7 @@ func (m *DeleteFriendReq) Reset() { *m = DeleteFriendReq{} } func (m *DeleteFriendReq) String() string { return proto.CompactTextString(m) } func (*DeleteFriendReq) ProtoMessage() {} func (*DeleteFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{23} + return fileDescriptor_friend_33f7e79cb4454131, []int{23} } func (m *DeleteFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteFriendReq.Unmarshal(m, b) @@ -1123,7 +1123,7 @@ func (m *DeleteFriendResp) Reset() { *m = DeleteFriendResp{} } func (m *DeleteFriendResp) String() string { return proto.CompactTextString(m) } func (*DeleteFriendResp) ProtoMessage() {} func (*DeleteFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{24} + return fileDescriptor_friend_33f7e79cb4454131, []int{24} } func (m *DeleteFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteFriendResp.Unmarshal(m, b) @@ -1164,7 +1164,7 @@ func (m *AddFriendResponseReq) Reset() { *m = AddFriendResponseReq{} } func (m *AddFriendResponseReq) String() string { return proto.CompactTextString(m) } func (*AddFriendResponseReq) ProtoMessage() {} func (*AddFriendResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{25} + return fileDescriptor_friend_33f7e79cb4454131, []int{25} } func (m *AddFriendResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResponseReq.Unmarshal(m, b) @@ -1216,7 +1216,7 @@ func (m *AddFriendResponseResp) Reset() { *m = AddFriendResponseResp{} } func (m *AddFriendResponseResp) String() string { return proto.CompactTextString(m) } func (*AddFriendResponseResp) ProtoMessage() {} func (*AddFriendResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{26} + return fileDescriptor_friend_33f7e79cb4454131, []int{26} } func (m *AddFriendResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResponseResp.Unmarshal(m, b) @@ -1255,7 +1255,7 @@ func (m *SetFriendRemarkReq) Reset() { *m = SetFriendRemarkReq{} } func (m *SetFriendRemarkReq) String() string { return proto.CompactTextString(m) } func (*SetFriendRemarkReq) ProtoMessage() {} func (*SetFriendRemarkReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{27} + return fileDescriptor_friend_33f7e79cb4454131, []int{27} } func (m *SetFriendRemarkReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetFriendRemarkReq.Unmarshal(m, b) @@ -1300,7 +1300,7 @@ func (m *SetFriendRemarkResp) Reset() { *m = SetFriendRemarkResp{} } func (m *SetFriendRemarkResp) String() string { return proto.CompactTextString(m) } func (*SetFriendRemarkResp) ProtoMessage() {} func (*SetFriendRemarkResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{28} + return fileDescriptor_friend_33f7e79cb4454131, []int{28} } func (m *SetFriendRemarkResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetFriendRemarkResp.Unmarshal(m, b) @@ -1338,7 +1338,7 @@ func (m *GetSelfApplyListReq) Reset() { *m = GetSelfApplyListReq{} } func (m *GetSelfApplyListReq) String() string { return proto.CompactTextString(m) } func (*GetSelfApplyListReq) ProtoMessage() {} func (*GetSelfApplyListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{29} + return fileDescriptor_friend_33f7e79cb4454131, []int{29} } func (m *GetSelfApplyListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSelfApplyListReq.Unmarshal(m, b) @@ -1378,7 +1378,7 @@ func (m *GetSelfApplyListResp) Reset() { *m = GetSelfApplyListResp{} } func (m *GetSelfApplyListResp) String() string { return proto.CompactTextString(m) } func (*GetSelfApplyListResp) ProtoMessage() {} func (*GetSelfApplyListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_74665a4d507faa8c, []int{30} + return fileDescriptor_friend_33f7e79cb4454131, []int{30} } func (m *GetSelfApplyListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSelfApplyListResp.Unmarshal(m, b) @@ -1923,68 +1923,68 @@ var _Friend_serviceDesc = grpc.ServiceDesc{ Metadata: "friend/friend.proto", } -func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_74665a4d507faa8c) } +func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_33f7e79cb4454131) } -var fileDescriptor_friend_74665a4d507faa8c = []byte{ - // 945 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x8f, 0xdb, 0x44, - 0x14, 0x96, 0x9b, 0xdd, 0x34, 0x79, 0x49, 0x9b, 0x64, 0x92, 0x6d, 0x83, 0x77, 0x5b, 0x05, 0x1f, - 0x50, 0xc4, 0x21, 0x91, 0x82, 0x2a, 0xb1, 0x14, 0x5a, 0xd2, 0xcd, 0x66, 0x31, 0xb0, 0x6c, 0x35, - 0x5b, 0x2e, 0x08, 0x69, 0xe5, 0xd6, 0x93, 0x60, 0xc5, 0xb1, 0xa7, 0x1e, 0x2f, 0x15, 0x57, 0x0e, - 0x88, 0x1b, 0x12, 0xe2, 0xc6, 0x81, 0x7f, 0x15, 0x79, 0xc6, 0x8e, 0x67, 0x6c, 0x6f, 0x85, 0x5d, - 0xa4, 0x9e, 0x92, 0x37, 0xef, 0x87, 0xdf, 0xfb, 0xde, 0x9b, 0xf7, 0xd9, 0xd0, 0x5f, 0x05, 0x0e, - 0xf1, 0xec, 0xa9, 0xf8, 0x99, 0xd0, 0xc0, 0x0f, 0x7d, 0x54, 0x17, 0x92, 0xfe, 0xe1, 0x05, 0x25, - 0xde, 0x95, 0x79, 0x3e, 0xa5, 0x9b, 0xf5, 0x94, 0xab, 0xa6, 0xcc, 0xde, 0x5c, 0xbd, 0x61, 0xd3, - 0x37, 0x4c, 0x98, 0x1a, 0x4f, 0x00, 0x4e, 0xfc, 0xed, 0xd6, 0xf7, 0x30, 0x61, 0x14, 0x0d, 0xe1, - 0x36, 0x09, 0x82, 0x13, 0xdf, 0x26, 0x43, 0x6d, 0xa4, 0x8d, 0xf7, 0x71, 0x22, 0xa2, 0x7b, 0x50, - 0x27, 0x41, 0x70, 0xce, 0xd6, 0xc3, 0x5b, 0x23, 0x6d, 0xdc, 0xc4, 0xb1, 0x64, 0xfc, 0xaa, 0x41, - 0x3d, 0x0a, 0x60, 0x2e, 0x90, 0x0e, 0x8d, 0x0b, 0xfa, 0x3d, 0x23, 0x81, 0xb9, 0xe0, 0xde, 0x4d, - 0xbc, 0x93, 0xd1, 0x08, 0x5a, 0x17, 0x94, 0x04, 0x56, 0xe8, 0xf8, 0x9e, 0xb9, 0x88, 0x63, 0xc8, - 0x47, 0x91, 0xf7, 0x0b, 0x3f, 0xf6, 0xde, 0x13, 0xde, 0x89, 0x8c, 0x1e, 0x02, 0x2c, 0x03, 0x7f, - 0x1b, 0x6b, 0xf7, 0xb9, 0x56, 0x3a, 0x31, 0x1e, 0x43, 0xef, 0x8c, 0x84, 0x4b, 0x5e, 0x34, 0x33, - 0xbd, 0x95, 0x8f, 0xc9, 0x6b, 0xf4, 0x51, 0x92, 0x18, 0x4f, 0xa6, 0x35, 0xbb, 0x3b, 0x89, 0x31, - 0x12, 0xa7, 0x38, 0xd6, 0x1a, 0xbf, 0x69, 0x92, 0xb7, 0x70, 0x16, 0x48, 0x9c, 0xaa, 0x48, 0x9c, - 0xa6, 0x48, 0x9c, 0x2a, 0x48, 0x08, 0x09, 0x3d, 0x85, 0xbb, 0x69, 0x8c, 0x6f, 0x1d, 0x16, 0x0e, - 0x6b, 0xa3, 0xda, 0xb8, 0x35, 0xbb, 0x3f, 0xf1, 0xa3, 0x2e, 0x38, 0xdb, 0x2b, 0x66, 0x6f, 0x26, - 0xd2, 0x63, 0x32, 0xe6, 0xc6, 0x77, 0xd0, 0x9e, 0xdb, 0xb6, 0x38, 0x2c, 0x51, 0x40, 0x94, 0x10, - 0x26, 0xaf, 0xa5, 0x84, 0x84, 0x64, 0x9c, 0xc0, 0x1d, 0x29, 0x1e, 0xa3, 0x68, 0x26, 0xf7, 0x3a, - 0x0e, 0x8a, 0xe4, 0xa0, 0x42, 0x83, 0x25, 0x2b, 0xe3, 0x6f, 0x0d, 0x3a, 0xe6, 0x96, 0xfa, 0x41, - 0x98, 0x26, 0xf6, 0x31, 0x74, 0x85, 0x20, 0xe0, 0xe7, 0xb5, 0x6a, 0xa3, 0xda, 0xb8, 0x89, 0x73, - 0xe7, 0xff, 0xa1, 0xf1, 0x6a, 0x73, 0x6b, 0xd9, 0xe6, 0x2a, 0x63, 0xb5, 0xa7, 0x8e, 0x95, 0xf1, - 0x04, 0xda, 0xe2, 0x1f, 0x26, 0xec, 0xda, 0x0d, 0x23, 0x28, 0x94, 0x01, 0x8c, 0x25, 0x01, 0x51, - 0x64, 0xc1, 0x13, 0xd8, 0xc7, 0xb1, 0x64, 0xfc, 0xae, 0x41, 0x57, 0xad, 0xae, 0x1a, 0x4c, 0xe8, - 0x4b, 0xe8, 0xca, 0x89, 0x70, 0x48, 0x6e, 0xf1, 0xf6, 0x0f, 0x12, 0x4f, 0x59, 0x8f, 0x73, 0xd6, - 0xc6, 0x53, 0x38, 0xd8, 0x4d, 0xe1, 0x9c, 0x52, 0xf7, 0x97, 0xe8, 0xb4, 0xcc, 0x1c, 0xff, 0xa5, - 0xc1, 0xbd, 0xa2, 0x08, 0x95, 0x86, 0xf9, 0x2b, 0xe8, 0xed, 0xfa, 0x7d, 0x4d, 0x58, 0x28, 0xcd, - 0xb3, 0x5e, 0x30, 0xcf, 0xb1, 0x15, 0xce, 0x3b, 0x19, 0x9f, 0x41, 0x77, 0x97, 0x55, 0xd9, 0x92, - 0x94, 0xab, 0xf9, 0x0e, 0xd5, 0xbc, 0xf3, 0xd5, 0x3c, 0x86, 0xce, 0xdc, 0xb6, 0x9f, 0xb9, 0xd6, - 0xab, 0x8d, 0x5b, 0xb2, 0x86, 0x25, 0x74, 0x55, 0xd7, 0x8a, 0x17, 0xf1, 0x73, 0x40, 0x98, 0x6c, - 0xfd, 0x9f, 0x49, 0xa5, 0x2c, 0x4c, 0xe8, 0xe7, 0xbc, 0x2b, 0x26, 0x72, 0x0c, 0x9d, 0x33, 0x12, - 0x56, 0xca, 0xe2, 0x0f, 0x8d, 0x0f, 0x83, 0x9a, 0x43, 0xf9, 0x76, 0x9a, 0xd0, 0xe3, 0x21, 0xf8, - 0x1d, 0x52, 0x3b, 0x7a, 0xa8, 0x74, 0xf4, 0xf9, 0xf5, 0x4b, 0xd7, 0x79, 0x95, 0x98, 0xe1, 0xbc, - 0x97, 0xf1, 0x08, 0x5a, 0x26, 0x2b, 0xbd, 0x72, 0x8d, 0x1f, 0xa1, 0x9d, 0xba, 0x55, 0xaa, 0x41, - 0x87, 0x46, 0xe4, 0xe9, 0x7b, 0x8c, 0xf0, 0x9d, 0xd7, 0xc0, 0x3b, 0x39, 0xba, 0x32, 0x26, 0x33, - 0x3d, 0x9e, 0x6d, 0xd9, 0x2b, 0x63, 0x41, 0x2f, 0xe3, 0xfb, 0xbf, 0xa7, 0x77, 0x0c, 0x9d, 0x05, - 0x71, 0x49, 0x48, 0xca, 0xe3, 0xb6, 0x84, 0xae, 0xea, 0x5a, 0x71, 0x06, 0x29, 0x0c, 0x14, 0x6a, - 0x8b, 0xf2, 0x2a, 0x43, 0x99, 0x08, 0xf6, 0x56, 0xae, 0xb5, 0x8e, 0xd9, 0x80, 0xff, 0x47, 0x47, - 0xd0, 0xfc, 0xc9, 0xf2, 0x6c, 0x97, 0x44, 0x68, 0x08, 0x1a, 0x4a, 0x0f, 0x8c, 0x6f, 0xe0, 0xa0, - 0xe0, 0x89, 0x15, 0xd3, 0x7f, 0x01, 0xe8, 0x92, 0xec, 0x28, 0x67, 0x6b, 0x05, 0x9b, 0xd2, 0x7c, - 0x1f, 0x39, 0xa5, 0x7c, 0x1f, 0x49, 0xd1, 0x1d, 0xcf, 0x45, 0xad, 0x98, 0xe0, 0x17, 0xd0, 0x3f, - 0x23, 0xe1, 0x25, 0x71, 0x57, 0x95, 0xa8, 0xe8, 0x4f, 0x0d, 0x06, 0x79, 0xff, 0xf7, 0x4b, 0x44, - 0xb3, 0x7f, 0x6e, 0x43, 0xfc, 0x5e, 0x8c, 0x3e, 0x85, 0xa6, 0x95, 0x34, 0x13, 0xed, 0x08, 0x5a, - 0x7e, 0xf9, 0xd2, 0x0f, 0x0a, 0x4e, 0x19, 0x45, 0x97, 0x80, 0xd6, 0x39, 0x8e, 0x45, 0x0f, 0x12, - 0xe3, 0x42, 0x06, 0xd7, 0x1f, 0xbe, 0x4d, 0xcd, 0x28, 0x3a, 0x87, 0xee, 0x3a, 0x83, 0x16, 0x3a, - 0x94, 0x7c, 0xb2, 0x7d, 0xd0, 0x8f, 0x6e, 0x56, 0x32, 0x8a, 0x16, 0x70, 0x67, 0x2d, 0x93, 0x26, - 0x1a, 0xe6, 0x9e, 0x9f, 0x04, 0xfa, 0xe0, 0x06, 0x0d, 0xa3, 0x68, 0x0e, 0x6d, 0x4b, 0xe2, 0x2d, - 0x74, 0x5f, 0x02, 0x44, 0x5e, 0xfe, 0xfa, 0xb0, 0x58, 0xc1, 0x28, 0xfa, 0x1a, 0x3a, 0x81, 0x4a, - 0x3a, 0x48, 0x4f, 0x8c, 0xf3, 0x5c, 0xa6, 0x1f, 0xde, 0xa8, 0x63, 0x14, 0x3d, 0x82, 0x86, 0x13, - 0x6f, 0x5c, 0xd4, 0x4f, 0x0c, 0xa5, 0xd5, 0xad, 0x0f, 0xf2, 0x87, 0x02, 0x0b, 0x47, 0x5e, 0x87, - 0x29, 0x16, 0xd9, 0x0d, 0x9b, 0x62, 0x91, 0xdf, 0x9f, 0x73, 0x68, 0xaf, 0x25, 0xda, 0x4a, 0xb1, - 0xc8, 0x10, 0xa1, 0x3e, 0x2c, 0x56, 0x88, 0x10, 0xb6, 0xb4, 0xf9, 0xd2, 0x10, 0x99, 0x55, 0x9a, - 0x86, 0xc8, 0x2d, 0xca, 0xe7, 0xd0, 0xb3, 0xb2, 0x2b, 0x08, 0x1d, 0x15, 0xce, 0x69, 0xbc, 0x0f, - 0xf5, 0x07, 0x6f, 0xd1, 0x8a, 0x06, 0x31, 0x75, 0x63, 0xa4, 0x0d, 0xca, 0x2f, 0xa8, 0xb4, 0x41, - 0x45, 0x6b, 0x66, 0x0e, 0x6d, 0x47, 0x7a, 0x93, 0x4e, 0x0b, 0xcc, 0x7c, 0x3d, 0xa4, 0x05, 0x66, - 0x5f, 0xbc, 0x9f, 0xf5, 0x7e, 0xe8, 0x4c, 0xe2, 0x0f, 0xd9, 0xc7, 0xe2, 0xe7, 0x65, 0x9d, 0x7f, - 0xa5, 0x7e, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x16, 0xf8, 0xb5, 0xe7, 0x0e, 0x00, - 0x00, +var fileDescriptor_friend_33f7e79cb4454131 = []byte{ + // 949 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x8f, 0xdb, 0x44, + 0x14, 0x97, 0x9b, 0xdd, 0x34, 0x79, 0x49, 0x9b, 0x64, 0x92, 0x2d, 0xc1, 0xdd, 0xad, 0x52, 0x1f, + 0x50, 0xc4, 0x21, 0x91, 0x82, 0x2a, 0xb1, 0x14, 0x0a, 0xe9, 0x26, 0x59, 0x19, 0xd8, 0xa6, 0x9a, + 0x2d, 0x17, 0x84, 0x14, 0xb9, 0xf5, 0x24, 0x58, 0x71, 0xec, 0xa9, 0xc7, 0xdb, 0x8a, 0x2b, 0x27, + 0x0e, 0x5c, 0x91, 0x10, 0x1c, 0xf8, 0x57, 0x91, 0x67, 0xec, 0x78, 0xfc, 0x91, 0x0a, 0x9b, 0x1e, + 0x7a, 0xb2, 0xdf, 0xc7, 0xef, 0xf9, 0x7d, 0xcd, 0x7b, 0x63, 0xe8, 0xae, 0x3d, 0x8b, 0x38, 0xe6, + 0x58, 0x3c, 0x46, 0xd4, 0x73, 0x7d, 0x17, 0x55, 0x05, 0xa5, 0x3e, 0x5c, 0x52, 0xe2, 0xac, 0xf4, + 0xab, 0x31, 0xdd, 0x6e, 0xc6, 0x5c, 0x34, 0x66, 0xe6, 0x76, 0xf5, 0x96, 0x8d, 0xdf, 0x32, 0xa1, + 0xaa, 0x3d, 0x01, 0xb8, 0x70, 0x77, 0x3b, 0xd7, 0xc1, 0x84, 0x51, 0xd4, 0x87, 0xdb, 0xc4, 0xf3, + 0x2e, 0x5c, 0x93, 0xf4, 0x95, 0x81, 0x32, 0x3c, 0xc6, 0x11, 0x89, 0xee, 0x41, 0x95, 0x78, 0xde, + 0x15, 0xdb, 0xf4, 0x6f, 0x0d, 0x94, 0x61, 0x1d, 0x87, 0x94, 0xf6, 0xab, 0x02, 0xd5, 0xc0, 0x80, + 0x3e, 0x43, 0x2a, 0xd4, 0x96, 0xf4, 0x07, 0x46, 0x3c, 0x7d, 0xc6, 0xd1, 0x75, 0xbc, 0xa7, 0xd1, + 0x00, 0x1a, 0x4b, 0x4a, 0x3c, 0xc3, 0xb7, 0x5c, 0x47, 0x9f, 0x85, 0x36, 0x64, 0x56, 0x80, 0x7e, + 0xe1, 0x86, 0xe8, 0x23, 0x81, 0x8e, 0x68, 0xf4, 0x00, 0x60, 0xe1, 0xb9, 0xbb, 0x50, 0x7a, 0xcc, + 0xa5, 0x12, 0x47, 0x7b, 0x0c, 0x9d, 0x4b, 0xe2, 0x2f, 0x78, 0xd0, 0x4c, 0x77, 0xd6, 0x2e, 0x26, + 0xaf, 0xd1, 0x27, 0x91, 0x63, 0xdc, 0x99, 0xc6, 0xe4, 0xee, 0x28, 0xcc, 0x91, 0xe0, 0xe2, 0x50, + 0xaa, 0xfd, 0xae, 0x48, 0x68, 0x01, 0x16, 0x99, 0x98, 0x27, 0x33, 0x31, 0x8f, 0x33, 0x31, 0x4f, + 0x64, 0x42, 0x50, 0x68, 0x0e, 0x77, 0x63, 0x1b, 0xdf, 0x5b, 0xcc, 0xef, 0x57, 0x06, 0x95, 0x61, + 0x63, 0x72, 0x36, 0x62, 0xc4, 0x7b, 0x43, 0xbc, 0x95, 0x41, 0xad, 0x15, 0x35, 0x3c, 0x63, 0xc7, + 0x46, 0xd2, 0xc7, 0x52, 0x20, 0xed, 0x19, 0x34, 0xa7, 0xa6, 0x29, 0x98, 0x05, 0xc2, 0x08, 0xdc, + 0xc2, 0xe4, 0xb5, 0xe4, 0x96, 0xa0, 0xb4, 0x0b, 0xb8, 0x23, 0xd9, 0x63, 0x14, 0x4d, 0xe4, 0x8a, + 0x87, 0x46, 0x91, 0x6c, 0x54, 0x48, 0xb0, 0xa4, 0xa5, 0xfd, 0xad, 0x40, 0x4b, 0xdf, 0x51, 0xd7, + 0xf3, 0x63, 0xc7, 0x3e, 0x85, 0xb6, 0x20, 0x44, 0x11, 0x78, 0xc4, 0xca, 0xa0, 0x32, 0xac, 0xe3, + 0x0c, 0xff, 0x3f, 0x94, 0x3f, 0x59, 0xe2, 0x4a, 0xba, 0xc4, 0x89, 0xe6, 0x3a, 0x4a, 0x36, 0x97, + 0xf6, 0x04, 0x9a, 0xe2, 0x0d, 0x13, 0x76, 0x63, 0xfb, 0x41, 0x2a, 0x12, 0x6d, 0x18, 0x52, 0x22, + 0x45, 0x81, 0x06, 0x77, 0xe0, 0x18, 0x87, 0x94, 0xf6, 0x9b, 0x02, 0xed, 0x64, 0x74, 0xe5, 0xd2, + 0x84, 0xbe, 0x81, 0xb6, 0xec, 0x08, 0x4f, 0xc9, 0x2d, 0xde, 0x04, 0xbd, 0x08, 0x29, 0xcb, 0x71, + 0x46, 0x5b, 0xfb, 0x1a, 0x4e, 0xf6, 0xbd, 0x38, 0xa5, 0xd4, 0xfe, 0x25, 0xe0, 0x16, 0xe9, 0xe6, + 0xbf, 0x14, 0xb8, 0x97, 0x67, 0xa1, 0x54, 0x4b, 0x3f, 0x83, 0xce, 0xbe, 0xde, 0x37, 0x84, 0xf9, + 0x52, 0x57, 0x0f, 0x0e, 0x76, 0x75, 0xa8, 0x8b, 0xb3, 0x50, 0xed, 0x0b, 0x68, 0xef, 0x7d, 0x2b, + 0x1a, 0x58, 0xe2, 0x98, 0xfe, 0x8f, 0x98, 0xde, 0xd3, 0x31, 0x3d, 0x87, 0xd6, 0xd4, 0x34, 0x9f, + 0xda, 0xc6, 0xab, 0xad, 0x5d, 0x30, 0x92, 0x05, 0xb4, 0x93, 0xd0, 0x92, 0x87, 0xf2, 0x4b, 0x40, + 0x98, 0xec, 0xdc, 0x37, 0xa4, 0x94, 0x17, 0x3a, 0x74, 0x33, 0xe8, 0x92, 0x8e, 0x9c, 0x43, 0xeb, + 0x92, 0xf8, 0xa5, 0xbc, 0xf8, 0x43, 0xe1, 0x2d, 0x91, 0xf4, 0xa1, 0x78, 0x51, 0x97, 0xd0, 0xe1, + 0x26, 0xf8, 0x79, 0x4a, 0xd6, 0xf5, 0x61, 0x4e, 0x5d, 0x9f, 0xdf, 0xbc, 0xb4, 0xad, 0x57, 0x91, + 0x32, 0xce, 0x62, 0xb5, 0x47, 0xd0, 0xd0, 0x59, 0xe1, 0x21, 0xac, 0xfd, 0x04, 0xcd, 0x18, 0x56, + 0x2a, 0x12, 0x15, 0x6a, 0x01, 0xd2, 0x75, 0x18, 0xe1, 0x53, 0xb0, 0x86, 0xf7, 0x74, 0x70, 0x7c, + 0x74, 0xa6, 0x3b, 0xdc, 0xdb, 0xa2, 0xc7, 0xc7, 0x80, 0x4e, 0x0a, 0xfb, 0xde, 0xdd, 0x3b, 0x87, + 0xd6, 0x8c, 0xd8, 0xc4, 0x27, 0xc5, 0xf3, 0xb6, 0x80, 0x76, 0x12, 0x5a, 0xb2, 0x13, 0x29, 0xf4, + 0x12, 0xcb, 0x2e, 0xf0, 0xab, 0xc8, 0x12, 0x45, 0x70, 0xb4, 0xb6, 0x8d, 0x4d, 0xb8, 0x1f, 0xf8, + 0x3b, 0x3a, 0x85, 0xfa, 0xcf, 0x86, 0x63, 0xda, 0x24, 0xc8, 0x86, 0x58, 0x4c, 0x31, 0x43, 0xfb, + 0x0e, 0x4e, 0x72, 0xbe, 0x58, 0xd2, 0xfd, 0x17, 0x80, 0xae, 0xc9, 0x7e, 0x09, 0xed, 0x0c, 0x6f, + 0x5b, 0xf8, 0x06, 0x10, 0x80, 0xe2, 0x1b, 0x40, 0x40, 0x05, 0x27, 0x3d, 0x63, 0xb5, 0xa4, 0x83, + 0x5f, 0x41, 0xf7, 0x92, 0xf8, 0xd7, 0xc4, 0x5e, 0x97, 0x5a, 0x4e, 0x7f, 0x2a, 0xd0, 0xcb, 0xe2, + 0x3f, 0x84, 0xd5, 0x34, 0xf9, 0xe7, 0x36, 0x84, 0xb7, 0x66, 0xf4, 0x39, 0xd4, 0x8d, 0xa8, 0xa4, + 0x68, 0xbf, 0xb8, 0xe5, 0x4b, 0x99, 0x7a, 0x92, 0xc3, 0x65, 0x14, 0x5d, 0x03, 0xda, 0x64, 0x76, + 0x2f, 0x3a, 0x8b, 0x94, 0x73, 0x37, 0xbb, 0xfa, 0xe0, 0x5d, 0x62, 0x46, 0xd1, 0x15, 0xb4, 0x37, + 0xa9, 0x9c, 0xa1, 0xfb, 0x12, 0x26, 0x5d, 0x0d, 0xf5, 0xf4, 0xb0, 0x90, 0x51, 0x34, 0x83, 0x3b, + 0x1b, 0x79, 0x8d, 0xa2, 0x7e, 0xe6, 0xfb, 0x91, 0xa1, 0x8f, 0x0f, 0x48, 0x18, 0x45, 0x53, 0x68, + 0x1a, 0xd2, 0x0e, 0x43, 0x1f, 0x49, 0x09, 0x91, 0x17, 0x81, 0xda, 0xcf, 0x17, 0x30, 0x8a, 0xbe, + 0x85, 0x96, 0x97, 0x5c, 0x40, 0x48, 0x8d, 0x94, 0xb3, 0x7b, 0x4d, 0xbd, 0x7f, 0x50, 0xc6, 0x28, + 0x7a, 0x04, 0x35, 0x2b, 0x9c, 0xbb, 0xa8, 0x1b, 0x29, 0x4a, 0x03, 0x5c, 0xed, 0x65, 0x99, 0x22, + 0x17, 0x96, 0x3c, 0x14, 0xe3, 0x5c, 0xa4, 0xe7, 0x6c, 0x9c, 0x8b, 0xec, 0x14, 0x9d, 0x42, 0x73, + 0x23, 0xad, 0xb0, 0x38, 0x17, 0xa9, 0xa5, 0xa8, 0xf6, 0xf3, 0x05, 0xc2, 0x84, 0x29, 0xcd, 0xbf, + 0xd8, 0x44, 0x6a, 0xa0, 0xc6, 0x26, 0x32, 0xe3, 0xf2, 0x39, 0x74, 0x8c, 0xf4, 0x20, 0x42, 0xa7, + 0xb9, 0x7d, 0x1a, 0x4e, 0x45, 0xf5, 0xec, 0x1d, 0x52, 0x51, 0x20, 0x96, 0x9c, 0x1b, 0x71, 0x81, + 0xb2, 0x63, 0x2a, 0x2e, 0x50, 0xde, 0xb0, 0x99, 0x42, 0xd3, 0x92, 0x6e, 0xd8, 0x71, 0x80, 0xa9, + 0xbf, 0x8a, 0x38, 0xc0, 0xf4, 0x85, 0xfc, 0x69, 0xe7, 0xc7, 0xd6, 0x28, 0xfc, 0xcd, 0x7d, 0x2c, + 0x1e, 0x2f, 0xab, 0xfc, 0x1f, 0xf6, 0xb3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x20, 0x88, 0xcd, + 0xd3, 0x05, 0x0f, 0x00, 0x00, } diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index 96a4cb8e4..1baf29c10 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -22,7 +22,7 @@ message GetFriendsInfoReq{ message GetFriendInfoResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.FriendInfo FriendInfoList = 3; + repeated server_api_params.FriendInfo FriendInfoList = 3; // int32 IsBlack = 4; } @@ -68,7 +68,7 @@ message GetFriendListReq{ message GetFriendListResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.FriendInfo FriendInfoList = 3; + repeated server_api_params.FriendInfo FriendInfoList = 3; } @@ -93,7 +93,7 @@ message GetBlacklistReq{ message GetBlacklistResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.PublicUserInfo BlackUserInfoList = 3; + repeated server_api_params.PublicUserInfo BlackUserInfoList = 3; } @@ -148,7 +148,7 @@ message GetSelfApplyListReq{ message GetSelfApplyListResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.FriendRequest FriendRequestList = 3; + repeated server_api_params.FriendRequest FriendRequestList = 3; } service friend{ diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 31bcf268d..9ebfd30df 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: sdk_ws/ws.proto -package open_im_sdk +package server_api_params import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -40,7 +40,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{0} + return fileDescriptor_ws_f24e0416269be717, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -164,7 +164,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{1} + return fileDescriptor_ws_f24e0416269be717, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -269,7 +269,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{2} + return fileDescriptor_ws_f24e0416269be717, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -344,7 +344,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{3} + return fileDescriptor_ws_f24e0416269be717, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -451,7 +451,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{4} + return fileDescriptor_ws_f24e0416269be717, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -536,7 +536,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{5} + return fileDescriptor_ws_f24e0416269be717, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -617,7 +617,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{6} + return fileDescriptor_ws_f24e0416269be717, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -702,14 +702,20 @@ func (m *GroupRequest) GetEx() string { type FriendRequest struct { FromUserID string `protobuf:"bytes,1,opt,name=fromUserID" json:"fromUserID,omitempty"` - ToUserID string `protobuf:"bytes,2,opt,name=toUserID" json:"toUserID,omitempty"` - HandleResult int32 `protobuf:"varint,3,opt,name=handleResult" json:"handleResult,omitempty"` - ReqMsg string `protobuf:"bytes,4,opt,name=reqMsg" json:"reqMsg,omitempty"` - CreateTime uint32 `protobuf:"varint,5,opt,name=createTime" json:"createTime,omitempty"` - HandlerUserID string `protobuf:"bytes,6,opt,name=handlerUserID" json:"handlerUserID,omitempty"` - HandleMsg string `protobuf:"bytes,7,opt,name=handleMsg" json:"handleMsg,omitempty"` - HandleTime uint32 `protobuf:"varint,8,opt,name=handleTime" json:"handleTime,omitempty"` - Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` + FromNickname string `protobuf:"bytes,2,opt,name=fromNickname" json:"fromNickname,omitempty"` + FromFaceURL string `protobuf:"bytes,3,opt,name=fromFaceURL" json:"fromFaceURL,omitempty"` + FromGender string `protobuf:"bytes,4,opt,name=fromGender" json:"fromGender,omitempty"` + ToUserID string `protobuf:"bytes,5,opt,name=toUserID" json:"toUserID,omitempty"` + ToNickname string `protobuf:"bytes,6,opt,name=toNickname" json:"toNickname,omitempty"` + ToFaceURL string `protobuf:"bytes,7,opt,name=toFaceURL" json:"toFaceURL,omitempty"` + ToGender string `protobuf:"bytes,8,opt,name=toGender" json:"toGender,omitempty"` + HandleResult int32 `protobuf:"varint,9,opt,name=handleResult" json:"handleResult,omitempty"` + ReqMsg string `protobuf:"bytes,10,opt,name=reqMsg" json:"reqMsg,omitempty"` + CreateTime uint32 `protobuf:"varint,11,opt,name=createTime" json:"createTime,omitempty"` + HandlerUserID string `protobuf:"bytes,12,opt,name=handlerUserID" json:"handlerUserID,omitempty"` + HandleMsg string `protobuf:"bytes,13,opt,name=handleMsg" json:"handleMsg,omitempty"` + HandleTime uint32 `protobuf:"varint,14,opt,name=handleTime" json:"handleTime,omitempty"` + Ex string `protobuf:"bytes,15,opt,name=ex" json:"ex,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -719,7 +725,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{7} + return fileDescriptor_ws_f24e0416269be717, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -746,6 +752,27 @@ func (m *FriendRequest) GetFromUserID() string { return "" } +func (m *FriendRequest) GetFromNickname() string { + if m != nil { + return m.FromNickname + } + return "" +} + +func (m *FriendRequest) GetFromFaceURL() string { + if m != nil { + return m.FromFaceURL + } + return "" +} + +func (m *FriendRequest) GetFromGender() string { + if m != nil { + return m.FromGender + } + return "" +} + func (m *FriendRequest) GetToUserID() string { if m != nil { return m.ToUserID @@ -753,6 +780,27 @@ func (m *FriendRequest) GetToUserID() string { return "" } +func (m *FriendRequest) GetToNickname() string { + if m != nil { + return m.ToNickname + } + return "" +} + +func (m *FriendRequest) GetToFaceURL() string { + if m != nil { + return m.ToFaceURL + } + return "" +} + +func (m *FriendRequest) GetToGender() string { + if m != nil { + return m.ToGender + } + return "" +} + func (m *FriendRequest) GetHandleResult() int32 { if m != nil { return m.HandleResult @@ -818,7 +866,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{8} + return fileDescriptor_ws_f24e0416269be717, []int{8} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -893,7 +941,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{9} + return fileDescriptor_ws_f24e0416269be717, []int{9} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -948,7 +996,7 @@ func (m *PullMessageReq) Reset() { *m = PullMessageReq{} } func (m *PullMessageReq) String() string { return proto.CompactTextString(m) } func (*PullMessageReq) ProtoMessage() {} func (*PullMessageReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{10} + return fileDescriptor_ws_f24e0416269be717, []int{10} } func (m *PullMessageReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageReq.Unmarshal(m, b) @@ -1012,7 +1060,7 @@ func (m *PullMessageResp) Reset() { *m = PullMessageResp{} } func (m *PullMessageResp) String() string { return proto.CompactTextString(m) } func (*PullMessageResp) ProtoMessage() {} func (*PullMessageResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{11} + return fileDescriptor_ws_f24e0416269be717, []int{11} } func (m *PullMessageResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageResp.Unmarshal(m, b) @@ -1084,7 +1132,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{12} + return fileDescriptor_ws_f24e0416269be717, []int{12} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1116,7 +1164,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{13} + return fileDescriptor_ws_f24e0416269be717, []int{13} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1164,7 +1212,7 @@ func (m *GatherFormat) Reset() { *m = GatherFormat{} } func (m *GatherFormat) String() string { return proto.CompactTextString(m) } func (*GatherFormat) ProtoMessage() {} func (*GatherFormat) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{14} + return fileDescriptor_ws_f24e0416269be717, []int{14} } func (m *GatherFormat) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GatherFormat.Unmarshal(m, b) @@ -1211,7 +1259,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{15} + return fileDescriptor_ws_f24e0416269be717, []int{15} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1280,7 +1328,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{16} + return fileDescriptor_ws_f24e0416269be717, []int{16} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1441,7 +1489,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{17} + return fileDescriptor_ws_f24e0416269be717, []int{17} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1508,7 +1556,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{18} + return fileDescriptor_ws_f24e0416269be717, []int{18} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1557,7 +1605,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{19} + return fileDescriptor_ws_f24e0416269be717, []int{19} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -1612,7 +1660,7 @@ func (m *MemberLeaveTips) Reset() { *m = MemberLeaveTips{} } func (m *MemberLeaveTips) String() string { return proto.CompactTextString(m) } func (*MemberLeaveTips) ProtoMessage() {} func (*MemberLeaveTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{20} + return fileDescriptor_ws_f24e0416269be717, []int{20} } func (m *MemberLeaveTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberLeaveTips.Unmarshal(m, b) @@ -1667,7 +1715,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{21} + return fileDescriptor_ws_f24e0416269be717, []int{21} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -1729,7 +1777,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{22} + return fileDescriptor_ws_f24e0416269be717, []int{22} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -1792,7 +1840,7 @@ func (m *MemberInfoChangedTips) Reset() { *m = MemberInfoChangedTips{} } func (m *MemberInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*MemberInfoChangedTips) ProtoMessage() {} func (*MemberInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{23} + return fileDescriptor_ws_f24e0416269be717, []int{23} } func (m *MemberInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInfoChangedTips.Unmarshal(m, b) @@ -1861,7 +1909,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{24} + return fileDescriptor_ws_f24e0416269be717, []int{24} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1922,7 +1970,7 @@ func (m *GroupInfoChangedTips) Reset() { *m = GroupInfoChangedTips{} } func (m *GroupInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoChangedTips) ProtoMessage() {} func (*GroupInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{25} + return fileDescriptor_ws_f24e0416269be717, []int{25} } func (m *GroupInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoChangedTips.Unmarshal(m, b) @@ -1976,7 +2024,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{26} + return fileDescriptor_ws_f24e0416269be717, []int{26} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -2031,7 +2079,7 @@ func (m *ApplicationProcessedTips) Reset() { *m = ApplicationProcessedTi func (m *ApplicationProcessedTips) String() string { return proto.CompactTextString(m) } func (*ApplicationProcessedTips) ProtoMessage() {} func (*ApplicationProcessedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{27} + return fileDescriptor_ws_f24e0416269be717, []int{27} } func (m *ApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplicationProcessedTips.Unmarshal(m, b) @@ -2092,7 +2140,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{28} + return fileDescriptor_ws_f24e0416269be717, []int{28} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2145,7 +2193,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{29} + return fileDescriptor_ws_f24e0416269be717, []int{29} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2191,7 +2239,7 @@ func (m *FriendApplicationAddedTips) Reset() { *m = FriendApplicationAdd func (m *FriendApplicationAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationAddedTips) ProtoMessage() {} func (*FriendApplicationAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{30} + return fileDescriptor_ws_f24e0416269be717, []int{30} } func (m *FriendApplicationAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationAddedTips.Unmarshal(m, b) @@ -2230,7 +2278,7 @@ func (m *FriendApplicationProcessedTips) Reset() { *m = FriendApplicatio func (m *FriendApplicationProcessedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationProcessedTips) ProtoMessage() {} func (*FriendApplicationProcessedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{31} + return fileDescriptor_ws_f24e0416269be717, []int{31} } func (m *FriendApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationProcessedTips.Unmarshal(m, b) @@ -2271,7 +2319,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{32} + return fileDescriptor_ws_f24e0416269be717, []int{32} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2324,7 +2372,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{33} + return fileDescriptor_ws_f24e0416269be717, []int{33} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2362,7 +2410,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{34} + return fileDescriptor_ws_f24e0416269be717, []int{34} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -2400,7 +2448,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{35} + return fileDescriptor_ws_f24e0416269be717, []int{35} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -2438,7 +2486,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{36} + return fileDescriptor_ws_f24e0416269be717, []int{36} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2477,7 +2525,7 @@ func (m *SelfInfoUpdatedTips) Reset() { *m = SelfInfoUpdatedTips{} } func (m *SelfInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*SelfInfoUpdatedTips) ProtoMessage() {} func (*SelfInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f46b8824c5dbc584, []int{37} + return fileDescriptor_ws_f24e0416269be717, []int{37} } func (m *SelfInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SelfInfoUpdatedTips.Unmarshal(m, b) @@ -2505,169 +2553,174 @@ func (m *SelfInfoUpdatedTips) GetUserID() string { } func init() { - proto.RegisterType((*GroupInfo)(nil), "open_im_sdk.GroupInfo") - proto.RegisterType((*GroupMemberFullInfo)(nil), "open_im_sdk.GroupMemberFullInfo") - proto.RegisterType((*PublicUserInfo)(nil), "open_im_sdk.PublicUserInfo") - proto.RegisterType((*UserInfo)(nil), "open_im_sdk.UserInfo") - proto.RegisterType((*FriendInfo)(nil), "open_im_sdk.FriendInfo") - proto.RegisterType((*BlackInfo)(nil), "open_im_sdk.BlackInfo") - proto.RegisterType((*GroupRequest)(nil), "open_im_sdk.GroupRequest") - proto.RegisterType((*FriendRequest)(nil), "open_im_sdk.FriendRequest") - proto.RegisterType((*PullMessageBySeqListResp)(nil), "open_im_sdk.PullMessageBySeqListResp") - proto.RegisterType((*PullMessageBySeqListReq)(nil), "open_im_sdk.PullMessageBySeqListReq") - proto.RegisterType((*PullMessageReq)(nil), "open_im_sdk.PullMessageReq") - proto.RegisterType((*PullMessageResp)(nil), "open_im_sdk.PullMessageResp") - proto.RegisterType((*GetMaxAndMinSeqReq)(nil), "open_im_sdk.GetMaxAndMinSeqReq") - proto.RegisterType((*GetMaxAndMinSeqResp)(nil), "open_im_sdk.GetMaxAndMinSeqResp") - proto.RegisterType((*GatherFormat)(nil), "open_im_sdk.GatherFormat") - proto.RegisterType((*UserSendMsgResp)(nil), "open_im_sdk.UserSendMsgResp") - proto.RegisterType((*MsgData)(nil), "open_im_sdk.MsgData") - proto.RegisterMapType((map[string]bool)(nil), "open_im_sdk.MsgData.OptionsEntry") - proto.RegisterType((*OfflinePushInfo)(nil), "open_im_sdk.OfflinePushInfo") - proto.RegisterType((*TipsComm)(nil), "open_im_sdk.TipsComm") - proto.RegisterType((*MemberEnterTips)(nil), "open_im_sdk.MemberEnterTips") - proto.RegisterType((*MemberLeaveTips)(nil), "open_im_sdk.MemberLeaveTips") - proto.RegisterType((*MemberInvitedTips)(nil), "open_im_sdk.MemberInvitedTips") - proto.RegisterType((*MemberKickedTips)(nil), "open_im_sdk.MemberKickedTips") - proto.RegisterType((*MemberInfoChangedTips)(nil), "open_im_sdk.MemberInfoChangedTips") - proto.RegisterType((*GroupCreatedTips)(nil), "open_im_sdk.GroupCreatedTips") - proto.RegisterType((*GroupInfoChangedTips)(nil), "open_im_sdk.GroupInfoChangedTips") - proto.RegisterType((*JoinGroupApplicationTips)(nil), "open_im_sdk.JoinGroupApplicationTips") - proto.RegisterType((*ApplicationProcessedTips)(nil), "open_im_sdk.ApplicationProcessedTips") - proto.RegisterType((*FriendApplication)(nil), "open_im_sdk.FriendApplication") - proto.RegisterType((*FromToUserID)(nil), "open_im_sdk.FromToUserID") - proto.RegisterType((*FriendApplicationAddedTips)(nil), "open_im_sdk.FriendApplicationAddedTips") - proto.RegisterType((*FriendApplicationProcessedTips)(nil), "open_im_sdk.FriendApplicationProcessedTips") - proto.RegisterType((*FriendAddedTips)(nil), "open_im_sdk.FriendAddedTips") - proto.RegisterType((*FriendDeletedTips)(nil), "open_im_sdk.FriendDeletedTips") - proto.RegisterType((*BlackAddedTips)(nil), "open_im_sdk.BlackAddedTips") - proto.RegisterType((*BlackDeletedTips)(nil), "open_im_sdk.BlackDeletedTips") - proto.RegisterType((*FriendInfoChangedTips)(nil), "open_im_sdk.FriendInfoChangedTips") - proto.RegisterType((*SelfInfoUpdatedTips)(nil), "open_im_sdk.SelfInfoUpdatedTips") + proto.RegisterType((*GroupInfo)(nil), "server_api_params.GroupInfo") + proto.RegisterType((*GroupMemberFullInfo)(nil), "server_api_params.GroupMemberFullInfo") + proto.RegisterType((*PublicUserInfo)(nil), "server_api_params.PublicUserInfo") + proto.RegisterType((*UserInfo)(nil), "server_api_params.UserInfo") + proto.RegisterType((*FriendInfo)(nil), "server_api_params.FriendInfo") + proto.RegisterType((*BlackInfo)(nil), "server_api_params.BlackInfo") + proto.RegisterType((*GroupRequest)(nil), "server_api_params.GroupRequest") + proto.RegisterType((*FriendRequest)(nil), "server_api_params.FriendRequest") + proto.RegisterType((*PullMessageBySeqListResp)(nil), "server_api_params.PullMessageBySeqListResp") + proto.RegisterType((*PullMessageBySeqListReq)(nil), "server_api_params.PullMessageBySeqListReq") + proto.RegisterType((*PullMessageReq)(nil), "server_api_params.PullMessageReq") + proto.RegisterType((*PullMessageResp)(nil), "server_api_params.PullMessageResp") + proto.RegisterType((*GetMaxAndMinSeqReq)(nil), "server_api_params.GetMaxAndMinSeqReq") + proto.RegisterType((*GetMaxAndMinSeqResp)(nil), "server_api_params.GetMaxAndMinSeqResp") + proto.RegisterType((*GatherFormat)(nil), "server_api_params.GatherFormat") + proto.RegisterType((*UserSendMsgResp)(nil), "server_api_params.UserSendMsgResp") + proto.RegisterType((*MsgData)(nil), "server_api_params.MsgData") + proto.RegisterMapType((map[string]bool)(nil), "server_api_params.MsgData.OptionsEntry") + proto.RegisterType((*OfflinePushInfo)(nil), "server_api_params.OfflinePushInfo") + proto.RegisterType((*TipsComm)(nil), "server_api_params.TipsComm") + proto.RegisterType((*MemberEnterTips)(nil), "server_api_params.MemberEnterTips") + proto.RegisterType((*MemberLeaveTips)(nil), "server_api_params.MemberLeaveTips") + proto.RegisterType((*MemberInvitedTips)(nil), "server_api_params.MemberInvitedTips") + proto.RegisterType((*MemberKickedTips)(nil), "server_api_params.MemberKickedTips") + proto.RegisterType((*MemberInfoChangedTips)(nil), "server_api_params.MemberInfoChangedTips") + proto.RegisterType((*GroupCreatedTips)(nil), "server_api_params.GroupCreatedTips") + proto.RegisterType((*GroupInfoChangedTips)(nil), "server_api_params.GroupInfoChangedTips") + proto.RegisterType((*JoinGroupApplicationTips)(nil), "server_api_params.JoinGroupApplicationTips") + proto.RegisterType((*ApplicationProcessedTips)(nil), "server_api_params.ApplicationProcessedTips") + proto.RegisterType((*FriendApplication)(nil), "server_api_params.FriendApplication") + proto.RegisterType((*FromToUserID)(nil), "server_api_params.FromToUserID") + proto.RegisterType((*FriendApplicationAddedTips)(nil), "server_api_params.FriendApplicationAddedTips") + proto.RegisterType((*FriendApplicationProcessedTips)(nil), "server_api_params.FriendApplicationProcessedTips") + proto.RegisterType((*FriendAddedTips)(nil), "server_api_params.FriendAddedTips") + proto.RegisterType((*FriendDeletedTips)(nil), "server_api_params.FriendDeletedTips") + proto.RegisterType((*BlackAddedTips)(nil), "server_api_params.BlackAddedTips") + proto.RegisterType((*BlackDeletedTips)(nil), "server_api_params.BlackDeletedTips") + proto.RegisterType((*FriendInfoChangedTips)(nil), "server_api_params.FriendInfoChangedTips") + proto.RegisterType((*SelfInfoUpdatedTips)(nil), "server_api_params.SelfInfoUpdatedTips") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_f46b8824c5dbc584) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_f24e0416269be717) } -var fileDescriptor_ws_f46b8824c5dbc584 = []byte{ - // 1917 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4f, 0x6f, 0x1c, 0x49, - 0x15, 0x57, 0xf7, 0x4c, 0xcf, 0x78, 0xde, 0x8c, 0x3d, 0x4e, 0xe7, 0xcf, 0x36, 0x61, 0x15, 0x0d, - 0xad, 0x15, 0xb2, 0x10, 0x64, 0xa5, 0xac, 0x90, 0x96, 0xa0, 0x05, 0x62, 0x3b, 0xce, 0x26, 0xc4, - 0xb1, 0x69, 0x27, 0x70, 0xe0, 0x10, 0xb5, 0xa7, 0x6b, 0xc6, 0xcd, 0x74, 0x57, 0xcd, 0x74, 0x75, - 0x3b, 0xc9, 0x85, 0x33, 0x5f, 0x00, 0x2e, 0x2b, 0x10, 0x37, 0xc4, 0x95, 0x03, 0x7c, 0x21, 0xc4, - 0x01, 0x89, 0x13, 0xe2, 0x04, 0x07, 0x54, 0xaf, 0xaa, 0xbb, 0xab, 0x7a, 0xc6, 0x8e, 0xed, 0x44, - 0xb9, 0xec, 0x6d, 0xde, 0xaf, 0x5f, 0xbd, 0xff, 0xf5, 0xea, 0x55, 0x0d, 0x0c, 0x79, 0x34, 0x7b, - 0xf9, 0x8a, 0x7f, 0xfa, 0x8a, 0xdf, 0x9d, 0x67, 0x2c, 0x67, 0x6e, 0x9f, 0xcd, 0x09, 0x7d, 0x19, - 0xa7, 0x2f, 0x79, 0x34, 0xf3, 0xff, 0x63, 0x43, 0xef, 0x51, 0xc6, 0x8a, 0xf9, 0x63, 0x3a, 0x61, - 0xae, 0x07, 0xdd, 0x29, 0x12, 0xbb, 0x9e, 0x35, 0xb2, 0xb6, 0x7a, 0x41, 0x49, 0xba, 0x1f, 0x43, - 0x0f, 0x7f, 0x3e, 0x0b, 0x53, 0xe2, 0xd9, 0xf8, 0xad, 0x06, 0x5c, 0x1f, 0x06, 0x94, 0xe5, 0xf1, - 0x24, 0x1e, 0x87, 0x79, 0xcc, 0xa8, 0xd7, 0x42, 0x06, 0x03, 0x13, 0x3c, 0x31, 0xcd, 0x33, 0x16, - 0x15, 0x63, 0xe4, 0x69, 0x4b, 0x1e, 0x1d, 0x13, 0xfa, 0x27, 0xe1, 0x98, 0xbc, 0x08, 0x9e, 0x7a, - 0x8e, 0xd4, 0xaf, 0x48, 0x77, 0x04, 0x7d, 0xf6, 0x8a, 0x92, 0xec, 0x05, 0x27, 0xd9, 0xe3, 0x5d, - 0xaf, 0x83, 0x5f, 0x75, 0xc8, 0xbd, 0x03, 0x30, 0xce, 0x48, 0x98, 0x93, 0xe7, 0x71, 0x4a, 0xbc, - 0xee, 0xc8, 0xda, 0x5a, 0x0f, 0x34, 0x44, 0x48, 0x48, 0x49, 0x7a, 0x4c, 0xb2, 0x1d, 0x56, 0xd0, - 0xdc, 0x5b, 0x43, 0x06, 0x1d, 0x72, 0x37, 0xc0, 0x26, 0xaf, 0xbd, 0x1e, 0x8a, 0xb6, 0xc9, 0x6b, - 0xf7, 0x16, 0x74, 0x78, 0x1e, 0xe6, 0x05, 0xf7, 0x60, 0x64, 0x6d, 0x39, 0x81, 0xa2, 0xdc, 0x4f, - 0x60, 0x1d, 0xe5, 0xb2, 0xd2, 0x9a, 0x3e, 0x2e, 0x31, 0xc1, 0x2a, 0x62, 0xcf, 0xdf, 0xcc, 0x89, - 0x37, 0x40, 0x01, 0x35, 0xe0, 0xff, 0xcd, 0x86, 0xeb, 0x18, 0xf7, 0x7d, 0x34, 0x60, 0xaf, 0x48, - 0x92, 0xb7, 0x64, 0xe0, 0x16, 0x74, 0x0a, 0xa9, 0x4e, 0x86, 0x5f, 0x51, 0x42, 0x4f, 0xc6, 0x12, - 0xf2, 0x94, 0x9c, 0x92, 0x04, 0x03, 0xef, 0x04, 0x35, 0xe0, 0xde, 0x86, 0xb5, 0x5f, 0xb1, 0x98, - 0x62, 0x4c, 0x44, 0xc4, 0x5b, 0x41, 0x45, 0x8b, 0x6f, 0x34, 0x1e, 0xcf, 0xa8, 0x48, 0xa9, 0x0c, - 0x77, 0x45, 0xeb, 0x99, 0xe8, 0x98, 0x99, 0xf8, 0x36, 0x6c, 0x84, 0xf3, 0xf9, 0x7e, 0x48, 0xa7, - 0x24, 0x93, 0x4a, 0xbb, 0xa8, 0xb4, 0x81, 0x8a, 0x7c, 0x08, 0x4d, 0x47, 0xac, 0xc8, 0xc6, 0x04, - 0xc3, 0xed, 0x04, 0x1a, 0x22, 0xe4, 0xb0, 0x39, 0xc9, 0xb4, 0x30, 0xca, 0xc8, 0x37, 0x50, 0x95, - 0x15, 0x28, 0xb3, 0xe2, 0xff, 0xc1, 0x82, 0x8d, 0xc3, 0xe2, 0x38, 0x89, 0xc7, 0xc8, 0x20, 0x82, - 0x56, 0x87, 0xc6, 0x32, 0x42, 0xa3, 0x3b, 0x68, 0x9f, 0xed, 0x60, 0xcb, 0x74, 0xf0, 0x16, 0x74, - 0xa6, 0x84, 0x46, 0x24, 0xc3, 0x80, 0x39, 0x81, 0xa2, 0x56, 0x38, 0xee, 0xac, 0x72, 0xdc, 0xff, - 0x9d, 0x0d, 0x6b, 0x1f, 0xd8, 0xb4, 0x11, 0xf4, 0xe7, 0x27, 0x8c, 0x92, 0x67, 0x85, 0x28, 0x26, - 0x95, 0x4c, 0x1d, 0x72, 0x6f, 0x80, 0x73, 0x1c, 0x67, 0xf9, 0x09, 0x66, 0x73, 0x3d, 0x90, 0x84, - 0x40, 0x49, 0x1a, 0xc6, 0x32, 0x85, 0xbd, 0x40, 0x12, 0x2a, 0xe2, 0x6b, 0xd5, 0x3e, 0x30, 0x77, - 0x56, 0x6f, 0x69, 0x67, 0x2d, 0x07, 0x06, 0x56, 0x06, 0xe6, 0xdf, 0x16, 0xc0, 0x5e, 0x16, 0x13, - 0x1a, 0x61, 0x68, 0x1a, 0x5b, 0xda, 0x5a, 0xde, 0xd2, 0xb7, 0xa0, 0x93, 0x91, 0x34, 0xcc, 0x66, - 0x65, 0xc9, 0x4b, 0xaa, 0x61, 0x50, 0x6b, 0xc9, 0xa0, 0xef, 0x03, 0x4c, 0x50, 0x8f, 0x90, 0x83, - 0xa1, 0xea, 0xdf, 0xbb, 0x79, 0x57, 0x6b, 0x7b, 0x77, 0xcb, 0xfc, 0x04, 0x1a, 0xa3, 0xd8, 0x49, - 0x61, 0x14, 0xa9, 0x82, 0x95, 0xb9, 0xad, 0x81, 0x15, 0xf5, 0xda, 0x39, 0xa7, 0x5e, 0xbb, 0x55, - 0xbd, 0xfe, 0xc3, 0x82, 0xde, 0x76, 0x12, 0x8e, 0x67, 0x17, 0x74, 0xda, 0x74, 0xce, 0x5e, 0x72, - 0xee, 0x01, 0xac, 0x1f, 0x0b, 0x71, 0xa5, 0x0b, 0xe8, 0x7f, 0xff, 0xde, 0x37, 0x0d, 0xff, 0xcc, - 0x0d, 0x12, 0x98, 0x2b, 0x4c, 0x47, 0xdb, 0x6f, 0x77, 0xd4, 0x39, 0xc7, 0xd1, 0x4e, 0xe5, 0xe8, - 0x6f, 0x6c, 0x18, 0x60, 0x4b, 0x0b, 0xc8, 0xa2, 0x20, 0x3c, 0x3f, 0xb3, 0xf6, 0xb5, 0x1e, 0x67, - 0x9b, 0x3d, 0xce, 0x87, 0xc1, 0x49, 0x48, 0xa3, 0x84, 0x04, 0x84, 0x17, 0x49, 0x5e, 0x9e, 0x23, - 0x3a, 0x26, 0x8b, 0x62, 0xb1, 0xcf, 0xa7, 0xea, 0x04, 0x51, 0x94, 0x70, 0x4a, 0xf2, 0x89, 0x4f, - 0xd2, 0xe2, 0x1a, 0x10, 0x3a, 0x33, 0xb2, 0xc0, 0x90, 0xca, 0x1d, 0x50, 0x92, 0xb5, 0x4e, 0xe5, - 0x6c, 0x57, 0xd7, 0x59, 0xe7, 0x44, 0xd2, 0x28, 0x40, 0x1e, 0x1d, 0x1a, 0xd2, 0x3c, 0x39, 0xfc, - 0xaf, 0x6c, 0x58, 0x97, 0x95, 0x5e, 0xc6, 0xe2, 0x8e, 0x28, 0x49, 0x96, 0x1a, 0x69, 0xd7, 0x10, - 0xd1, 0x0f, 0x72, 0xf6, 0x42, 0xef, 0xef, 0x15, 0xbd, 0x32, 0x2a, 0xce, 0x05, 0xa3, 0x62, 0x56, - 0x93, 0xb3, 0x54, 0x4d, 0x9f, 0xc0, 0xba, 0x94, 0x63, 0x16, 0xb5, 0x09, 0x9a, 0xb1, 0xed, 0x36, - 0x63, 0x7b, 0xd9, 0xe8, 0xfc, 0xcf, 0x02, 0xef, 0xb0, 0x48, 0x92, 0x7d, 0xc2, 0x79, 0x38, 0x25, - 0xdb, 0x6f, 0x8e, 0xc8, 0xe2, 0x69, 0xcc, 0xf3, 0x80, 0xf0, 0xb9, 0x48, 0x14, 0xc9, 0xb2, 0x1d, - 0x16, 0x11, 0x8c, 0x92, 0x13, 0x94, 0xa4, 0x70, 0x91, 0x64, 0x99, 0xb0, 0x40, 0x75, 0x03, 0x49, - 0x09, 0x3c, 0x0d, 0x5f, 0x1f, 0x91, 0x05, 0x06, 0xa6, 0x15, 0x28, 0x0a, 0xf1, 0x98, 0x0a, 0xbc, - 0xad, 0x70, 0xa4, 0xdc, 0x1f, 0xc3, 0x3a, 0x8f, 0xe9, 0x54, 0x26, 0x57, 0x16, 0x4b, 0x6b, 0xab, - 0x7f, 0xef, 0x1b, 0xc6, 0x06, 0x7a, 0x14, 0xe6, 0x27, 0x24, 0xdb, 0x63, 0x59, 0x1a, 0xe6, 0x81, - 0xc9, 0xef, 0x7e, 0x01, 0x03, 0x2c, 0xd8, 0x72, 0x7d, 0xe7, 0x6d, 0xeb, 0x0d, 0x76, 0x3f, 0x85, - 0x8f, 0x56, 0x7b, 0xbf, 0x38, 0x73, 0xc7, 0x88, 0xae, 0x81, 0x9b, 0x2f, 0x66, 0xb4, 0x2a, 0x10, - 0x1d, 0x12, 0x61, 0xe3, 0x52, 0x8e, 0xd7, 0x1a, 0xb5, 0xb6, 0x5a, 0x41, 0x49, 0xfa, 0xbf, 0x16, - 0xc7, 0x65, 0xa5, 0xee, 0x3c, 0x2d, 0xb7, 0x61, 0x8d, 0x93, 0xc5, 0x36, 0x99, 0xc6, 0x14, 0x55, - 0xb4, 0x82, 0x8a, 0xc6, 0x59, 0x88, 0x2c, 0x1e, 0xd2, 0xa8, 0x0c, 0xb2, 0xa4, 0x9a, 0x96, 0xb5, - 0x97, 0x2c, 0x13, 0x5d, 0x7f, 0x68, 0x18, 0xf0, 0xb5, 0x48, 0xf2, 0x0d, 0x70, 0x1f, 0x91, 0x7c, - 0x3f, 0x7c, 0xfd, 0x80, 0x46, 0xfb, 0x68, 0x52, 0x40, 0x16, 0xfe, 0x43, 0xb8, 0xbe, 0x84, 0xf2, - 0xb9, 0xe6, 0x9c, 0x75, 0x86, 0x73, 0xb6, 0xee, 0x9c, 0xff, 0x25, 0x0c, 0x74, 0xd5, 0x62, 0x83, - 0xc5, 0x91, 0x4a, 0xa6, 0x1d, 0x47, 0xee, 0x16, 0xb4, 0x13, 0x51, 0x09, 0x36, 0xda, 0x7c, 0xc3, - 0xb0, 0x79, 0x9f, 0x4f, 0x77, 0xc3, 0x3c, 0x0c, 0x90, 0xc3, 0x5f, 0xc0, 0x50, 0x58, 0x7c, 0x44, - 0x68, 0xb4, 0xcf, 0xa7, 0x68, 0xcc, 0x08, 0xfa, 0x9c, 0x64, 0xa7, 0xe8, 0x46, 0x7d, 0x42, 0x69, - 0x90, 0xe0, 0x18, 0x27, 0x31, 0xa1, 0xb9, 0xe4, 0x50, 0xd5, 0xa8, 0x41, 0xb2, 0x92, 0x68, 0x54, - 0x1d, 0xcf, 0x58, 0x49, 0x92, 0xf6, 0xff, 0xea, 0x40, 0x57, 0x19, 0x21, 0xab, 0x8a, 0x46, 0x75, - 0x25, 0x4a, 0x4a, 0x76, 0xb3, 0xf1, 0x69, 0x3d, 0xeb, 0x4a, 0x4a, 0x3f, 0x39, 0x5a, 0xe6, 0xc9, - 0xd1, 0xb0, 0xa9, 0xbd, 0x6c, 0x53, 0xc3, 0x2f, 0x67, 0xd9, 0xaf, 0xef, 0xc0, 0x26, 0xc7, 0x79, - 0xea, 0x30, 0x09, 0xf3, 0x09, 0xcb, 0x52, 0xd5, 0x0e, 0x9d, 0x60, 0x09, 0x17, 0x87, 0xa4, 0xc4, - 0x9e, 0x95, 0x53, 0x9c, 0x6c, 0x8b, 0x0d, 0x54, 0xf4, 0x57, 0x89, 0xec, 0xa9, 0x89, 0x4e, 0x8e, - 0x55, 0x26, 0x28, 0x6d, 0xe3, 0x3c, 0x66, 0x14, 0x6f, 0x0b, 0x3d, 0x54, 0xaa, 0x43, 0xc2, 0xf3, - 0x94, 0x4f, 0xf7, 0x32, 0x96, 0xaa, 0xe1, 0xaa, 0x24, 0xd1, 0x73, 0x46, 0x73, 0x42, 0x73, 0x5c, - 0xdb, 0x97, 0x6b, 0x35, 0x48, 0xac, 0x55, 0x24, 0xde, 0x43, 0x06, 0x41, 0x49, 0x8a, 0xbe, 0x3e, - 0x61, 0xd9, 0x98, 0x60, 0xdf, 0x58, 0x1f, 0xb5, 0x44, 0x5f, 0xaf, 0x00, 0x77, 0x13, 0x5a, 0x9c, - 0x2c, 0xbc, 0x0d, 0x4c, 0xa0, 0xf8, 0x69, 0xe4, 0x75, 0x68, 0xe6, 0xb5, 0x71, 0xd2, 0x6c, 0xe2, - 0x57, 0xfd, 0xa4, 0xf9, 0x21, 0x74, 0xd9, 0x5c, 0xf4, 0x04, 0xee, 0x5d, 0xc3, 0xba, 0xfc, 0xd6, - 0xaa, 0xba, 0xbc, 0x7b, 0x20, 0x79, 0x1e, 0xd2, 0x3c, 0x7b, 0x13, 0x94, 0x2b, 0xdc, 0x3d, 0x18, - 0xb2, 0xc9, 0x24, 0x89, 0x29, 0x39, 0x2c, 0xf8, 0x09, 0x8e, 0x3d, 0x2e, 0x8e, 0x3d, 0x1f, 0x1b, - 0x42, 0x0e, 0x4c, 0x9e, 0xa0, 0xb9, 0xe8, 0xf6, 0x7d, 0x18, 0xe8, 0x0a, 0x84, 0x8b, 0x33, 0xf2, - 0x46, 0x55, 0x9f, 0xf8, 0x29, 0x46, 0xe2, 0xd3, 0x30, 0x29, 0xe4, 0xe4, 0xb5, 0x16, 0x48, 0xe2, - 0xbe, 0xfd, 0xb9, 0xe5, 0xff, 0xd6, 0x82, 0x61, 0x43, 0x81, 0xe0, 0xce, 0xe3, 0x3c, 0x21, 0x4a, - 0x82, 0x24, 0x5c, 0x17, 0xda, 0x11, 0xe1, 0x63, 0x55, 0xbc, 0xf8, 0x5b, 0x1d, 0x82, 0xad, 0x6a, - 0xa8, 0x16, 0xd7, 0xe1, 0x83, 0x23, 0x21, 0xe8, 0x88, 0x15, 0x34, 0xaa, 0xae, 0xc3, 0x1a, 0x26, - 0x8a, 0x27, 0x3e, 0x38, 0xda, 0x0e, 0xa3, 0x29, 0x91, 0x97, 0x56, 0x07, 0x6d, 0x32, 0x41, 0x7f, - 0x17, 0xd6, 0x9e, 0xc7, 0x73, 0xbe, 0xc3, 0xd2, 0x54, 0x6c, 0x9c, 0x88, 0xe4, 0x62, 0xa2, 0xb7, - 0x30, 0xd3, 0x8a, 0x12, 0x45, 0x12, 0x91, 0x49, 0x58, 0x24, 0xb9, 0x60, 0x2d, 0xb7, 0xac, 0x06, - 0xf9, 0x7f, 0xb6, 0x60, 0x28, 0xef, 0xa2, 0x0f, 0x69, 0x4e, 0x32, 0x81, 0xb9, 0xdf, 0x05, 0x07, - 0xf7, 0x17, 0x0a, 0xeb, 0xdf, 0xbb, 0x65, 0x36, 0xbf, 0xf2, 0xd5, 0x20, 0x90, 0x4c, 0xee, 0x36, - 0xf4, 0x09, 0xcd, 0xb3, 0x90, 0xe6, 0x38, 0x76, 0xdb, 0xb8, 0x66, 0xb4, 0xbc, 0xc6, 0xbc, 0xf1, - 0x06, 0xfa, 0x22, 0xe1, 0x71, 0x75, 0x76, 0x68, 0xdd, 0xc3, 0x04, 0xfd, 0x3f, 0x55, 0xb6, 0x3e, - 0x25, 0xe1, 0x29, 0xb9, 0x82, 0xad, 0x3f, 0x01, 0x48, 0xc4, 0xd2, 0xec, 0x52, 0xa6, 0x6a, 0x6b, - 0x2e, 0x68, 0xe9, 0xbf, 0x2c, 0xb8, 0x26, 0x85, 0x3c, 0xa6, 0xa7, 0x71, 0x4e, 0xa2, 0x2b, 0xd8, - 0xfa, 0x39, 0x74, 0xd8, 0xfc, 0x52, 0x76, 0x2a, 0x7e, 0xf7, 0x09, 0x0c, 0x63, 0xa9, 0x56, 0x90, - 0xd5, 0x70, 0x70, 0x11, 0x11, 0xcd, 0x85, 0xcb, 0xfe, 0xb6, 0x57, 0xf9, 0xfb, 0x4f, 0x0b, 0x36, - 0xa5, 0xa4, 0x9f, 0xc6, 0xe3, 0xd9, 0x07, 0x76, 0xf7, 0x4b, 0xd8, 0x98, 0xa1, 0xd6, 0x4b, 0x7b, - 0xdb, 0x58, 0x77, 0x41, 0x67, 0xff, 0x6b, 0xc1, 0xcd, 0x32, 0xb9, 0x13, 0xb6, 0x73, 0x22, 0xae, - 0xba, 0xd2, 0x63, 0xd1, 0x0b, 0x91, 0xc4, 0x96, 0x2c, 0x47, 0x1c, 0x0d, 0x79, 0x07, 0x1f, 0x7f, - 0x04, 0xbd, 0x49, 0x4c, 0xc3, 0x44, 0xbb, 0xf9, 0xbd, 0x7d, 0x71, 0xbd, 0x44, 0x74, 0xf0, 0xb4, - 0x50, 0x3d, 0x5a, 0xbd, 0x07, 0x95, 0x74, 0x9d, 0x27, 0xe7, 0x02, 0x79, 0xf2, 0xff, 0x6e, 0xc1, - 0x26, 0x82, 0x3b, 0xd8, 0xe3, 0xaf, 0x92, 0xea, 0xfb, 0xd0, 0x55, 0x6f, 0x66, 0x17, 0x8e, 0x43, - 0xb9, 0x40, 0xec, 0x60, 0xf9, 0x76, 0x77, 0xa9, 0x44, 0x6b, 0x6b, 0x2e, 0x98, 0xe4, 0x3f, 0x5a, - 0x70, 0xa3, 0x32, 0x5c, 0xcf, 0xb1, 0x38, 0x77, 0x15, 0x59, 0x27, 0x59, 0x87, 0xea, 0x60, 0xd8, - 0x97, 0xab, 0xfb, 0xd6, 0xe5, 0x6a, 0xc2, 0xff, 0xca, 0x02, 0xef, 0x09, 0x8b, 0x29, 0xf2, 0x3c, - 0x98, 0xcf, 0x13, 0xf5, 0xe4, 0x7a, 0x85, 0x8c, 0xfc, 0x00, 0x7a, 0xa1, 0x14, 0x40, 0x73, 0x65, - 0xf6, 0xb9, 0x0f, 0x0b, 0x35, 0xb7, 0x9c, 0xd9, 0x42, 0x5e, 0xbd, 0xfe, 0x2a, 0xca, 0xff, 0x8b, - 0x05, 0x9e, 0x66, 0xd4, 0x61, 0xc6, 0xc6, 0x84, 0xf3, 0x0f, 0xdc, 0x1a, 0xd0, 0x38, 0xed, 0xf2, - 0xac, 0x28, 0xcd, 0xe8, 0xb6, 0x61, 0xf4, 0x0c, 0xae, 0xc9, 0xfb, 0xbb, 0x66, 0xb9, 0x98, 0xa3, - 0xc2, 0x48, 0x0e, 0x3f, 0x72, 0x4e, 0x2f, 0x49, 0xf3, 0x41, 0x45, 0xbd, 0x8e, 0xd7, 0x0f, 0x2a, - 0x77, 0x00, 0xc2, 0x28, 0xfa, 0x05, 0xcb, 0xa2, 0x98, 0x4e, 0x55, 0x74, 0x34, 0xc4, 0x7f, 0x02, - 0x03, 0x31, 0xc9, 0x3d, 0x67, 0xf5, 0x6b, 0xc3, 0x55, 0xdf, 0x0a, 0xfc, 0x5f, 0xc2, 0xed, 0x25, - 0xc3, 0x1f, 0x44, 0x91, 0x0a, 0xf7, 0x17, 0x30, 0x98, 0x68, 0x9a, 0x54, 0xd4, 0xcd, 0x4b, 0x8d, - 0x6e, 0x4a, 0x60, 0xb0, 0xfb, 0x2f, 0xe1, 0xce, 0x92, 0x70, 0x33, 0x9f, 0xef, 0xa8, 0xe0, 0xf7, - 0x16, 0x0c, 0x95, 0x86, 0xca, 0xe6, 0x4f, 0xa1, 0x23, 0xdf, 0xe8, 0x94, 0xb0, 0x8f, 0x1a, 0xc2, - 0xca, 0xf7, 0xc4, 0x40, 0xb1, 0x2d, 0xef, 0x6b, 0x7b, 0xc5, 0xbe, 0x76, 0x3f, 0x6b, 0x6c, 0xb7, - 0x73, 0xcb, 0xbc, 0xdc, 0x69, 0x41, 0x59, 0x16, 0xbb, 0x24, 0x21, 0xf9, 0xfb, 0xf1, 0xf9, 0x00, - 0x36, 0xf0, 0x79, 0xf0, 0xbd, 0x65, 0xe9, 0x67, 0xb0, 0x89, 0x02, 0xdf, 0xa3, 0x8d, 0x3f, 0x87, - 0x9b, 0x75, 0xa0, 0xf5, 0x26, 0xf8, 0x8e, 0x72, 0xbf, 0x07, 0xd7, 0x8f, 0x48, 0x32, 0x11, 0x52, - 0x5f, 0xcc, 0xa3, 0xea, 0x14, 0x39, 0xe3, 0x81, 0xe2, 0xb8, 0x83, 0x7f, 0x60, 0x7d, 0xf6, 0xff, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xf7, 0xb0, 0x0f, 0xd3, 0x1a, 0x00, 0x00, +var fileDescriptor_ws_f24e0416269be717 = []byte{ + // 1991 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcd, 0x6f, 0x23, 0x49, + 0x15, 0x57, 0xb7, 0x3f, 0x12, 0x3f, 0xdb, 0x71, 0xa6, 0x67, 0x76, 0xb0, 0xc2, 0x32, 0x84, 0xd6, + 0x6a, 0x89, 0x90, 0x08, 0x52, 0x10, 0x12, 0x2c, 0x12, 0x30, 0x93, 0x2f, 0x66, 0x89, 0x33, 0x51, + 0x67, 0x46, 0xcb, 0x01, 0x69, 0x54, 0x71, 0x97, 0x9d, 0x26, 0xed, 0x2a, 0xbb, 0xba, 0x9c, 0x99, + 0xb9, 0x70, 0xe6, 0xc2, 0x11, 0x8e, 0x5c, 0x11, 0x12, 0x37, 0x84, 0xb8, 0x71, 0xe0, 0xdf, 0xe0, + 0x5f, 0xe0, 0x0a, 0x12, 0x12, 0xd2, 0xa2, 0x7a, 0x55, 0xdd, 0x5d, 0xe5, 0x8f, 0xac, 0x31, 0x11, + 0x7b, 0xd8, 0x9b, 0xdf, 0xaf, 0xeb, 0x7d, 0xbf, 0x7a, 0x55, 0xf5, 0x0c, 0x9d, 0x2c, 0xbe, 0x79, + 0xfd, 0x26, 0xfb, 0xd6, 0x9b, 0x6c, 0x7f, 0x2c, 0xb8, 0xe4, 0xc1, 0x83, 0x8c, 0x8a, 0x5b, 0x2a, + 0x5e, 0x93, 0x71, 0xf2, 0x7a, 0x4c, 0x04, 0x19, 0x65, 0xe1, 0x3f, 0x7c, 0x68, 0x9c, 0x0a, 0x3e, + 0x1d, 0x3f, 0x67, 0x03, 0x1e, 0x74, 0x61, 0x63, 0x88, 0xc4, 0x51, 0xd7, 0xdb, 0xf5, 0xf6, 0x1a, + 0x51, 0x4e, 0x06, 0xef, 0x43, 0x03, 0x7f, 0x9e, 0x93, 0x11, 0xed, 0xfa, 0xf8, 0xad, 0x04, 0x82, + 0x10, 0x5a, 0x8c, 0xcb, 0x64, 0x90, 0xf4, 0x89, 0x4c, 0x38, 0xeb, 0x56, 0x70, 0x81, 0x83, 0xa9, + 0x35, 0x09, 0x93, 0x82, 0xc7, 0xd3, 0x3e, 0xae, 0xa9, 0xea, 0x35, 0x36, 0xa6, 0xf4, 0x0f, 0x48, + 0x9f, 0xbe, 0x8a, 0xce, 0xba, 0x35, 0xad, 0xdf, 0x90, 0xc1, 0x2e, 0x34, 0xf9, 0x1b, 0x46, 0xc5, + 0xab, 0x8c, 0x8a, 0xe7, 0x47, 0xdd, 0x3a, 0x7e, 0xb5, 0xa1, 0xe0, 0x09, 0x40, 0x5f, 0x50, 0x22, + 0xe9, 0xcb, 0x64, 0x44, 0xbb, 0x1b, 0xbb, 0xde, 0x5e, 0x3b, 0xb2, 0x10, 0x25, 0x61, 0x44, 0x47, + 0x57, 0x54, 0x1c, 0xf2, 0x29, 0x93, 0xdd, 0x4d, 0x5c, 0x60, 0x43, 0xc1, 0x16, 0xf8, 0xf4, 0x6d, + 0xb7, 0x81, 0xa2, 0x7d, 0xfa, 0x36, 0x78, 0x0c, 0xf5, 0x4c, 0x12, 0x39, 0xcd, 0xba, 0xb0, 0xeb, + 0xed, 0xd5, 0x22, 0x43, 0x05, 0x1f, 0x40, 0x1b, 0xe5, 0xf2, 0xdc, 0x9a, 0x26, 0xb2, 0xb8, 0x60, + 0x11, 0xb1, 0x97, 0xef, 0xc6, 0xb4, 0xdb, 0x42, 0x01, 0x25, 0x10, 0xfe, 0xd9, 0x87, 0x87, 0x18, + 0xf7, 0x1e, 0x1a, 0x70, 0x32, 0x4d, 0xd3, 0xcf, 0xc8, 0xc0, 0x63, 0xa8, 0x4f, 0xb5, 0x3a, 0x1d, + 0x7e, 0x43, 0x29, 0x3d, 0x82, 0xa7, 0xf4, 0x8c, 0xde, 0xd2, 0x14, 0x03, 0x5f, 0x8b, 0x4a, 0x20, + 0xd8, 0x81, 0xcd, 0x9f, 0xf3, 0x84, 0x61, 0x4c, 0x54, 0xc4, 0x2b, 0x51, 0x41, 0xab, 0x6f, 0x2c, + 0xe9, 0xdf, 0x30, 0x95, 0x52, 0x1d, 0xee, 0x82, 0xb6, 0x33, 0x51, 0x77, 0x33, 0xf1, 0x21, 0x6c, + 0x91, 0xf1, 0xb8, 0x47, 0xd8, 0x90, 0x0a, 0xad, 0x74, 0x03, 0x95, 0xce, 0xa0, 0x2a, 0x1f, 0x4a, + 0xd3, 0x25, 0x9f, 0x8a, 0x3e, 0xc5, 0x70, 0xd7, 0x22, 0x0b, 0x51, 0x72, 0xf8, 0x98, 0x0a, 0x2b, + 0x8c, 0x3a, 0xf2, 0x33, 0xa8, 0xc9, 0x0a, 0xe4, 0x59, 0x09, 0x7f, 0xeb, 0xc1, 0xd6, 0xc5, 0xf4, + 0x2a, 0x4d, 0xfa, 0xb8, 0x40, 0x05, 0xad, 0x0c, 0x8d, 0xe7, 0x84, 0xc6, 0x76, 0xd0, 0x5f, 0xee, + 0x60, 0xc5, 0x75, 0xf0, 0x31, 0xd4, 0x87, 0x94, 0xc5, 0x54, 0x60, 0xc0, 0x6a, 0x91, 0xa1, 0x16, + 0x38, 0x5e, 0x5b, 0xe4, 0x78, 0xf8, 0x1b, 0x1f, 0x36, 0xff, 0xcf, 0xa6, 0xed, 0x42, 0x73, 0x7c, + 0xcd, 0x19, 0x3d, 0x9f, 0xaa, 0x62, 0x32, 0xc9, 0xb4, 0xa1, 0xe0, 0x11, 0xd4, 0xae, 0x12, 0x21, + 0xaf, 0x31, 0x9b, 0xed, 0x48, 0x13, 0x0a, 0xa5, 0x23, 0x92, 0xe8, 0x14, 0x36, 0x22, 0x4d, 0x98, + 0x88, 0x6f, 0x16, 0xfb, 0xc0, 0xdd, 0x59, 0x8d, 0xb9, 0x9d, 0x35, 0x1f, 0x18, 0x58, 0x18, 0x98, + 0x7f, 0x79, 0x00, 0x27, 0x22, 0xa1, 0x2c, 0xc6, 0xd0, 0xcc, 0x6c, 0x69, 0x6f, 0x7e, 0x4b, 0x3f, + 0x86, 0xba, 0xa0, 0x23, 0x22, 0x6e, 0xf2, 0x92, 0xd7, 0xd4, 0x8c, 0x41, 0x95, 0x39, 0x83, 0xbe, + 0x0f, 0x30, 0x40, 0x3d, 0x4a, 0x0e, 0x86, 0xaa, 0x79, 0xf0, 0xe5, 0xfd, 0xb9, 0xe6, 0xb7, 0x9f, + 0x67, 0x29, 0xb2, 0x96, 0xab, 0xfd, 0x44, 0xe2, 0xd8, 0x94, 0xad, 0xce, 0x70, 0x09, 0x2c, 0xa8, + 0xda, 0xfa, 0x1d, 0x55, 0xbb, 0x51, 0x54, 0xed, 0xdf, 0x3d, 0x68, 0x3c, 0x4b, 0x49, 0xff, 0x66, + 0x45, 0xd7, 0x5d, 0x17, 0xfd, 0x39, 0x17, 0x4f, 0xa1, 0x7d, 0xa5, 0xc4, 0xe5, 0x2e, 0x60, 0x14, + 0x9a, 0x07, 0x5f, 0x5b, 0xe0, 0xa5, 0xbb, 0x59, 0x22, 0x97, 0xcf, 0x75, 0xb7, 0xfa, 0xd9, 0xee, + 0xd6, 0xee, 0x70, 0xb7, 0x5e, 0xb8, 0xfb, 0x4b, 0x1f, 0x5a, 0xd8, 0xde, 0x22, 0x3a, 0x99, 0xd2, + 0x4c, 0x2e, 0xdd, 0x07, 0x56, 0xbf, 0xf3, 0xdd, 0x7e, 0x17, 0x42, 0xeb, 0x9a, 0xb0, 0x38, 0xa5, + 0x11, 0xcd, 0xa6, 0xa9, 0xcc, 0xcf, 0x14, 0x1b, 0xd3, 0x05, 0x32, 0xe9, 0x65, 0x43, 0x73, 0x9a, + 0x18, 0x4a, 0x39, 0xa5, 0xd7, 0xa9, 0x4f, 0xda, 0xe2, 0x12, 0x50, 0x3a, 0x05, 0x9d, 0x60, 0x60, + 0xf5, 0x6e, 0xc8, 0xc9, 0x52, 0xa7, 0x71, 0x76, 0xc3, 0xd6, 0x59, 0x66, 0x46, 0xd3, 0x28, 0x40, + 0x1f, 0x23, 0x16, 0x32, 0x7b, 0x8a, 0x84, 0x7f, 0xab, 0x40, 0x5b, 0x57, 0x7d, 0x1e, 0x8b, 0x27, + 0xaa, 0x3c, 0xf9, 0xc8, 0x49, 0xbe, 0x85, 0x28, 0x2b, 0x14, 0x75, 0xee, 0xf6, 0x07, 0x07, 0x53, + 0x15, 0xa4, 0xe8, 0x13, 0xa7, 0x4f, 0xd8, 0x50, 0xae, 0xe5, 0xb4, 0xec, 0x17, 0x46, 0x8b, 0x46, + 0x54, 0x07, 0x92, 0xdc, 0x49, 0x6a, 0x41, 0x2b, 0x5e, 0xc9, 0x0b, 0xfd, 0x3a, 0xad, 0x16, 0xa2, + 0xe2, 0x2b, 0x79, 0xae, 0x5b, 0x07, 0xa9, 0x04, 0xb4, 0x64, 0xa3, 0x77, 0x33, 0x97, 0x6c, 0xb4, + 0xce, 0x66, 0xb5, 0x81, 0x15, 0xb7, 0x2c, 0xab, 0xe0, 0x64, 0xd5, 0xdd, 0x13, 0xcd, 0xb9, 0x3d, + 0xf1, 0x01, 0xb4, 0xb5, 0x9c, 0xbc, 0x56, 0x5b, 0xfa, 0x5c, 0x76, 0x40, 0xb7, 0x36, 0xda, 0xb3, + 0xb5, 0xe1, 0x66, 0x77, 0x6b, 0x49, 0x76, 0x3b, 0x76, 0xa1, 0x77, 0x2f, 0xa6, 0x69, 0xda, 0xa3, + 0x59, 0x46, 0x86, 0xf4, 0xd9, 0xbb, 0x4b, 0x3a, 0x39, 0x4b, 0x32, 0x19, 0xd1, 0x6c, 0xac, 0x0a, + 0x8d, 0x0a, 0x71, 0xc8, 0x63, 0x8a, 0x59, 0xae, 0x45, 0x39, 0xa9, 0x5c, 0xa4, 0x42, 0x28, 0x0b, + 0x4c, 0x67, 0xd3, 0x94, 0xc2, 0x47, 0xe4, 0xed, 0x25, 0x9d, 0x60, 0x46, 0x2b, 0x91, 0xa1, 0x10, + 0x4f, 0x98, 0xc2, 0xab, 0x06, 0x47, 0x2a, 0x38, 0x86, 0x76, 0x96, 0xb0, 0xa1, 0x2e, 0x4e, 0x5d, + 0xec, 0x95, 0xbd, 0xe6, 0xc1, 0x57, 0x17, 0xb4, 0x81, 0x53, 0x22, 0xaf, 0xa9, 0x38, 0xe1, 0x62, + 0x44, 0x64, 0xe4, 0x72, 0x05, 0x87, 0xd0, 0xc2, 0x6d, 0x97, 0x4b, 0xa9, 0xaf, 0x26, 0xc5, 0x61, + 0x0a, 0x47, 0xf0, 0xa5, 0xc5, 0x91, 0x98, 0x2c, 0xdd, 0xfd, 0xaa, 0x0f, 0x62, 0x23, 0x49, 0x38, + 0x2b, 0x3a, 0x80, 0x0d, 0xa9, 0x10, 0x66, 0x5a, 0x4e, 0xb7, 0xb2, 0x5b, 0xd9, 0xab, 0x44, 0x39, + 0x19, 0xfe, 0x42, 0x5d, 0x03, 0x0a, 0x75, 0x77, 0x69, 0xd9, 0x81, 0xcd, 0x8c, 0x4e, 0x9e, 0xd1, + 0x61, 0xc2, 0x50, 0x45, 0x25, 0x2a, 0x68, 0xbc, 0xe3, 0xd1, 0xc9, 0x31, 0x8b, 0xf3, 0x80, 0x6b, + 0x6a, 0xd6, 0xb2, 0xea, 0x9c, 0x65, 0xe1, 0xa7, 0x1e, 0x74, 0x1c, 0x03, 0xbe, 0x70, 0x09, 0x7f, + 0x04, 0xc1, 0x29, 0x95, 0x3d, 0xf2, 0xf6, 0x29, 0x8b, 0x7b, 0x68, 0x5e, 0x44, 0x27, 0xe1, 0x31, + 0x3c, 0x9c, 0x43, 0xb3, 0xb1, 0xe5, 0xa8, 0xb7, 0xc4, 0x51, 0xdf, 0x76, 0x34, 0x3c, 0x87, 0x96, + 0xad, 0x5a, 0x6d, 0xbc, 0x24, 0x36, 0x89, 0xf5, 0x93, 0x38, 0xd8, 0x87, 0x6a, 0xaa, 0xaa, 0xc2, + 0x47, 0xcb, 0x77, 0x16, 0x58, 0xde, 0xcb, 0x86, 0x47, 0x44, 0x92, 0x08, 0xd7, 0x85, 0x13, 0xe8, + 0x28, 0xbb, 0x2f, 0x29, 0x8b, 0x7b, 0xd9, 0x10, 0x4d, 0xda, 0x85, 0xa6, 0xe6, 0xea, 0x65, 0xc3, + 0xf2, 0x14, 0xb6, 0x20, 0xb5, 0xa2, 0x9f, 0x26, 0x94, 0x49, 0xbd, 0xc2, 0xd4, 0xa7, 0x05, 0xe9, + 0xda, 0x62, 0x71, 0x71, 0x11, 0xc1, 0xda, 0xd2, 0x74, 0xf8, 0xd7, 0x1a, 0x6c, 0x18, 0x23, 0x74, + 0x9d, 0xb1, 0xb8, 0xac, 0x4d, 0x4d, 0xe9, 0x5e, 0xd7, 0xbf, 0x2d, 0x6f, 0xf5, 0x9a, 0xb2, 0xcf, + 0xc5, 0x8a, 0x7b, 0x2e, 0xce, 0xd8, 0x54, 0x9d, 0xb7, 0x69, 0xc6, 0xaf, 0xda, 0xbc, 0x5f, 0xdf, + 0x80, 0xed, 0x0c, 0xfb, 0xf1, 0x45, 0x4a, 0xe4, 0x80, 0x8b, 0x91, 0xb9, 0xc7, 0xd4, 0xa2, 0x39, + 0x5c, 0x5d, 0x01, 0x34, 0x56, 0x9c, 0x07, 0xba, 0xe1, 0xcf, 0xa0, 0xaa, 0xfb, 0x6a, 0x24, 0x3f, + 0x17, 0x74, 0xeb, 0x77, 0x41, 0x6d, 0x5b, 0x96, 0x25, 0x9c, 0xe1, 0xbb, 0x48, 0xb7, 0x7f, 0x1b, + 0x52, 0x9e, 0x8f, 0xb2, 0xe1, 0x89, 0xe0, 0x23, 0x73, 0x8d, 0xcc, 0x49, 0xf4, 0x9c, 0x33, 0x49, + 0x99, 0x44, 0xde, 0xa6, 0xe6, 0xb5, 0x20, 0xc5, 0x6b, 0x48, 0xec, 0xfd, 0xad, 0x28, 0x27, 0x55, + 0xd7, 0x1f, 0x70, 0xd1, 0xa7, 0xd8, 0x49, 0xda, 0xbb, 0x15, 0xd5, 0xf5, 0x0b, 0x20, 0xd8, 0x86, + 0x4a, 0x46, 0x27, 0xd8, 0xee, 0x2b, 0x91, 0xfa, 0xe9, 0xe4, 0xb5, 0xe3, 0xe6, 0x75, 0xe6, 0x1c, + 0xda, 0xc6, 0xaf, 0xf6, 0x39, 0xf4, 0x14, 0x36, 0xf8, 0x58, 0x75, 0x89, 0xac, 0xfb, 0x00, 0xab, + 0xf3, 0xeb, 0xcb, 0xab, 0x73, 0xff, 0x85, 0x5e, 0x79, 0xcc, 0xa4, 0x78, 0x17, 0xe5, 0x7c, 0xc1, + 0x19, 0x74, 0xf8, 0x60, 0x90, 0x26, 0x8c, 0x5e, 0x4c, 0xb3, 0x6b, 0xbc, 0xe0, 0x05, 0x78, 0xc1, + 0x0b, 0x17, 0x88, 0x7a, 0xe1, 0xae, 0x8c, 0x66, 0x59, 0x77, 0x3e, 0x82, 0x96, 0xad, 0x46, 0xb9, + 0x7b, 0x43, 0xdf, 0x99, 0x4a, 0x54, 0x3f, 0xd5, 0x43, 0xe0, 0x96, 0xa4, 0x53, 0x7d, 0xd7, 0xd8, + 0x8c, 0x34, 0xf1, 0x91, 0xff, 0x5d, 0x2f, 0xfc, 0xb5, 0x07, 0x9d, 0x19, 0x05, 0x6a, 0xb5, 0x4c, + 0x64, 0x4a, 0x8d, 0x04, 0x4d, 0x04, 0x01, 0x54, 0x63, 0x9a, 0xf5, 0x4d, 0x21, 0xe3, 0x6f, 0x73, + 0x5c, 0x56, 0x8a, 0xa7, 0x44, 0x08, 0xad, 0xe4, 0xc5, 0xa5, 0x12, 0x74, 0xc9, 0xa7, 0x2c, 0x2e, + 0x86, 0x00, 0x16, 0xa6, 0x0a, 0x29, 0x79, 0x71, 0xf9, 0x8c, 0xc4, 0x43, 0xaa, 0x9f, 0xea, 0x35, + 0xb4, 0xc9, 0x05, 0xc3, 0x23, 0xd8, 0x7c, 0x99, 0x8c, 0xb3, 0x43, 0x3e, 0x1a, 0xa9, 0x4d, 0x14, + 0x53, 0xa9, 0xde, 0x31, 0x1e, 0x66, 0xdd, 0x50, 0xaa, 0x60, 0x62, 0x3a, 0x20, 0xd3, 0x54, 0xaa, + 0xa5, 0xf9, 0xf6, 0xb5, 0xa0, 0xf0, 0x4f, 0x1e, 0x74, 0xf4, 0x0b, 0xfc, 0x98, 0x49, 0x2a, 0x14, + 0x16, 0x1c, 0x40, 0x0d, 0xf7, 0x1a, 0x0a, 0x6b, 0x1e, 0xbc, 0xbf, 0xa8, 0x29, 0xe6, 0x13, 0x93, + 0x48, 0x2f, 0x0d, 0x7e, 0x0c, 0x4d, 0xca, 0xa4, 0x20, 0x4c, 0xe2, 0x93, 0xc3, 0x47, 0xce, 0x0f, + 0x97, 0x71, 0xba, 0x6f, 0xfe, 0xc8, 0x66, 0x55, 0xde, 0x17, 0xa7, 0x8c, 0xd5, 0x55, 0x5c, 0x30, + 0xfc, 0x63, 0x61, 0xf7, 0x19, 0x25, 0xb7, 0x74, 0x6d, 0xbb, 0x4f, 0x00, 0x52, 0x25, 0x40, 0xac, + 0x61, 0xb6, 0xc5, 0xb9, 0xa2, 0xd5, 0x9f, 0x7a, 0xf0, 0x40, 0x0b, 0x79, 0xce, 0x6e, 0x13, 0x49, + 0xe3, 0xb5, 0xed, 0xfe, 0x01, 0xd4, 0xf9, 0x78, 0x0d, 0x9b, 0x0d, 0x57, 0x70, 0x01, 0x9d, 0x44, + 0x9b, 0xa0, 0xc8, 0xe2, 0x7a, 0xb1, 0xba, 0xa0, 0x59, 0xf6, 0xf9, 0x08, 0x54, 0x17, 0x45, 0xe0, + 0xdf, 0x1e, 0x6c, 0x6b, 0x49, 0x3f, 0x49, 0xfa, 0x37, 0x9f, 0x63, 0x00, 0xce, 0x61, 0xeb, 0x06, + 0x2d, 0x58, 0xd3, 0xff, 0x19, 0xee, 0x15, 0xdd, 0xff, 0x95, 0x0f, 0xef, 0xe5, 0x05, 0x30, 0xe0, + 0x87, 0xd7, 0x84, 0x0d, 0x4d, 0x0c, 0x54, 0x4f, 0x45, 0x12, 0x5b, 0xbb, 0xbe, 0x3c, 0x59, 0xc8, + 0xff, 0xec, 0xef, 0x11, 0x34, 0x06, 0x09, 0x23, 0xa9, 0xf5, 0x56, 0x5e, 0x55, 0x44, 0xc9, 0xa8, + 0x4e, 0x85, 0xd1, 0xd4, 0xf4, 0x7d, 0x33, 0x4d, 0xcb, 0xe9, 0x32, 0x8b, 0xb5, 0x95, 0xb3, 0x18, + 0xfe, 0xd3, 0x83, 0x6d, 0x04, 0x0f, 0xf1, 0xf4, 0x58, 0xbf, 0x1c, 0x7e, 0x04, 0x1b, 0x66, 0xfa, + 0xf8, 0x5f, 0xc6, 0x27, 0x67, 0x53, 0x9d, 0x40, 0xcf, 0x42, 0xd7, 0x28, 0x06, 0x8b, 0x73, 0xc5, + 0x42, 0xf8, 0x83, 0x07, 0x8f, 0x0a, 0x27, 0xec, 0x3a, 0x50, 0x67, 0xbc, 0x21, 0xcb, 0x42, 0xb0, + 0xa1, 0x32, 0x3c, 0xfe, 0x3a, 0xbb, 0xa5, 0xb2, 0x4e, 0xf5, 0x84, 0xbf, 0xf3, 0xa0, 0xfb, 0x31, + 0x4f, 0x18, 0xae, 0x79, 0x3a, 0x1e, 0xa7, 0x66, 0xa8, 0xbd, 0x76, 0xbe, 0x7e, 0x08, 0x0d, 0xa2, + 0xc5, 0x30, 0x69, 0x1c, 0x59, 0x61, 0x74, 0x53, 0xf2, 0xe8, 0x7b, 0x23, 0xc9, 0x8a, 0x59, 0xbb, + 0xa1, 0xc2, 0xbf, 0x78, 0xd0, 0xb5, 0x0c, 0xbc, 0x10, 0xbc, 0x4f, 0xb3, 0xec, 0x73, 0x6c, 0x34, + 0x68, 0x68, 0x31, 0xc0, 0xa9, 0x45, 0x86, 0xb2, 0x1c, 0xa8, 0x3a, 0x0e, 0xdc, 0xc0, 0x03, 0x3d, + 0x2d, 0xb1, 0xbc, 0x50, 0xf7, 0x3a, 0x12, 0xeb, 0xcb, 0x98, 0x7e, 0x3d, 0xe4, 0xa4, 0x3b, 0xbe, + 0x32, 0xff, 0x4b, 0x94, 0xe3, 0xab, 0x27, 0x00, 0x24, 0x8e, 0x3f, 0xe1, 0x22, 0x4e, 0xd8, 0xd0, + 0x44, 0xca, 0x42, 0xc2, 0x8f, 0xa1, 0xa5, 0x6e, 0x96, 0x2f, 0xad, 0xb9, 0xc7, 0x9d, 0x93, 0x19, + 0x7b, 0x66, 0xe2, 0xbb, 0x33, 0x93, 0x90, 0xc0, 0xce, 0x9c, 0xe1, 0x4f, 0xe3, 0xd8, 0x84, 0xfe, + 0x50, 0xcf, 0x74, 0x72, 0x4d, 0x26, 0x03, 0x8b, 0x1e, 0x5c, 0xb6, 0x41, 0x91, 0xc3, 0x14, 0x52, + 0x78, 0x32, 0xa7, 0xc2, 0xcd, 0xf0, 0xbd, 0xa8, 0xf9, 0xbd, 0x07, 0x1d, 0xa3, 0xa7, 0xb0, 0xff, + 0x3b, 0x50, 0xd7, 0x33, 0x52, 0x23, 0xf2, 0x2b, 0x0b, 0x45, 0xe6, 0xb3, 0xdd, 0xc8, 0x2c, 0x9e, + 0xef, 0x06, 0xfe, 0x82, 0x6e, 0x10, 0x7c, 0x6f, 0x66, 0x7b, 0xae, 0xb0, 0x15, 0xf2, 0x9d, 0xf9, + 0xd3, 0xbc, 0x5c, 0x8e, 0x68, 0x4a, 0xe5, 0x7d, 0x46, 0xe1, 0x15, 0x6c, 0xe1, 0xc0, 0xf6, 0x9e, + 0x73, 0xf8, 0x09, 0x6c, 0xa3, 0xd8, 0x7b, 0xb7, 0xf7, 0x67, 0xf0, 0x5e, 0x99, 0x00, 0xbb, 0xa5, + 0xde, 0x8b, 0xf4, 0x6f, 0xc2, 0xc3, 0x4b, 0x9a, 0x0e, 0x94, 0xec, 0x57, 0xe3, 0xb8, 0x38, 0xab, + 0x96, 0x8c, 0x5c, 0xae, 0xea, 0xf8, 0x87, 0xe3, 0xb7, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x05, + 0xba, 0x65, 0x5f, 0x83, 0x1c, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 8c6c11018..919596ddb 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -90,11 +90,11 @@ message FriendRequest{ string fromUserID = 1; string fromNickname = 2; string fromFaceURL = 3; - string fromGender = 4; + int32 fromGender = 4; string toUserID = 5; string toNickname = 6; string toFaceURL = 7; - string toGender = 8; + int32 toGender = 8; int32 handleResult = 9; string reqMsg = 10; uint32 createTime = 11;