From e4b6b18712ecec51069441cbf2c3c98a452bd411 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Fri, 14 Jan 2022 18:33:06 +0800 Subject: [PATCH] Refactor code --- internal/rpc/friend/firend.go | 29 +++- pkg/proto/sdk_ws/ws.pb.go | 250 +++++++++++++++++----------------- 2 files changed, 153 insertions(+), 126 deletions(-) diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go index 4d54787e9..e7f2cf217 100644 --- a/internal/rpc/friend/firend.go +++ b/internal/rpc/friend/firend.go @@ -449,7 +449,16 @@ func (s *friendServer) GetFriendApplyList(ctx context.Context, req *pbFriend.Get } userInfo.FromNickname = u.Nickname userInfo.FromFaceURL = u.FaceURL - userInfo.FromGender = u.Gend + userInfo.FromGender = u.Gender + + u, err = imdb.GetUserByUserID(userInfo.ToUserID) + if err != nil { + log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID) + continue + } + userInfo.ToNickname = u.Nickname + userInfo.ToFaceURL = u.FaceURL + userInfo.ToGender = u.Gender appleUserList = append(appleUserList, &userInfo) } @@ -475,6 +484,24 @@ func (s *friendServer) GetSelfApplyList(ctx context.Context, req *pbFriend.GetSe for _, selfApplyOtherUserInfo := range usersInfo { var userInfo sdkws.FriendRequest // pbFriend.ApplyUserInfo cp.FriendRequestDBCopyOpenIM(&userInfo, &selfApplyOtherUserInfo) + 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.Gender + + u, err = imdb.GetUserByUserID(userInfo.ToUserID) + if err != nil { + log.Error(req.CommID.OperationID, "GetUserByUserID", userInfo.ToUserID) + continue + } + userInfo.ToNickname = u.Nickname + userInfo.ToFaceURL = u.FaceURL + userInfo.ToGender = u.Gender + selfApplyOtherUserList = append(selfApplyOtherUserList, &userInfo) } log.NewInfo(req.CommID.OperationID, "rpc GetSelfApplyList ok", pbFriend.GetSelfApplyListResp{FriendRequestList: selfApplyOtherUserList}) diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 9ebfd30df..a785dab20 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -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_f24e0416269be717, []int{0} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{1} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{2} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{3} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{4} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{5} + return fileDescriptor_ws_1bc577ef51df0a70, []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_f24e0416269be717, []int{6} + return fileDescriptor_ws_1bc577ef51df0a70, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -704,11 +704,11 @@ type FriendRequest struct { FromUserID string `protobuf:"bytes,1,opt,name=fromUserID" json:"fromUserID,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"` + FromGender int32 `protobuf:"varint,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"` + ToGender int32 `protobuf:"varint,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"` @@ -725,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_f24e0416269be717, []int{7} + return fileDescriptor_ws_1bc577ef51df0a70, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -766,11 +766,11 @@ func (m *FriendRequest) GetFromFaceURL() string { return "" } -func (m *FriendRequest) GetFromGender() string { +func (m *FriendRequest) GetFromGender() int32 { if m != nil { return m.FromGender } - return "" + return 0 } func (m *FriendRequest) GetToUserID() string { @@ -794,11 +794,11 @@ func (m *FriendRequest) GetToFaceURL() string { return "" } -func (m *FriendRequest) GetToGender() string { +func (m *FriendRequest) GetToGender() int32 { if m != nil { return m.ToGender } - return "" + return 0 } func (m *FriendRequest) GetHandleResult() int32 { @@ -866,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_f24e0416269be717, []int{8} + return fileDescriptor_ws_1bc577ef51df0a70, []int{8} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -941,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_f24e0416269be717, []int{9} + return fileDescriptor_ws_1bc577ef51df0a70, []int{9} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -996,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_f24e0416269be717, []int{10} + return fileDescriptor_ws_1bc577ef51df0a70, []int{10} } func (m *PullMessageReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageReq.Unmarshal(m, b) @@ -1060,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_f24e0416269be717, []int{11} + return fileDescriptor_ws_1bc577ef51df0a70, []int{11} } func (m *PullMessageResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageResp.Unmarshal(m, b) @@ -1132,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_f24e0416269be717, []int{12} + return fileDescriptor_ws_1bc577ef51df0a70, []int{12} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1164,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_f24e0416269be717, []int{13} + return fileDescriptor_ws_1bc577ef51df0a70, []int{13} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1212,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_f24e0416269be717, []int{14} + return fileDescriptor_ws_1bc577ef51df0a70, []int{14} } func (m *GatherFormat) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GatherFormat.Unmarshal(m, b) @@ -1259,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_f24e0416269be717, []int{15} + return fileDescriptor_ws_1bc577ef51df0a70, []int{15} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1328,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_f24e0416269be717, []int{16} + return fileDescriptor_ws_1bc577ef51df0a70, []int{16} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1489,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_f24e0416269be717, []int{17} + return fileDescriptor_ws_1bc577ef51df0a70, []int{17} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1556,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_f24e0416269be717, []int{18} + return fileDescriptor_ws_1bc577ef51df0a70, []int{18} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1605,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_f24e0416269be717, []int{19} + return fileDescriptor_ws_1bc577ef51df0a70, []int{19} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -1660,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_f24e0416269be717, []int{20} + return fileDescriptor_ws_1bc577ef51df0a70, []int{20} } func (m *MemberLeaveTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberLeaveTips.Unmarshal(m, b) @@ -1715,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_f24e0416269be717, []int{21} + return fileDescriptor_ws_1bc577ef51df0a70, []int{21} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -1777,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_f24e0416269be717, []int{22} + return fileDescriptor_ws_1bc577ef51df0a70, []int{22} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -1840,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_f24e0416269be717, []int{23} + return fileDescriptor_ws_1bc577ef51df0a70, []int{23} } func (m *MemberInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInfoChangedTips.Unmarshal(m, b) @@ -1909,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_f24e0416269be717, []int{24} + return fileDescriptor_ws_1bc577ef51df0a70, []int{24} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1970,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_f24e0416269be717, []int{25} + return fileDescriptor_ws_1bc577ef51df0a70, []int{25} } func (m *GroupInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoChangedTips.Unmarshal(m, b) @@ -2024,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_f24e0416269be717, []int{26} + return fileDescriptor_ws_1bc577ef51df0a70, []int{26} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -2079,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_f24e0416269be717, []int{27} + return fileDescriptor_ws_1bc577ef51df0a70, []int{27} } func (m *ApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplicationProcessedTips.Unmarshal(m, b) @@ -2140,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_f24e0416269be717, []int{28} + return fileDescriptor_ws_1bc577ef51df0a70, []int{28} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2193,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_f24e0416269be717, []int{29} + return fileDescriptor_ws_1bc577ef51df0a70, []int{29} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2239,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_f24e0416269be717, []int{30} + return fileDescriptor_ws_1bc577ef51df0a70, []int{30} } func (m *FriendApplicationAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationAddedTips.Unmarshal(m, b) @@ -2278,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_f24e0416269be717, []int{31} + return fileDescriptor_ws_1bc577ef51df0a70, []int{31} } func (m *FriendApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationProcessedTips.Unmarshal(m, b) @@ -2319,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_f24e0416269be717, []int{32} + return fileDescriptor_ws_1bc577ef51df0a70, []int{32} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2372,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_f24e0416269be717, []int{33} + return fileDescriptor_ws_1bc577ef51df0a70, []int{33} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2410,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_f24e0416269be717, []int{34} + return fileDescriptor_ws_1bc577ef51df0a70, []int{34} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -2448,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_f24e0416269be717, []int{35} + return fileDescriptor_ws_1bc577ef51df0a70, []int{35} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -2486,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_f24e0416269be717, []int{36} + return fileDescriptor_ws_1bc577ef51df0a70, []int{36} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2525,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_f24e0416269be717, []int{37} + return fileDescriptor_ws_1bc577ef51df0a70, []int{37} } func (m *SelfInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SelfInfoUpdatedTips.Unmarshal(m, b) @@ -2594,10 +2594,10 @@ func init() { proto.RegisterType((*SelfInfoUpdatedTips)(nil), "server_api_params.SelfInfoUpdatedTips") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_f24e0416269be717) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_1bc577ef51df0a70) } -var fileDescriptor_ws_f24e0416269be717 = []byte{ - // 1991 bytes of a gzipped FileDescriptorProto +var fileDescriptor_ws_1bc577ef51df0a70 = []byte{ + // 1989 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, @@ -2645,82 +2645,82 @@ var fileDescriptor_ws_f24e0416269be717 = []byte{ 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, + 0x15, 0xa4, 0xe8, 0x13, 0xa7, 0x4f, 0xd8, 0x50, 0xae, 0xe5, 0xd4, 0xee, 0x17, 0x16, 0xa2, 0x3a, + 0x90, 0xe4, 0x4e, 0x52, 0x0b, 0x5a, 0xf1, 0x4a, 0x5e, 0xe8, 0xd7, 0x69, 0xb5, 0x10, 0x15, 0x5f, + 0xc9, 0x73, 0xdd, 0x3a, 0x48, 0x25, 0xa0, 0x25, 0x1b, 0xbd, 0xba, 0xef, 0x17, 0xf4, 0x5c, 0x56, + 0x1b, 0xf8, 0x7d, 0x59, 0x56, 0xc1, 0xc9, 0xaa, 0xbb, 0x27, 0x9a, 0x73, 0x7b, 0xe2, 0x03, 0x68, + 0x6b, 0x39, 0x79, 0xad, 0xb6, 0xf4, 0xb9, 0xec, 0x80, 0x6e, 0x6d, 0xb4, 0x67, 0x6b, 0xc3, 0xcd, + 0xee, 0xd6, 0x92, 0xec, 0x76, 0xec, 0x42, 0xef, 0x5e, 0x4c, 0xd3, 0xb4, 0x47, 0xb3, 0x8c, 0x0c, + 0xe9, 0xb3, 0x77, 0x97, 0x74, 0x72, 0x96, 0x64, 0x32, 0xa2, 0xd9, 0x58, 0x15, 0x1a, 0x15, 0xe2, + 0x90, 0xc7, 0x14, 0xb3, 0x5c, 0x8b, 0x72, 0x52, 0xb9, 0x48, 0x85, 0x50, 0x16, 0x98, 0xce, 0xa6, + 0x29, 0x85, 0x8f, 0xc8, 0xdb, 0x4b, 0x3a, 0xc1, 0x8c, 0x56, 0x22, 0x43, 0x21, 0x9e, 0x30, 0x85, + 0x57, 0x0d, 0x8e, 0x54, 0x70, 0x0c, 0xed, 0x2c, 0x61, 0x43, 0x5d, 0x9c, 0xba, 0xd8, 0x2b, 0x7b, + 0xcd, 0x83, 0xaf, 0x2e, 0x68, 0x03, 0xa7, 0x44, 0x5e, 0x53, 0x71, 0xc2, 0xc5, 0x88, 0xc8, 0xc8, + 0xe5, 0x0a, 0x0e, 0xa1, 0x85, 0xdb, 0x2e, 0x97, 0x52, 0x5f, 0x4d, 0x8a, 0xc3, 0x14, 0x8e, 0xe0, + 0x4b, 0x8b, 0x23, 0x31, 0x59, 0xba, 0xfb, 0x55, 0x1f, 0xc4, 0x46, 0x92, 0x70, 0x56, 0x74, 0x00, + 0x1b, 0x52, 0x21, 0xcc, 0xb4, 0x9c, 0x6e, 0x65, 0xb7, 0xb2, 0x57, 0x89, 0x72, 0x32, 0xfc, 0x85, + 0xba, 0x06, 0x14, 0xea, 0xee, 0xd2, 0xb2, 0x03, 0x9b, 0x19, 0x9d, 0x3c, 0xa3, 0xc3, 0x84, 0xa1, + 0x8a, 0x4a, 0x54, 0xd0, 0x78, 0xc7, 0xa3, 0x93, 0x63, 0x16, 0xe7, 0x01, 0xd7, 0xd4, 0xac, 0x65, + 0xd5, 0x39, 0xcb, 0xc2, 0x4f, 0x3d, 0xe8, 0x38, 0x06, 0x7c, 0xe1, 0x12, 0xfe, 0x08, 0x82, 0x53, + 0x2a, 0x7b, 0xe4, 0xed, 0x53, 0x16, 0xf7, 0xd0, 0xbc, 0x88, 0x4e, 0xc2, 0x63, 0x78, 0x38, 0x87, + 0x66, 0x63, 0xcb, 0x51, 0x6f, 0x89, 0xa3, 0xbe, 0xed, 0x68, 0x78, 0x0e, 0x2d, 0x5b, 0xb5, 0xda, + 0x78, 0x49, 0x6c, 0x12, 0xeb, 0x27, 0x71, 0xb0, 0x0f, 0xd5, 0x54, 0x55, 0x85, 0x8f, 0x96, 0xef, + 0x2c, 0xb0, 0xbc, 0x97, 0x0d, 0x8f, 0x88, 0x24, 0x11, 0xae, 0x0b, 0x27, 0xd0, 0x51, 0x76, 0x5f, + 0x52, 0x16, 0xf7, 0xb2, 0x21, 0x9a, 0xb4, 0x0b, 0x4d, 0xcd, 0xd5, 0xcb, 0x86, 0xe5, 0x29, 0x6c, + 0x41, 0x6a, 0x45, 0x3f, 0x4d, 0x28, 0x93, 0x7a, 0x85, 0xa9, 0x4f, 0x0b, 0xd2, 0xb5, 0xc5, 0xe2, + 0xe2, 0x22, 0x82, 0xb5, 0xa5, 0xe9, 0xf0, 0xaf, 0x35, 0xd8, 0x30, 0x46, 0xe8, 0x3a, 0x63, 0x71, + 0x59, 0x9b, 0x9a, 0xd2, 0xbd, 0xae, 0x7f, 0x5b, 0xde, 0xea, 0x35, 0x65, 0x9f, 0x8b, 0x15, 0xf7, + 0x5c, 0x9c, 0xb1, 0xa9, 0x3a, 0x6f, 0xd3, 0x8c, 0x5f, 0xb5, 0x79, 0xbf, 0xbe, 0x01, 0xdb, 0x19, + 0xf6, 0xe3, 0x8b, 0x94, 0xc8, 0x01, 0x17, 0x23, 0x73, 0x8f, 0xa9, 0x45, 0x73, 0xb8, 0xba, 0x02, + 0x68, 0xac, 0x38, 0x0f, 0x74, 0xc3, 0x9f, 0x41, 0x55, 0xf7, 0xd5, 0x48, 0x7e, 0x2e, 0xe8, 0x0b, + 0xa4, 0x0b, 0x6a, 0xdb, 0xb2, 0x2c, 0xe1, 0x0c, 0xdf, 0x45, 0xba, 0xfd, 0xdb, 0x90, 0xf2, 0x7c, + 0x94, 0x0d, 0x4f, 0x04, 0x1f, 0x99, 0x6b, 0x64, 0x4e, 0xa2, 0xe7, 0x9c, 0x49, 0xca, 0x24, 0xf2, + 0x36, 0x35, 0xaf, 0x05, 0x29, 0x5e, 0x43, 0x62, 0xef, 0x6f, 0x45, 0x39, 0xa9, 0xba, 0xfe, 0x80, + 0x8b, 0x3e, 0xc5, 0x4e, 0xd2, 0xde, 0xad, 0xa8, 0xae, 0x5f, 0x00, 0xc1, 0x36, 0x54, 0x32, 0x3a, + 0xc1, 0x76, 0x5f, 0x89, 0xd4, 0x4f, 0x27, 0xaf, 0x1d, 0x37, 0xaf, 0x33, 0xe7, 0xd0, 0x36, 0x7e, + 0xb5, 0xcf, 0xa1, 0xa7, 0xb0, 0xc1, 0xc7, 0xaa, 0x4b, 0x64, 0xdd, 0x07, 0x58, 0x9d, 0x5f, 0x5f, + 0x5e, 0x9d, 0xfb, 0x2f, 0xf4, 0xca, 0x63, 0x26, 0xc5, 0xbb, 0x28, 0xe7, 0x0b, 0xce, 0xa0, 0xc3, + 0x07, 0x83, 0x34, 0x61, 0xf4, 0x62, 0x9a, 0x5d, 0xe3, 0x05, 0x2f, 0xc0, 0x0b, 0x5e, 0xb8, 0x40, + 0xd4, 0x0b, 0x77, 0x65, 0x34, 0xcb, 0xba, 0xf3, 0x11, 0xb4, 0x6c, 0x35, 0xca, 0xdd, 0x1b, 0xfa, + 0xce, 0x54, 0xa2, 0xfa, 0xa9, 0x1e, 0x02, 0xb7, 0x24, 0x9d, 0xea, 0xbb, 0xc6, 0x66, 0xa4, 0x89, + 0x8f, 0xfc, 0xef, 0x7a, 0xe1, 0xaf, 0x3d, 0xe8, 0xcc, 0x28, 0x50, 0xab, 0x65, 0x22, 0x53, 0x6a, + 0x24, 0x68, 0x22, 0x08, 0xa0, 0x1a, 0xd3, 0xac, 0x6f, 0x0a, 0x19, 0x7f, 0x9b, 0xe3, 0xb2, 0x52, + 0x3c, 0x25, 0x42, 0x68, 0x25, 0x2f, 0x2e, 0x95, 0xa0, 0x4b, 0x3e, 0x65, 0x71, 0x31, 0x04, 0xb0, + 0x30, 0x55, 0x48, 0xc9, 0x8b, 0xcb, 0x67, 0x24, 0x1e, 0x52, 0xfd, 0x54, 0xaf, 0xa1, 0x4d, 0x2e, + 0x18, 0x1e, 0xc1, 0xe6, 0xcb, 0x64, 0x9c, 0x1d, 0xf2, 0xd1, 0x48, 0x6d, 0xa2, 0x98, 0x4a, 0xf5, + 0x8e, 0xf1, 0x30, 0xeb, 0x86, 0x52, 0x05, 0x13, 0xd3, 0x01, 0x99, 0xa6, 0x52, 0x2d, 0xcd, 0xb7, + 0xaf, 0x05, 0x85, 0x7f, 0xf2, 0xa0, 0xa3, 0x5f, 0xe0, 0xc7, 0x4c, 0x52, 0xa1, 0xb0, 0xe0, 0x00, + 0x6a, 0xb8, 0xd7, 0x50, 0x58, 0xf3, 0xe0, 0xfd, 0x45, 0x4d, 0x31, 0x9f, 0x98, 0x44, 0x7a, 0x69, + 0xf0, 0x63, 0x68, 0x52, 0x26, 0x05, 0x61, 0x12, 0x9f, 0x1c, 0x3e, 0x72, 0x7e, 0xb8, 0x8c, 0xd3, + 0x7d, 0xf3, 0x47, 0x36, 0xab, 0xf2, 0xbe, 0x38, 0x65, 0xac, 0xae, 0xe2, 0x82, 0xe1, 0x1f, 0x0b, + 0xbb, 0xcf, 0x28, 0xb9, 0xa5, 0x6b, 0xdb, 0x7d, 0x02, 0x90, 0x2a, 0x01, 0x62, 0x0d, 0xb3, 0x2d, + 0xce, 0x15, 0xad, 0xfe, 0xd4, 0x83, 0x07, 0x5a, 0xc8, 0x73, 0x76, 0x9b, 0x48, 0x1a, 0xaf, 0x6d, + 0xf7, 0x0f, 0xa0, 0xce, 0xc7, 0x6b, 0xd8, 0x6c, 0xb8, 0x82, 0x0b, 0xe8, 0x24, 0xda, 0x04, 0x45, + 0x16, 0xd7, 0x8b, 0xd5, 0x05, 0xcd, 0xb2, 0xcf, 0x47, 0xa0, 0xba, 0x28, 0x02, 0xff, 0xf6, 0x60, + 0x5b, 0x4b, 0xfa, 0x49, 0xd2, 0xbf, 0xf9, 0x1c, 0x03, 0x70, 0x0e, 0x5b, 0x37, 0x68, 0xc1, 0x9a, + 0xfe, 0xcf, 0x70, 0xaf, 0xe8, 0xfe, 0xaf, 0x7c, 0x78, 0x2f, 0x2f, 0x80, 0x01, 0x3f, 0xbc, 0x26, + 0x6c, 0x68, 0x62, 0xa0, 0x7a, 0x2a, 0x92, 0xd8, 0xda, 0xf5, 0xe5, 0xc9, 0x42, 0xfe, 0x67, 0x7f, + 0x8f, 0xa0, 0x31, 0x48, 0x18, 0x49, 0xad, 0xb7, 0xf2, 0xaa, 0x22, 0x4a, 0x46, 0x75, 0x2a, 0x8c, + 0xa6, 0xa6, 0xef, 0x9b, 0x69, 0x5a, 0x4e, 0x97, 0x59, 0xac, 0xad, 0x9c, 0xc5, 0xf0, 0x9f, 0x1e, + 0x6c, 0x23, 0x78, 0x88, 0xa7, 0xc7, 0xfa, 0xe5, 0xf0, 0x23, 0xd8, 0x30, 0xd3, 0xc7, 0xff, 0x32, + 0x3e, 0x39, 0x9b, 0xea, 0x04, 0x7a, 0x16, 0xba, 0x46, 0x31, 0x58, 0x9c, 0x2b, 0x16, 0xc2, 0x1f, + 0x3c, 0x78, 0x54, 0x38, 0x61, 0xd7, 0x81, 0x3a, 0xe3, 0x0d, 0x59, 0x16, 0x82, 0x0d, 0x95, 0xe1, + 0xf1, 0xd7, 0xd9, 0x2d, 0x95, 0x75, 0xaa, 0x27, 0xfc, 0x9d, 0x07, 0xdd, 0x8f, 0x79, 0xc2, 0x70, + 0xcd, 0xd3, 0xf1, 0x38, 0x35, 0x43, 0xed, 0xb5, 0xf3, 0xf5, 0x43, 0x68, 0x10, 0x2d, 0x86, 0x49, + 0xe3, 0xc8, 0x0a, 0xa3, 0x9b, 0x92, 0x47, 0xdf, 0x1b, 0x49, 0x56, 0xcc, 0xda, 0x0d, 0x15, 0xfe, + 0xc5, 0x83, 0xae, 0x65, 0xe0, 0x85, 0xe0, 0x7d, 0x9a, 0x65, 0x9f, 0x63, 0xa3, 0x41, 0x43, 0x8b, + 0x01, 0x4e, 0x2d, 0x32, 0x94, 0xe5, 0x40, 0xd5, 0x71, 0xe0, 0x06, 0x1e, 0xe8, 0x69, 0x89, 0xe5, + 0x85, 0xba, 0xd7, 0x91, 0x58, 0x5f, 0xc6, 0xf4, 0xeb, 0x21, 0x27, 0xdd, 0xf1, 0x95, 0xf9, 0x5f, + 0xa2, 0x1c, 0x5f, 0x3d, 0x01, 0x20, 0x71, 0xfc, 0x09, 0x17, 0x71, 0xc2, 0x86, 0x26, 0x52, 0x16, + 0x12, 0x7e, 0x0c, 0x2d, 0x75, 0xb3, 0x7c, 0x69, 0xcd, 0x3d, 0xee, 0x9c, 0xcc, 0xd8, 0x33, 0x13, + 0xdf, 0x9d, 0x99, 0x84, 0x04, 0x76, 0xe6, 0x0c, 0x7f, 0x1a, 0xc7, 0x26, 0xf4, 0x87, 0x7a, 0xa6, + 0x93, 0x6b, 0x32, 0x19, 0x58, 0xf4, 0xe0, 0xb2, 0x0d, 0x8a, 0x1c, 0xa6, 0x90, 0xc2, 0x93, 0x39, + 0x15, 0x6e, 0x86, 0xef, 0x45, 0xcd, 0xef, 0x3d, 0xe8, 0x18, 0x3d, 0x85, 0xfd, 0xdf, 0x81, 0xba, + 0x9e, 0x91, 0x1a, 0x91, 0x5f, 0x59, 0x28, 0x32, 0x9f, 0xed, 0x46, 0x66, 0xf1, 0x7c, 0x37, 0xf0, + 0x17, 0x74, 0x83, 0xe0, 0x7b, 0x33, 0xdb, 0x73, 0x85, 0xad, 0x90, 0xef, 0xcc, 0x9f, 0xe6, 0xe5, + 0x72, 0x44, 0x53, 0x2a, 0xef, 0x33, 0x0a, 0xaf, 0x60, 0x0b, 0x07, 0xb6, 0xf7, 0x9c, 0xc3, 0x4f, + 0x60, 0x1b, 0xc5, 0xde, 0xbb, 0xbd, 0x3f, 0x83, 0xf7, 0xca, 0x04, 0xd8, 0x2d, 0xf5, 0x5e, 0xa4, + 0x7f, 0x13, 0x1e, 0x5e, 0xd2, 0x74, 0xa0, 0x64, 0xbf, 0x1a, 0xc7, 0xc5, 0x59, 0xb5, 0x64, 0xe4, + 0x72, 0x55, 0xc7, 0x3f, 0x1c, 0xbf, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x60, 0xab, + 0x3f, 0x83, 0x1c, 0x00, 0x00, }