From 92a6c7b89eb0042492f1669efc19f6cfdd124de1 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Sun, 16 Jan 2022 18:58:07 +0800 Subject: [PATCH] Refactor code --- internal/rpc/msg/friend_notification.go | 16 +- internal/rpc/user/user.go | 4 +- pkg/common/constant/constant.go | 2 +- pkg/proto/sdk_ws/ws.pb.go | 400 ++++++++++++------------ pkg/proto/sdk_ws/ws.proto | 4 +- 5 files changed, 213 insertions(+), 213 deletions(-) diff --git a/internal/rpc/msg/friend_notification.go b/internal/rpc/msg/friend_notification.go index e1a6fd3ef..39e3684dc 100644 --- a/internal/rpc/msg/friend_notification.go +++ b/internal/rpc/msg/friend_notification.go @@ -97,10 +97,10 @@ func friendNotification(commID *pbFriend.CommID, contentType int32, m proto.Mess func FriendApplicationNotification(req *pbFriend.AddFriendReq) { log.Info(req.CommID.OperationID, utils.GetSelfFuncName(), "args: ", req.String()) - var friendApplicationAddedTips open_im_sdk.FriendApplicationAddedTips - friendApplicationAddedTips.FromToUserID.FromUserID = req.CommID.FromUserID - friendApplicationAddedTips.FromToUserID.ToUserID = req.CommID.ToUserID - friendNotification(req.CommID, constant.FriendApplicationNotification, &friendApplicationAddedTips) + var FriendApplicationTips open_im_sdk.FriendApplicationTips + FriendApplicationTips.FromToUserID.FromUserID = req.CommID.FromUserID + FriendApplicationTips.FromToUserID.ToUserID = req.CommID.ToUserID + friendNotification(req.CommID, constant.FriendApplicationNotification, &FriendApplicationTips) //fromUserNickname, toUserNickname, err := getFromToUserNickname(req.CommID.FromUserID, req.CommID.ToUserID) //if err != nil { // log.Error(req.CommID.OperationID, "getFromToUserNickname failed ", err.Error(), req.CommID.FromUserID, req.CommID.ToUserID) @@ -408,11 +408,11 @@ func BlackDeletedNotification(req *pbFriend.RemoveBlacklistReq) { // PublicUserInfo OpUser = 2; // uint64 OperationTime = 3; //} -func SelfInfoUpdatedNotification(operationID, userID string, opUserID string) { - var selfInfoUpdatedTips open_im_sdk.SelfInfoUpdatedTips +func UserInfoUpdatedNotification(operationID, userID string, needNotifiedUserID string) { + var selfInfoUpdatedTips open_im_sdk.UserInfoUpdatedTips selfInfoUpdatedTips.UserID = userID - commID := pbFriend.CommID{FromUserID: userID, ToUserID: userID, OpUserID: opUserID, OperationID: operationID} - friendNotification(&commID, constant.SelfInfoUpdatedNotification, &selfInfoUpdatedTips) + commID := pbFriend.CommID{FromUserID: userID, ToUserID: userID, OpUserID: needNotifiedUserID, OperationID: operationID} + friendNotification(&commID, constant.UserInfoUpdatedNotification, &selfInfoUpdatedTips) //u, err := imdb.GetUserByUserID(userID) //if err != nil { // log.NewError(operationID, "FindUserByUID failed ", err.Error(), userID) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index e4366d6b6..a0c451026 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -235,8 +235,8 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil } for _, v := range RpcResp.FriendInfoList { - chat.FriendInfoChangedNotification(req.OperationID, req.OpUserID, req.UserInfo.UserID, v.FriendUser.UserID) + chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, v.FriendUser.UserID) } - chat.SelfInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, req.OpUserID) + chat.UserInfoUpdatedNotification(req.OperationID, req.UserInfo.UserID, req.OpUserID) return &pbUser.UpdateUserInfoResp{CommonResp: &pbUser.CommonResp{}}, nil } diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 532aef20f..cd0c99fae 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -55,7 +55,7 @@ const ( BlackAddedNotification = 1207 //add_black BlackDeletedNotification = 1208 //remove_black - SelfInfoUpdatedNotification = 1303 //SetSelfInfoTip = 204 + UserInfoUpdatedNotification = 1303 //SetSelfInfoTip = 204 GroupCreatedNotification = 1501 GroupInfoSetNotification = 1502 diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 5fa6688bd..5dc1cae3b 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_4239643aeea36936, []int{0} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{1} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{2} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{3} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{4} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{5} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{6} + return fileDescriptor_ws_551a30e7c7c24c98, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -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_4239643aeea36936, []int{7} + return fileDescriptor_ws_551a30e7c7c24c98, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -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_4239643aeea36936, []int{8} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{9} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{10} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{11} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{12} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{13} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{14} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{15} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{16} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{17} + return fileDescriptor_ws_551a30e7c7c24c98, []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_4239643aeea36936, []int{18} + return fileDescriptor_ws_551a30e7c7c24c98, []int{18} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1606,7 +1606,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_4239643aeea36936, []int{19} + return fileDescriptor_ws_551a30e7c7c24c98, []int{19} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1675,7 +1675,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{20} + return fileDescriptor_ws_551a30e7c7c24c98, []int{20} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -1730,7 +1730,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_4239643aeea36936, []int{21} + return fileDescriptor_ws_551a30e7c7c24c98, []int{21} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -1786,7 +1786,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{22} + return fileDescriptor_ws_551a30e7c7c24c98, []int{22} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -1841,7 +1841,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{23} + return fileDescriptor_ws_551a30e7c7c24c98, []int{23} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -1896,7 +1896,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{24} + return fileDescriptor_ws_551a30e7c7c24c98, []int{24} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -1952,7 +1952,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{25} + return fileDescriptor_ws_551a30e7c7c24c98, []int{25} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2015,7 +2015,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_4239643aeea36936, []int{26} + return fileDescriptor_ws_551a30e7c7c24c98, []int{26} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2078,7 +2078,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_4239643aeea36936, []int{27} + return fileDescriptor_ws_551a30e7c7c24c98, []int{27} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2140,7 +2140,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_4239643aeea36936, []int{28} + return fileDescriptor_ws_551a30e7c7c24c98, []int{28} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2194,7 +2194,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_4239643aeea36936, []int{29} + return fileDescriptor_ws_551a30e7c7c24c98, []int{29} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2247,7 +2247,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_4239643aeea36936, []int{30} + return fileDescriptor_ws_551a30e7c7c24c98, []int{30} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2282,38 +2282,38 @@ func (m *FromToUserID) GetToUserID() string { } // FromUserID apply to add ToUserID -type FriendApplicationAddedTips struct { +type FriendApplicationTips struct { FromToUserID *FromToUserID `protobuf:"bytes,1,opt,name=fromToUserID" json:"fromToUserID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *FriendApplicationAddedTips) Reset() { *m = FriendApplicationAddedTips{} } -func (m *FriendApplicationAddedTips) String() string { return proto.CompactTextString(m) } -func (*FriendApplicationAddedTips) ProtoMessage() {} -func (*FriendApplicationAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{31} +func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } +func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } +func (*FriendApplicationTips) ProtoMessage() {} +func (*FriendApplicationTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_551a30e7c7c24c98, []int{31} } -func (m *FriendApplicationAddedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FriendApplicationAddedTips.Unmarshal(m, b) +func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) } -func (m *FriendApplicationAddedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FriendApplicationAddedTips.Marshal(b, m, deterministic) +func (m *FriendApplicationTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FriendApplicationTips.Marshal(b, m, deterministic) } -func (dst *FriendApplicationAddedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_FriendApplicationAddedTips.Merge(dst, src) +func (dst *FriendApplicationTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_FriendApplicationTips.Merge(dst, src) } -func (m *FriendApplicationAddedTips) XXX_Size() int { - return xxx_messageInfo_FriendApplicationAddedTips.Size(m) +func (m *FriendApplicationTips) XXX_Size() int { + return xxx_messageInfo_FriendApplicationTips.Size(m) } -func (m *FriendApplicationAddedTips) XXX_DiscardUnknown() { - xxx_messageInfo_FriendApplicationAddedTips.DiscardUnknown(m) +func (m *FriendApplicationTips) XXX_DiscardUnknown() { + xxx_messageInfo_FriendApplicationTips.DiscardUnknown(m) } -var xxx_messageInfo_FriendApplicationAddedTips proto.InternalMessageInfo +var xxx_messageInfo_FriendApplicationTips proto.InternalMessageInfo -func (m *FriendApplicationAddedTips) GetFromToUserID() *FromToUserID { +func (m *FriendApplicationTips) GetFromToUserID() *FromToUserID { if m != nil { return m.FromToUserID } @@ -2333,7 +2333,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{32} + return fileDescriptor_ws_551a30e7c7c24c98, []int{32} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -2380,7 +2380,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4239643aeea36936, []int{33} + return fileDescriptor_ws_551a30e7c7c24c98, []int{33} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -2428,7 +2428,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_4239643aeea36936, []int{34} + return fileDescriptor_ws_551a30e7c7c24c98, []int{34} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2481,7 +2481,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_4239643aeea36936, []int{35} + return fileDescriptor_ws_551a30e7c7c24c98, []int{35} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2519,7 +2519,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_4239643aeea36936, []int{36} + return fileDescriptor_ws_551a30e7c7c24c98, []int{36} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -2557,7 +2557,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_4239643aeea36936, []int{37} + return fileDescriptor_ws_551a30e7c7c24c98, []int{37} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -2595,7 +2595,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_4239643aeea36936, []int{38} + return fileDescriptor_ws_551a30e7c7c24c98, []int{38} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2623,38 +2623,38 @@ func (m *FriendInfoChangedTips) GetFromToUserID() *FromToUserID { } // ////////////////////user///////////////////// -type SelfInfoUpdatedTips struct { +type UserInfoUpdatedTips struct { UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -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_4239643aeea36936, []int{39} +func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } +func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } +func (*UserInfoUpdatedTips) ProtoMessage() {} +func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_551a30e7c7c24c98, []int{39} } -func (m *SelfInfoUpdatedTips) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SelfInfoUpdatedTips.Unmarshal(m, b) +func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) } -func (m *SelfInfoUpdatedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SelfInfoUpdatedTips.Marshal(b, m, deterministic) +func (m *UserInfoUpdatedTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UserInfoUpdatedTips.Marshal(b, m, deterministic) } -func (dst *SelfInfoUpdatedTips) XXX_Merge(src proto.Message) { - xxx_messageInfo_SelfInfoUpdatedTips.Merge(dst, src) +func (dst *UserInfoUpdatedTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_UserInfoUpdatedTips.Merge(dst, src) } -func (m *SelfInfoUpdatedTips) XXX_Size() int { - return xxx_messageInfo_SelfInfoUpdatedTips.Size(m) +func (m *UserInfoUpdatedTips) XXX_Size() int { + return xxx_messageInfo_UserInfoUpdatedTips.Size(m) } -func (m *SelfInfoUpdatedTips) XXX_DiscardUnknown() { - xxx_messageInfo_SelfInfoUpdatedTips.DiscardUnknown(m) +func (m *UserInfoUpdatedTips) XXX_DiscardUnknown() { + xxx_messageInfo_UserInfoUpdatedTips.DiscardUnknown(m) } -var xxx_messageInfo_SelfInfoUpdatedTips proto.InternalMessageInfo +var xxx_messageInfo_UserInfoUpdatedTips proto.InternalMessageInfo -func (m *SelfInfoUpdatedTips) GetUserID() string { +func (m *UserInfoUpdatedTips) GetUserID() string { if m != nil { return m.UserID } @@ -2694,7 +2694,7 @@ func init() { proto.RegisterType((*MemberEnterTips)(nil), "server_api_params.MemberEnterTips") 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((*FriendApplicationTips)(nil), "server_api_params.FriendApplicationTips") proto.RegisterType((*FriendApplicationApprovedTips)(nil), "server_api_params.FriendApplicationApprovedTips") proto.RegisterType((*FriendApplicationRejectedTips)(nil), "server_api_params.FriendApplicationRejectedTips") proto.RegisterType((*FriendAddedTips)(nil), "server_api_params.FriendAddedTips") @@ -2702,138 +2702,138 @@ func init() { 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") + proto.RegisterType((*UserInfoUpdatedTips)(nil), "server_api_params.UserInfoUpdatedTips") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_4239643aeea36936) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_551a30e7c7c24c98) } -var fileDescriptor_ws_4239643aeea36936 = []byte{ +var fileDescriptor_ws_551a30e7c7c24c98 = []byte{ // 2019 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4f, 0x6f, 0x23, 0x49, - 0x15, 0x57, 0x77, 0xc7, 0x8e, 0xf3, 0x6c, 0xc7, 0x99, 0x9e, 0x65, 0x30, 0x61, 0x76, 0x08, 0xad, - 0xd5, 0x32, 0x42, 0x22, 0x48, 0x83, 0x90, 0x60, 0x10, 0xa0, 0xfc, 0x67, 0x96, 0x38, 0x09, 0xed, + 0x15, 0x57, 0x77, 0xc7, 0x8e, 0xfd, 0x6c, 0xc7, 0x99, 0x9e, 0x65, 0x30, 0xc3, 0xec, 0x10, 0x5a, + 0xab, 0x25, 0x42, 0x22, 0x48, 0x83, 0x90, 0x60, 0x10, 0xa0, 0xfc, 0x67, 0x96, 0x38, 0x09, 0x9d, 0x8c, 0x96, 0x03, 0xd2, 0xa8, 0xe3, 0x2e, 0x3b, 0xbd, 0x69, 0x57, 0xb5, 0xab, 0xbb, 0x33, 0x33, 0x17, 0x0e, 0x70, 0xe1, 0x0b, 0xc0, 0x91, 0x03, 0x17, 0xc4, 0x05, 0x71, 0x41, 0xdc, 0x11, 0x5f, 0x80, 0x33, 0x5f, 0x81, 0x2b, 0x07, 0x24, 0xa4, 0x45, 0xf5, 0xaa, 0xba, 0xbb, 0xaa, 0xed, 0x64, - 0xad, 0x28, 0xda, 0x41, 0xe2, 0xe6, 0xf7, 0xeb, 0x7a, 0xff, 0x5f, 0xbd, 0x7a, 0x55, 0x86, 0x5e, - 0x1a, 0x5e, 0xbd, 0x7a, 0x9d, 0x7e, 0xf3, 0x75, 0xba, 0x9d, 0x70, 0x96, 0x31, 0xf7, 0x41, 0x4a, - 0xf8, 0x35, 0xe1, 0xaf, 0x82, 0x24, 0x7a, 0x95, 0x04, 0x3c, 0x98, 0xa6, 0xde, 0xbf, 0x6c, 0x58, - 0x3b, 0xe2, 0x2c, 0x4f, 0x5e, 0xd0, 0x31, 0x73, 0xfb, 0xb0, 0x3a, 0x41, 0x62, 0xbf, 0x6f, 0x6d, - 0x59, 0x4f, 0xd7, 0xfc, 0x82, 0x74, 0x1f, 0xc3, 0x1a, 0xfe, 0x3c, 0x09, 0xa6, 0xa4, 0x6f, 0xe3, - 0xb7, 0x0a, 0x70, 0x3d, 0xe8, 0x50, 0x96, 0x45, 0xe3, 0x68, 0x14, 0x64, 0x11, 0xa3, 0x7d, 0x07, - 0x17, 0x18, 0x98, 0x58, 0x13, 0xd1, 0x8c, 0xb3, 0x30, 0x1f, 0xe1, 0x9a, 0x15, 0xb9, 0x46, 0xc7, - 0x84, 0xfe, 0x71, 0x30, 0x22, 0x2f, 0xfd, 0xe3, 0x7e, 0x43, 0xea, 0x57, 0xa4, 0xbb, 0x05, 0x6d, - 0xf6, 0x9a, 0x12, 0xfe, 0x32, 0x25, 0xfc, 0xc5, 0x7e, 0xbf, 0x89, 0x5f, 0x75, 0xc8, 0x7d, 0x02, - 0x30, 0xe2, 0x24, 0xc8, 0xc8, 0x79, 0x34, 0x25, 0xfd, 0xd5, 0x2d, 0xeb, 0x69, 0xd7, 0xd7, 0x10, - 0x21, 0x61, 0x4a, 0xa6, 0x17, 0x84, 0xef, 0xb1, 0x9c, 0x66, 0xfd, 0x16, 0x2e, 0xd0, 0x21, 0x77, - 0x1d, 0x6c, 0xf2, 0xa6, 0xbf, 0x86, 0xa2, 0x6d, 0xf2, 0xc6, 0x7d, 0x04, 0xcd, 0x34, 0x0b, 0xb2, - 0x3c, 0xed, 0xc3, 0x96, 0xf5, 0xb4, 0xe1, 0x2b, 0xca, 0xfd, 0x00, 0xba, 0x28, 0x97, 0x15, 0xd6, - 0xb4, 0x91, 0xc5, 0x04, 0xcb, 0x88, 0x9d, 0xbf, 0x4d, 0x48, 0xbf, 0x83, 0x02, 0x2a, 0xc0, 0xfb, - 0x8b, 0x0d, 0x0f, 0x31, 0xee, 0x03, 0x34, 0xe0, 0x30, 0x8f, 0xe3, 0xcf, 0xc8, 0xc0, 0x23, 0x68, - 0xe6, 0x52, 0x9d, 0x0c, 0xbf, 0xa2, 0x84, 0x1e, 0xce, 0x62, 0x72, 0x4c, 0xae, 0x49, 0x8c, 0x81, - 0x6f, 0xf8, 0x15, 0xe0, 0x6e, 0x42, 0xeb, 0x13, 0x16, 0x51, 0x8c, 0x89, 0x88, 0xb8, 0xe3, 0x97, - 0xb4, 0xf8, 0x46, 0xa3, 0xd1, 0x15, 0x15, 0x29, 0x95, 0xe1, 0x2e, 0x69, 0x3d, 0x13, 0x4d, 0x33, - 0x13, 0x1f, 0xc2, 0x7a, 0x90, 0x24, 0x83, 0x80, 0x4e, 0x08, 0x97, 0x4a, 0x57, 0x51, 0x69, 0x0d, - 0x15, 0xf9, 0x10, 0x9a, 0x86, 0x2c, 0xe7, 0x23, 0x82, 0xe1, 0x6e, 0xf8, 0x1a, 0x22, 0xe4, 0xb0, - 0x84, 0x70, 0x2d, 0x8c, 0x32, 0xf2, 0x35, 0x54, 0x65, 0x05, 0x8a, 0xac, 0x78, 0xbf, 0xb5, 0x60, - 0xfd, 0x2c, 0xbf, 0x88, 0xa3, 0x11, 0x2e, 0x10, 0x41, 0xab, 0x42, 0x63, 0x19, 0xa1, 0xd1, 0x1d, - 0xb4, 0x6f, 0x76, 0xd0, 0x31, 0x1d, 0x7c, 0x04, 0xcd, 0x09, 0xa1, 0x21, 0xe1, 0x18, 0xb0, 0x86, - 0xaf, 0xa8, 0x05, 0x8e, 0x37, 0x16, 0x39, 0xee, 0xfd, 0xc6, 0x86, 0xd6, 0xe7, 0x6c, 0xda, 0x16, - 0xb4, 0x93, 0x4b, 0x46, 0xc9, 0x49, 0x2e, 0x8a, 0x49, 0x25, 0x53, 0x87, 0xdc, 0xf7, 0xa0, 0x71, - 0x11, 0xf1, 0xec, 0x12, 0xb3, 0xd9, 0xf5, 0x25, 0x21, 0x50, 0x32, 0x0d, 0x22, 0x99, 0xc2, 0x35, - 0x5f, 0x12, 0x2a, 0xe2, 0xad, 0x72, 0x1f, 0x98, 0x3b, 0x6b, 0x6d, 0x6e, 0x67, 0xcd, 0x07, 0x06, - 0x16, 0x06, 0xe6, 0xdf, 0x16, 0xc0, 0x21, 0x8f, 0x08, 0x0d, 0x31, 0x34, 0xb5, 0x2d, 0x6d, 0xcd, - 0x6f, 0xe9, 0x47, 0xd0, 0xe4, 0x64, 0x1a, 0xf0, 0xab, 0xa2, 0xe4, 0x25, 0x55, 0x33, 0xc8, 0x99, - 0x33, 0xe8, 0x7b, 0x00, 0x63, 0xd4, 0x23, 0xe4, 0x60, 0xa8, 0xda, 0xcf, 0xbe, 0xbc, 0x3d, 0xd7, - 0xfc, 0xb6, 0x8b, 0x2c, 0xf9, 0xda, 0x72, 0xb1, 0x9f, 0x82, 0x30, 0x54, 0x65, 0x2b, 0x33, 0x5c, - 0x01, 0x0b, 0xaa, 0xb6, 0x79, 0x4b, 0xd5, 0xae, 0x96, 0x55, 0xfb, 0x4f, 0x0b, 0xd6, 0x76, 0xe3, - 0x60, 0x74, 0xb5, 0xa4, 0xeb, 0xa6, 0x8b, 0xf6, 0x9c, 0x8b, 0x47, 0xd0, 0xbd, 0x10, 0xe2, 0x0a, - 0x17, 0x30, 0x0a, 0xed, 0x67, 0x5f, 0x5d, 0xe0, 0xa5, 0xb9, 0x59, 0x7c, 0x93, 0xcf, 0x74, 0x77, - 0xe5, 0xb3, 0xdd, 0x6d, 0xdc, 0xe2, 0x6e, 0xb3, 0x74, 0xf7, 0xef, 0x36, 0x74, 0xb0, 0xbd, 0xf9, - 0x64, 0x96, 0x93, 0x34, 0x73, 0xbf, 0x0f, 0xad, 0xbc, 0x30, 0xd5, 0x5a, 0xd6, 0xd4, 0x92, 0xc5, - 0x7d, 0xae, 0x9a, 0x29, 0xf2, 0xdb, 0xc8, 0xff, 0x78, 0x01, 0x7f, 0x79, 0x92, 0xf9, 0xd5, 0x72, - 0x71, 0xf0, 0x5c, 0x06, 0x34, 0x8c, 0x89, 0x4f, 0xd2, 0x3c, 0xce, 0x8a, 0xc3, 0x49, 0xc7, 0x64, - 0xa5, 0xcd, 0x06, 0xe9, 0x44, 0x1d, 0x4b, 0x8a, 0x12, 0xd1, 0x91, 0xeb, 0xc4, 0x27, 0xe9, 0x7a, - 0x05, 0x88, 0x8d, 0xca, 0xc9, 0x0c, 0x33, 0x24, 0xb7, 0x55, 0x41, 0x56, 0x3a, 0x55, 0xd4, 0x56, - 0x75, 0x9d, 0x55, 0x8a, 0x25, 0x8d, 0x02, 0xe4, 0x79, 0xa4, 0x21, 0xf5, 0xe3, 0xc8, 0xfb, 0x87, - 0x03, 0x5d, 0xb9, 0x7d, 0x8a, 0xa0, 0x3e, 0x11, 0x75, 0xce, 0xa6, 0x46, 0x15, 0x69, 0x88, 0xb0, - 0x42, 0x50, 0x27, 0x66, 0xa3, 0x31, 0x30, 0x51, 0x8a, 0x82, 0x3e, 0x34, 0x1a, 0x8e, 0x0e, 0x15, - 0x5a, 0x8e, 0xf4, 0xc6, 0xa3, 0x21, 0xa2, 0x95, 0x65, 0xcc, 0xa8, 0x8e, 0x92, 0x16, 0xbc, 0x19, - 0x2b, 0xf5, 0xcb, 0xfa, 0xd0, 0x10, 0x11, 0xdf, 0x8c, 0x15, 0xba, 0x65, 0x90, 0x2a, 0x40, 0x4a, - 0x56, 0x7a, 0xe5, 0x01, 0x52, 0xd2, 0x73, 0x59, 0x5d, 0xc3, 0xef, 0x37, 0x65, 0x15, 0x8c, 0xac, - 0x9a, 0x9b, 0xab, 0x3d, 0xb7, 0xb9, 0x3e, 0x80, 0xae, 0x94, 0x53, 0x14, 0x7d, 0x47, 0x1e, 0xf0, - 0x06, 0x68, 0xd6, 0x46, 0xb7, 0x5e, 0x1b, 0x66, 0x76, 0xd7, 0x6f, 0xc8, 0x6e, 0xaf, 0xcc, 0xee, - 0xaf, 0x6c, 0xe8, 0x9f, 0xe5, 0x71, 0x3c, 0x20, 0x69, 0x1a, 0x4c, 0xc8, 0xee, 0xdb, 0x21, 0x99, - 0x1d, 0x47, 0x69, 0xe6, 0x93, 0x34, 0x11, 0x85, 0x46, 0x38, 0xdf, 0x63, 0x21, 0xc1, 0x2c, 0x37, - 0xfc, 0x82, 0x14, 0x2e, 0x12, 0xce, 0x85, 0x05, 0xaa, 0x45, 0x4a, 0x4a, 0xe0, 0xd3, 0xe0, 0xcd, - 0x90, 0xcc, 0x30, 0xa3, 0x8e, 0xaf, 0x28, 0xc4, 0x23, 0x2a, 0xf0, 0x15, 0x85, 0x23, 0xe5, 0x1e, - 0x40, 0x37, 0x8d, 0xe8, 0x44, 0x16, 0xa7, 0x2c, 0x76, 0xe7, 0x69, 0xfb, 0xd9, 0x57, 0x16, 0x6d, - 0xb2, 0x20, 0xbb, 0x24, 0xfc, 0x90, 0xf1, 0x69, 0x90, 0xf9, 0x26, 0x97, 0xbb, 0x07, 0x1d, 0xdc, - 0x78, 0x85, 0x94, 0xe6, 0x72, 0x52, 0x0c, 0x26, 0x6f, 0x0a, 0x5f, 0x5c, 0x1c, 0x89, 0xd9, 0x8d, - 0xc7, 0xa9, 0x68, 0xa8, 0xd8, 0x91, 0x22, 0x46, 0xcb, 0x09, 0x49, 0x87, 0x44, 0x08, 0x53, 0x29, - 0xa7, 0xef, 0x6c, 0x39, 0x4f, 0x1d, 0xbf, 0x20, 0xbd, 0x9f, 0x8b, 0x79, 0xa2, 0x54, 0x77, 0x9b, - 0x96, 0x4d, 0x68, 0xa5, 0x64, 0xb6, 0x4b, 0x26, 0x11, 0x45, 0x15, 0x8e, 0x5f, 0xd2, 0x38, 0x2c, - 0x92, 0xd9, 0x01, 0x0d, 0x8b, 0x80, 0x4b, 0xaa, 0x6e, 0xd9, 0xca, 0x9c, 0x65, 0xde, 0xa7, 0x16, - 0xf4, 0x0c, 0x03, 0xfe, 0xef, 0x12, 0xfe, 0x1e, 0xb8, 0x47, 0x24, 0x1b, 0x04, 0x6f, 0x76, 0x68, - 0x38, 0x40, 0xf3, 0x7c, 0x32, 0xf3, 0x0e, 0xe0, 0xe1, 0x1c, 0x9a, 0x26, 0x9a, 0xa3, 0xd6, 0x0d, - 0x8e, 0xda, 0xba, 0xa3, 0xde, 0x09, 0x74, 0x74, 0xd5, 0x62, 0xe3, 0x45, 0xa1, 0x4a, 0xac, 0x1d, - 0x85, 0xee, 0x36, 0xac, 0xc4, 0xa2, 0x2a, 0x6c, 0xb4, 0x7c, 0x73, 0x81, 0xe5, 0x83, 0x74, 0xb2, - 0x1f, 0x64, 0x81, 0x8f, 0xeb, 0xbc, 0x19, 0xf4, 0x84, 0xdd, 0x43, 0x42, 0xc3, 0x41, 0x3a, 0x41, - 0x93, 0xb6, 0xa0, 0x2d, 0xb9, 0x06, 0xe9, 0xa4, 0x3a, 0xce, 0x35, 0x48, 0xac, 0x18, 0xc5, 0x11, - 0xa1, 0x99, 0x5c, 0xa1, 0xea, 0x53, 0x83, 0x64, 0x6d, 0xd1, 0xb0, 0x9c, 0x68, 0xb0, 0xb6, 0x24, - 0xed, 0xfd, 0xb5, 0x01, 0xab, 0xca, 0x08, 0x59, 0x67, 0x34, 0xac, 0x6a, 0x53, 0x52, 0xb2, 0xd7, - 0x8d, 0xae, 0xab, 0xeb, 0x81, 0xa4, 0xf4, 0x0b, 0x85, 0x63, 0x5e, 0x28, 0x6a, 0x36, 0xad, 0xcc, - 0xdb, 0x54, 0xf3, 0xab, 0x31, 0xef, 0xd7, 0xd7, 0x61, 0x23, 0xc5, 0x7e, 0x7c, 0x16, 0x07, 0xd9, - 0x98, 0xf1, 0xa9, 0x1a, 0x88, 0x1a, 0xfe, 0x1c, 0x2e, 0x66, 0x09, 0x89, 0x95, 0xe7, 0x81, 0x6c, - 0xf8, 0x35, 0x54, 0x74, 0x5f, 0x89, 0x14, 0xe7, 0x82, 0x9c, 0x44, 0x4d, 0x50, 0xda, 0x96, 0xa6, - 0x11, 0xa3, 0x78, 0xc1, 0x92, 0xed, 0x5f, 0x87, 0x84, 0xe7, 0xd3, 0x74, 0x72, 0xc8, 0xd9, 0x54, - 0xcd, 0xa3, 0x05, 0x89, 0x9e, 0x33, 0x9a, 0x11, 0x9a, 0x21, 0x6f, 0x5b, 0xf2, 0x6a, 0x90, 0xe0, - 0x55, 0x24, 0xf6, 0xfe, 0x8e, 0x5f, 0x90, 0xa2, 0xeb, 0x8f, 0x19, 0x1f, 0x11, 0xec, 0x24, 0xdd, - 0x2d, 0x47, 0x74, 0xfd, 0x12, 0x70, 0x37, 0xc0, 0x49, 0xc9, 0x0c, 0xdb, 0xbd, 0xe3, 0x8b, 0x9f, - 0x46, 0x5e, 0x7b, 0x66, 0x5e, 0x6b, 0xe7, 0xd0, 0x06, 0x7e, 0xd5, 0xcf, 0xa1, 0x1d, 0x58, 0x65, - 0x89, 0xe8, 0x12, 0x69, 0xff, 0x01, 0x56, 0xe7, 0xd7, 0x6e, 0xae, 0xce, 0xed, 0x53, 0xb9, 0xf2, - 0x80, 0x66, 0xfc, 0xad, 0x5f, 0xf0, 0xb9, 0xc7, 0xd0, 0x63, 0xe3, 0x71, 0x1c, 0x51, 0x72, 0x96, - 0xa7, 0x97, 0x38, 0x3e, 0xb9, 0x38, 0x3e, 0x79, 0x0b, 0x44, 0x9d, 0x9a, 0x2b, 0xfd, 0x3a, 0xeb, - 0xe6, 0x73, 0xe8, 0xe8, 0x6a, 0x84, 0xbb, 0x57, 0xe4, 0xad, 0xaa, 0x44, 0xf1, 0x53, 0xdc, 0x28, - 0xae, 0x83, 0x38, 0x97, 0xb3, 0x46, 0xcb, 0x97, 0xc4, 0x73, 0xfb, 0x3b, 0x96, 0xf7, 0x6b, 0x0b, - 0x7a, 0x35, 0x05, 0x62, 0x75, 0x16, 0x65, 0x31, 0x51, 0x12, 0x24, 0xe1, 0xba, 0xb0, 0x12, 0x92, - 0x74, 0xa4, 0x0a, 0x19, 0x7f, 0xab, 0xe3, 0xd2, 0x29, 0xef, 0x24, 0x1e, 0x74, 0xa2, 0xd3, 0xa1, - 0x10, 0x34, 0x64, 0x39, 0x0d, 0xcb, 0xd7, 0x04, 0x0d, 0x13, 0x85, 0x14, 0x9d, 0x0e, 0x77, 0x83, - 0x70, 0x42, 0xe4, 0x9d, 0xbf, 0x81, 0x36, 0x99, 0xa0, 0xb7, 0x0f, 0xad, 0xf3, 0x28, 0x49, 0xf7, - 0xd8, 0x74, 0x2a, 0x36, 0x51, 0x48, 0x32, 0x71, 0x21, 0xb2, 0x30, 0xeb, 0x8a, 0x12, 0x05, 0x13, - 0x92, 0x71, 0x90, 0xc7, 0x99, 0x58, 0x5a, 0x6c, 0x5f, 0x0d, 0xf2, 0xfe, 0x66, 0xc3, 0x06, 0x4e, - 0x9f, 0x7b, 0x98, 0xbe, 0x50, 0x80, 0xee, 0x33, 0x68, 0xe0, 0x66, 0x53, 0x13, 0xef, 0xed, 0x13, - 0xab, 0x5c, 0xea, 0xfe, 0x00, 0x9a, 0x0c, 0x1b, 0xa3, 0x1a, 0x73, 0x3f, 0xbc, 0x89, 0xc9, 0x7c, - 0x38, 0xf0, 0x15, 0x97, 0x7b, 0x08, 0x20, 0xdf, 0x34, 0xca, 0xa3, 0x6e, 0x79, 0x19, 0x1a, 0xa7, - 0x08, 0x5e, 0x79, 0x48, 0x69, 0xaf, 0x07, 0x26, 0xe8, 0x9e, 0xc0, 0x3a, 0x9a, 0x7d, 0x5a, 0x5c, - 0x5d, 0x30, 0xc6, 0xcb, 0x6b, 0xac, 0x71, 0x7b, 0xbf, 0xb3, 0x54, 0x18, 0xc5, 0xd7, 0x21, 0xc1, - 0xd8, 0x6a, 0x21, 0xb1, 0xee, 0x14, 0x92, 0x4d, 0x68, 0x4d, 0x73, 0xed, 0x26, 0xe5, 0xf8, 0x25, - 0x5d, 0xa5, 0xc8, 0x59, 0x3a, 0x45, 0xde, 0xef, 0x2d, 0xe8, 0x7f, 0xc4, 0x22, 0x8a, 0x1f, 0x76, - 0x92, 0x24, 0x56, 0x4f, 0x5c, 0x77, 0xce, 0xf9, 0x0f, 0x61, 0x2d, 0x90, 0x62, 0x68, 0xa6, 0xd2, - 0xbe, 0xc4, 0xed, 0xa8, 0xe2, 0xd1, 0x06, 0x5d, 0x47, 0x1f, 0x74, 0xbd, 0x3f, 0x5a, 0xb0, 0x2e, - 0x83, 0xf2, 0x93, 0x3c, 0xca, 0xee, 0x6c, 0xdf, 0x2e, 0xb4, 0x66, 0x79, 0x94, 0xdd, 0xa1, 0x2a, - 0x4b, 0xbe, 0xf9, 0x7a, 0x72, 0x16, 0xd4, 0x93, 0xf7, 0x27, 0x0b, 0x1e, 0xd7, 0xc3, 0xba, 0x33, - 0x1a, 0x91, 0xe4, 0x5d, 0x6e, 0x29, 0x63, 0xd0, 0x5f, 0xa9, 0x0d, 0xfa, 0x0b, 0x4d, 0xf6, 0xc9, - 0x27, 0x64, 0xf4, 0xbf, 0x6b, 0xf2, 0x2f, 0x6d, 0xf8, 0xd2, 0x51, 0xb9, 0xf1, 0xce, 0x79, 0x40, - 0xd3, 0x31, 0xe1, 0xfc, 0x1d, 0xda, 0x7b, 0x0c, 0x5d, 0x4a, 0x5e, 0x57, 0x36, 0xa9, 0xed, 0xb8, - 0xac, 0x18, 0x93, 0x79, 0xb9, 0xde, 0xe5, 0xfd, 0xc7, 0x82, 0x0d, 0x29, 0xe7, 0xc7, 0xd1, 0xe8, - 0xea, 0x1d, 0x3a, 0x7f, 0x02, 0xeb, 0x57, 0x68, 0x81, 0xa0, 0xee, 0xd0, 0xb6, 0x6b, 0xdc, 0x4b, - 0xba, 0xff, 0xa9, 0x05, 0x0f, 0xa4, 0xa0, 0x17, 0xf4, 0x3a, 0x7a, 0x97, 0xc5, 0x7a, 0x06, 0xbd, - 0x48, 0x9a, 0x70, 0xc7, 0x00, 0xd4, 0xd9, 0x97, 0x8c, 0xc0, 0x9f, 0x2d, 0xe8, 0x49, 0x49, 0x07, - 0x34, 0x23, 0xfc, 0xce, 0xfe, 0xff, 0x08, 0xda, 0x84, 0x66, 0x3c, 0xa0, 0x77, 0xe9, 0x90, 0x3a, - 0xeb, 0x92, 0x4d, 0xf2, 0x0a, 0x1e, 0xc8, 0x77, 0x20, 0xad, 0xe3, 0x88, 0x89, 0x35, 0x08, 0xe5, - 0x98, 0x29, 0xef, 0x45, 0x05, 0x69, 0xbe, 0xf0, 0xa9, 0xbf, 0x6e, 0xaa, 0x17, 0xbe, 0x27, 0x00, - 0x41, 0x18, 0x7e, 0xcc, 0x78, 0x18, 0xd1, 0xe2, 0xf8, 0xd0, 0x10, 0xef, 0x23, 0xe8, 0x88, 0x99, - 0xf9, 0x5c, 0x7b, 0xd1, 0xb9, 0xf5, 0xcd, 0x49, 0x7f, 0x0d, 0xb2, 0xcd, 0xd7, 0x20, 0x2f, 0x80, - 0xcd, 0x39, 0xc3, 0x77, 0xc2, 0x50, 0x95, 0xde, 0x9e, 0x7c, 0xad, 0x2a, 0x34, 0xa9, 0x0c, 0x2c, - 0xba, 0x4a, 0xea, 0x06, 0xf9, 0x06, 0x93, 0xf7, 0x0b, 0x0b, 0xde, 0x9f, 0xd7, 0x91, 0x24, 0x9c, - 0x5d, 0xdf, 0xa3, 0x1a, 0xb3, 0xbf, 0xda, 0xf5, 0xfe, 0xba, 0xd0, 0x08, 0xe3, 0x4c, 0xf8, 0x1c, - 0x8c, 0xf8, 0x83, 0x05, 0x3d, 0x65, 0x44, 0x19, 0xe2, 0x6f, 0x43, 0x53, 0xbe, 0x74, 0x2b, 0x85, - 0xef, 0x2f, 0x54, 0x58, 0xbc, 0xd0, 0xfb, 0x6a, 0xf1, 0x7c, 0x59, 0xda, 0x8b, 0x66, 0xc1, 0xef, - 0x96, 0x6d, 0x60, 0xe9, 0xb7, 0x68, 0xc5, 0xe0, 0xfd, 0xb4, 0xa8, 0xe8, 0x7d, 0x12, 0x93, 0xfb, - 0x8c, 0x91, 0xf7, 0x12, 0xd6, 0xf1, 0xd9, 0xfd, 0x9e, 0xcb, 0xec, 0x63, 0xd8, 0x40, 0xb1, 0xf7, - 0x6e, 0xef, 0xcf, 0xe0, 0x0b, 0x55, 0x02, 0xf6, 0x2e, 0x03, 0x3a, 0xb9, 0x4f, 0xe9, 0xdf, 0x80, - 0x87, 0x43, 0x12, 0x8f, 0x85, 0xec, 0x97, 0x49, 0x58, 0xde, 0x53, 0x6e, 0x78, 0xef, 0xba, 0x68, - 0xe2, 0xdf, 0xc6, 0xdf, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x9a, 0xab, 0x73, 0x49, + 0xad, 0x28, 0xda, 0x41, 0xe2, 0xe6, 0xf7, 0xeb, 0x7a, 0xff, 0x5f, 0xbd, 0x7a, 0x55, 0x86, 0x7e, + 0x1a, 0x5e, 0xbd, 0x7a, 0x9d, 0x7e, 0xf3, 0x75, 0xba, 0x95, 0x70, 0x96, 0x31, 0xf7, 0x41, 0x4a, + 0xf8, 0x35, 0xe1, 0xaf, 0x82, 0x24, 0x7a, 0x95, 0x04, 0x3c, 0x98, 0xa6, 0xde, 0xbf, 0x6c, 0x68, + 0x1f, 0x72, 0x96, 0x27, 0x2f, 0xe8, 0x98, 0xb9, 0x03, 0x58, 0x9d, 0x20, 0xb1, 0x37, 0xb0, 0x36, + 0xac, 0xcd, 0xb6, 0x5f, 0x90, 0xee, 0x13, 0x68, 0xe3, 0xcf, 0xe3, 0x60, 0x4a, 0x06, 0x36, 0x7e, + 0xab, 0x00, 0xd7, 0x83, 0x2e, 0x65, 0x59, 0x34, 0x8e, 0x46, 0x41, 0x16, 0x31, 0x3a, 0x70, 0x70, + 0x81, 0x81, 0x89, 0x35, 0x11, 0xcd, 0x38, 0x0b, 0xf3, 0x11, 0xae, 0x59, 0x91, 0x6b, 0x74, 0x4c, + 0xe8, 0x1f, 0x07, 0x23, 0xf2, 0xd2, 0x3f, 0x1a, 0x34, 0xa4, 0x7e, 0x45, 0xba, 0x1b, 0xd0, 0x61, + 0xaf, 0x29, 0xe1, 0x2f, 0x53, 0xc2, 0x5f, 0xec, 0x0d, 0x9a, 0xf8, 0x55, 0x87, 0xdc, 0xa7, 0x00, + 0x23, 0x4e, 0x82, 0x8c, 0x9c, 0x47, 0x53, 0x32, 0x58, 0xdd, 0xb0, 0x36, 0x7b, 0xbe, 0x86, 0x08, + 0x09, 0x53, 0x32, 0xbd, 0x20, 0x7c, 0x97, 0xe5, 0x34, 0x1b, 0xb4, 0x70, 0x81, 0x0e, 0xb9, 0x6b, + 0x60, 0x93, 0x37, 0x83, 0x36, 0x8a, 0xb6, 0xc9, 0x1b, 0xf7, 0x11, 0x34, 0xd3, 0x2c, 0xc8, 0xf2, + 0x74, 0x00, 0x1b, 0xd6, 0x66, 0xc3, 0x57, 0x94, 0xfb, 0x01, 0xf4, 0x50, 0x2e, 0x2b, 0xac, 0xe9, + 0x20, 0x8b, 0x09, 0x96, 0x11, 0x3b, 0x7f, 0x9b, 0x90, 0x41, 0x17, 0x05, 0x54, 0x80, 0xf7, 0x17, + 0x1b, 0x1e, 0x62, 0xdc, 0x87, 0x68, 0xc0, 0x41, 0x1e, 0xc7, 0x9f, 0x91, 0x81, 0x47, 0xd0, 0xcc, + 0xa5, 0x3a, 0x19, 0x7e, 0x45, 0x09, 0x3d, 0x9c, 0xc5, 0xe4, 0x88, 0x5c, 0x93, 0x18, 0x03, 0xdf, + 0xf0, 0x2b, 0xc0, 0x7d, 0x0c, 0xad, 0x4f, 0x58, 0x44, 0x31, 0x26, 0x22, 0xe2, 0x8e, 0x5f, 0xd2, + 0xe2, 0x1b, 0x8d, 0x46, 0x57, 0x54, 0xa4, 0x54, 0x86, 0xbb, 0xa4, 0xf5, 0x4c, 0x34, 0xcd, 0x4c, + 0x7c, 0x08, 0x6b, 0x41, 0x92, 0x0c, 0x03, 0x3a, 0x21, 0x5c, 0x2a, 0x5d, 0x45, 0xa5, 0x35, 0x54, + 0xe4, 0x43, 0x68, 0x3a, 0x63, 0x39, 0x1f, 0x11, 0x0c, 0x77, 0xc3, 0xd7, 0x10, 0x21, 0x87, 0x25, + 0x84, 0x6b, 0x61, 0x94, 0x91, 0xaf, 0xa1, 0x2a, 0x2b, 0x50, 0x64, 0xc5, 0xfb, 0xad, 0x05, 0x6b, + 0xa7, 0xf9, 0x45, 0x1c, 0x8d, 0x70, 0x81, 0x08, 0x5a, 0x15, 0x1a, 0xcb, 0x08, 0x8d, 0xee, 0xa0, + 0x7d, 0xb3, 0x83, 0x8e, 0xe9, 0xe0, 0x23, 0x68, 0x4e, 0x08, 0x0d, 0x09, 0xc7, 0x80, 0x35, 0x7c, + 0x45, 0x2d, 0x70, 0xbc, 0xb1, 0xc8, 0x71, 0xef, 0x37, 0x36, 0xb4, 0x3e, 0x67, 0xd3, 0x36, 0xa0, + 0x93, 0x5c, 0x32, 0x4a, 0x8e, 0x73, 0x51, 0x4c, 0x2a, 0x99, 0x3a, 0xe4, 0xbe, 0x07, 0x8d, 0x8b, + 0x88, 0x67, 0x97, 0x98, 0xcd, 0x9e, 0x2f, 0x09, 0x81, 0x92, 0x69, 0x10, 0xc9, 0x14, 0xb6, 0x7d, + 0x49, 0xa8, 0x88, 0xb7, 0xca, 0x7d, 0x60, 0xee, 0xac, 0xf6, 0xdc, 0xce, 0x9a, 0x0f, 0x0c, 0x2c, + 0x0c, 0xcc, 0xbf, 0x2d, 0x80, 0x03, 0x1e, 0x11, 0x1a, 0x62, 0x68, 0x6a, 0x5b, 0xda, 0x9a, 0xdf, + 0xd2, 0x8f, 0xa0, 0xc9, 0xc9, 0x34, 0xe0, 0x57, 0x45, 0xc9, 0x4b, 0xaa, 0x66, 0x90, 0x33, 0x67, + 0xd0, 0xf7, 0x00, 0xc6, 0xa8, 0x47, 0xc8, 0xc1, 0x50, 0x75, 0x9e, 0x7d, 0x79, 0x6b, 0xae, 0xf9, + 0x6d, 0x15, 0x59, 0xf2, 0xb5, 0xe5, 0x62, 0x3f, 0x05, 0x61, 0xa8, 0xca, 0x56, 0x66, 0xb8, 0x02, + 0x16, 0x54, 0x6d, 0xf3, 0x96, 0xaa, 0x5d, 0x2d, 0xab, 0xf6, 0x9f, 0x16, 0xb4, 0x77, 0xe2, 0x60, + 0x74, 0xb5, 0xa4, 0xeb, 0xa6, 0x8b, 0xf6, 0x9c, 0x8b, 0x87, 0xd0, 0xbb, 0x10, 0xe2, 0x0a, 0x17, + 0x30, 0x0a, 0x9d, 0x67, 0x5f, 0x5d, 0xe0, 0xa5, 0xb9, 0x59, 0x7c, 0x93, 0xcf, 0x74, 0x77, 0xe5, + 0xb3, 0xdd, 0x6d, 0xdc, 0xe2, 0x6e, 0xb3, 0x74, 0xf7, 0xef, 0x36, 0x74, 0xb1, 0xbd, 0xf9, 0x64, + 0x96, 0x93, 0x34, 0x73, 0xbf, 0x0f, 0xad, 0xbc, 0x30, 0xd5, 0x5a, 0xd6, 0xd4, 0x92, 0xc5, 0x7d, + 0xae, 0x9a, 0x29, 0xf2, 0xdb, 0xc8, 0xff, 0x64, 0x01, 0x7f, 0x79, 0x92, 0xf9, 0xd5, 0x72, 0x71, + 0xf0, 0x5c, 0x06, 0x34, 0x8c, 0x89, 0x4f, 0xd2, 0x3c, 0xce, 0x8a, 0xc3, 0x49, 0xc7, 0x64, 0xa5, + 0xcd, 0x86, 0xe9, 0x44, 0x1d, 0x4b, 0x8a, 0x12, 0xd1, 0x91, 0xeb, 0xc4, 0x27, 0xe9, 0x7a, 0x05, + 0x88, 0x8d, 0xca, 0xc9, 0x0c, 0x33, 0x24, 0xb7, 0x55, 0x41, 0x56, 0x3a, 0x55, 0xd4, 0x56, 0x75, + 0x9d, 0x55, 0x8a, 0x25, 0x8d, 0x02, 0xe4, 0x79, 0xa4, 0x21, 0xf5, 0xe3, 0xc8, 0xfb, 0x87, 0x03, + 0x3d, 0xb9, 0x7d, 0x8a, 0xa0, 0x3e, 0x15, 0x75, 0xce, 0xa6, 0x46, 0x15, 0x69, 0x88, 0xb0, 0x42, + 0x50, 0xc7, 0x66, 0xa3, 0x31, 0x30, 0x51, 0x8a, 0x82, 0x3e, 0x30, 0x1a, 0x8e, 0x0e, 0x15, 0x5a, + 0x0e, 0xf5, 0xc6, 0xa3, 0x21, 0xa2, 0x95, 0x65, 0xcc, 0xa8, 0x8e, 0x92, 0x16, 0xbc, 0x19, 0x2b, + 0xf5, 0xcb, 0xfa, 0xd0, 0x10, 0x11, 0xdf, 0x8c, 0x15, 0xba, 0x65, 0x90, 0x2a, 0x40, 0x4a, 0x56, + 0x7a, 0xe5, 0x01, 0x52, 0xd2, 0x73, 0x59, 0x6d, 0xe3, 0xf7, 0x9b, 0xb2, 0x0a, 0x46, 0x56, 0xcd, + 0xcd, 0xd5, 0x99, 0xdb, 0x5c, 0x1f, 0x40, 0x4f, 0xca, 0x29, 0x8a, 0xbe, 0x2b, 0x0f, 0x78, 0x03, + 0x34, 0x6b, 0xa3, 0x57, 0xaf, 0x0d, 0x33, 0xbb, 0x6b, 0x37, 0x64, 0xb7, 0x5f, 0x66, 0xf7, 0x57, + 0x36, 0x0c, 0x4e, 0xf3, 0x38, 0x1e, 0x92, 0x34, 0x0d, 0x26, 0x64, 0xe7, 0xed, 0x19, 0x99, 0x1d, + 0x45, 0x69, 0xe6, 0x93, 0x34, 0x11, 0x85, 0x46, 0x38, 0xdf, 0x65, 0x21, 0xc1, 0x2c, 0x37, 0xfc, + 0x82, 0x14, 0x2e, 0x12, 0xce, 0x85, 0x05, 0xaa, 0x45, 0x4a, 0x4a, 0xe0, 0xd3, 0xe0, 0xcd, 0x19, + 0x99, 0x61, 0x46, 0x1d, 0x5f, 0x51, 0x88, 0x47, 0x54, 0xe0, 0x2b, 0x0a, 0x47, 0xca, 0xdd, 0x87, + 0x5e, 0x1a, 0xd1, 0x89, 0x2c, 0x4e, 0x59, 0xec, 0xce, 0x66, 0xe7, 0xd9, 0x57, 0x16, 0x6d, 0xb2, + 0x20, 0xbb, 0x24, 0xfc, 0x80, 0xf1, 0x69, 0x90, 0xf9, 0x26, 0x97, 0xbb, 0x0b, 0x5d, 0xdc, 0x78, + 0x85, 0x94, 0xe6, 0x72, 0x52, 0x0c, 0x26, 0x6f, 0x0a, 0x5f, 0x5c, 0x1c, 0x89, 0xd9, 0x8d, 0xc7, + 0xa9, 0x68, 0xa8, 0xd8, 0x91, 0x22, 0x46, 0xcb, 0x09, 0x49, 0x87, 0x44, 0x08, 0x53, 0x29, 0x67, + 0xe0, 0x6c, 0x38, 0x9b, 0x8e, 0x5f, 0x90, 0xde, 0xcf, 0xc5, 0x3c, 0x51, 0xaa, 0xbb, 0x4d, 0xcb, + 0x63, 0x68, 0xa5, 0x64, 0xb6, 0x43, 0x26, 0x11, 0x45, 0x15, 0x8e, 0x5f, 0xd2, 0x38, 0x2c, 0x92, + 0xd9, 0x3e, 0x0d, 0x8b, 0x80, 0x4b, 0xaa, 0x6e, 0xd9, 0xca, 0x9c, 0x65, 0xde, 0xa7, 0x16, 0xf4, + 0x0d, 0x03, 0xfe, 0xef, 0x12, 0xfe, 0x1e, 0xb8, 0x87, 0x24, 0x1b, 0x06, 0x6f, 0xb6, 0x69, 0x38, + 0x44, 0xf3, 0x7c, 0x32, 0xf3, 0xf6, 0xe1, 0xe1, 0x1c, 0x9a, 0x26, 0x9a, 0xa3, 0xd6, 0x0d, 0x8e, + 0xda, 0xba, 0xa3, 0xde, 0x31, 0x74, 0x75, 0xd5, 0x62, 0xe3, 0x45, 0xa1, 0x4a, 0xac, 0x1d, 0x85, + 0xee, 0x16, 0xac, 0xc4, 0xa2, 0x2a, 0x6c, 0xb4, 0xfc, 0xf1, 0x02, 0xcb, 0x87, 0xe9, 0x64, 0x2f, + 0xc8, 0x02, 0x1f, 0xd7, 0x79, 0x33, 0xe8, 0x0b, 0xbb, 0xcf, 0x08, 0x0d, 0x87, 0xe9, 0x04, 0x4d, + 0xda, 0x80, 0x8e, 0xe4, 0x1a, 0xa6, 0x93, 0xea, 0x38, 0xd7, 0x20, 0xb1, 0x62, 0x14, 0x47, 0x84, + 0x66, 0x72, 0x85, 0xaa, 0x4f, 0x0d, 0x92, 0xb5, 0x45, 0xc3, 0x72, 0xa2, 0xc1, 0xda, 0x92, 0xb4, + 0xf7, 0xd7, 0x06, 0xac, 0x2a, 0x23, 0x64, 0x9d, 0xd1, 0xb0, 0xaa, 0x4d, 0x49, 0xc9, 0x5e, 0x37, + 0xba, 0xae, 0xae, 0x07, 0x92, 0xd2, 0x2f, 0x14, 0x8e, 0x79, 0xa1, 0xa8, 0xd9, 0xb4, 0x32, 0x6f, + 0x53, 0xcd, 0xaf, 0xc6, 0xbc, 0x5f, 0x5f, 0x87, 0xf5, 0x14, 0xfb, 0xf1, 0x69, 0x1c, 0x64, 0x63, + 0xc6, 0xa7, 0x6a, 0x20, 0x6a, 0xf8, 0x73, 0xb8, 0x98, 0x25, 0x24, 0x56, 0x9e, 0x07, 0xb2, 0xe1, + 0xd7, 0x50, 0xd1, 0x7d, 0x25, 0x52, 0x9c, 0x0b, 0x72, 0x12, 0x35, 0x41, 0x69, 0x5b, 0x9a, 0x46, + 0x8c, 0xe2, 0x05, 0x4b, 0xb6, 0x7f, 0x1d, 0x12, 0x9e, 0x4f, 0xd3, 0xc9, 0x01, 0x67, 0x53, 0x35, + 0x8f, 0x16, 0x24, 0x7a, 0xce, 0x68, 0x46, 0x68, 0x86, 0xbc, 0x1d, 0xc9, 0xab, 0x41, 0x82, 0x57, + 0x91, 0xd8, 0xfb, 0xbb, 0x7e, 0x41, 0x8a, 0xae, 0x3f, 0x66, 0x7c, 0x44, 0xb0, 0x93, 0xf4, 0x36, + 0x1c, 0xd1, 0xf5, 0x4b, 0xc0, 0x5d, 0x07, 0x27, 0x25, 0x33, 0x6c, 0xf7, 0x8e, 0x2f, 0x7e, 0x1a, + 0x79, 0xed, 0x9b, 0x79, 0xad, 0x9d, 0x43, 0xeb, 0xf8, 0x55, 0x3f, 0x87, 0xb6, 0x61, 0x95, 0x25, + 0xa2, 0x4b, 0xa4, 0x83, 0x07, 0x58, 0x9d, 0x5f, 0xbb, 0xb9, 0x3a, 0xb7, 0x4e, 0xe4, 0xca, 0x7d, + 0x9a, 0xf1, 0xb7, 0x7e, 0xc1, 0xe7, 0x1e, 0x41, 0x9f, 0x8d, 0xc7, 0x71, 0x44, 0xc9, 0x69, 0x9e, + 0x5e, 0xe2, 0xf8, 0xe4, 0xe2, 0xf8, 0xe4, 0x2d, 0x10, 0x75, 0x62, 0xae, 0xf4, 0xeb, 0xac, 0x8f, + 0x9f, 0x43, 0x57, 0x57, 0x23, 0xdc, 0xbd, 0x22, 0x6f, 0x55, 0x25, 0x8a, 0x9f, 0xe2, 0x46, 0x71, + 0x1d, 0xc4, 0xb9, 0x9c, 0x35, 0x5a, 0xbe, 0x24, 0x9e, 0xdb, 0xdf, 0xb1, 0xbc, 0x5f, 0x5b, 0xd0, + 0xaf, 0x29, 0x10, 0xab, 0xb3, 0x28, 0x8b, 0x89, 0x92, 0x20, 0x09, 0xd7, 0x85, 0x95, 0x90, 0xa4, + 0x23, 0x55, 0xc8, 0xf8, 0x5b, 0x1d, 0x97, 0x4e, 0x79, 0x27, 0xf1, 0xa0, 0x1b, 0x9d, 0x9c, 0x09, + 0x41, 0x67, 0x2c, 0xa7, 0x61, 0xf9, 0x9a, 0xa0, 0x61, 0xa2, 0x90, 0xa2, 0x93, 0xb3, 0x9d, 0x20, + 0x9c, 0x10, 0x79, 0xe7, 0x6f, 0xa0, 0x4d, 0x26, 0xe8, 0xed, 0x41, 0xeb, 0x3c, 0x4a, 0xd2, 0x5d, + 0x36, 0x9d, 0x8a, 0x4d, 0x14, 0x92, 0x4c, 0x5c, 0x88, 0x2c, 0xcc, 0xba, 0xa2, 0x44, 0xc1, 0x84, + 0x64, 0x1c, 0xe4, 0x71, 0x26, 0x96, 0x16, 0xdb, 0x57, 0x83, 0xbc, 0xbf, 0xd9, 0xb0, 0x8e, 0xd3, + 0xe7, 0x2e, 0xa6, 0x2f, 0x14, 0xa0, 0xfb, 0x0c, 0x1a, 0xb8, 0xd9, 0xd4, 0xc4, 0x7b, 0xfb, 0xc4, + 0x2a, 0x97, 0xba, 0x3f, 0x80, 0x26, 0xc3, 0xc6, 0xa8, 0xc6, 0xdc, 0x0f, 0x6f, 0x62, 0x32, 0x1f, + 0x0e, 0x7c, 0xc5, 0xe5, 0x1e, 0x00, 0xc8, 0x37, 0x8d, 0xf2, 0xa8, 0x5b, 0x5e, 0x86, 0xc6, 0x29, + 0x82, 0x57, 0x1e, 0x52, 0xda, 0xeb, 0x81, 0x09, 0xba, 0xc7, 0xb0, 0x86, 0x66, 0x9f, 0x14, 0x57, + 0x17, 0x8c, 0xf1, 0xf2, 0x1a, 0x6b, 0xdc, 0xde, 0xef, 0x2c, 0x15, 0x46, 0xf1, 0xf5, 0x8c, 0x60, + 0x6c, 0xb5, 0x90, 0x58, 0x77, 0x0a, 0xc9, 0x63, 0x68, 0x4d, 0x73, 0xed, 0x26, 0xe5, 0xf8, 0x25, + 0x5d, 0xa5, 0xc8, 0x59, 0x3a, 0x45, 0xde, 0xef, 0x2d, 0x18, 0x7c, 0xc4, 0x22, 0x8a, 0x1f, 0xb6, + 0x93, 0x24, 0x56, 0x4f, 0x5c, 0x77, 0xce, 0xf9, 0x0f, 0xa1, 0x1d, 0x48, 0x31, 0x34, 0x53, 0x69, + 0x5f, 0xe2, 0x76, 0x54, 0xf1, 0x68, 0x83, 0xae, 0xa3, 0x0f, 0xba, 0xde, 0x1f, 0x2d, 0x58, 0x93, + 0x41, 0xf9, 0x49, 0x1e, 0x65, 0x77, 0xb6, 0x6f, 0x07, 0x5a, 0xb3, 0x3c, 0xca, 0xee, 0x50, 0x95, + 0x25, 0xdf, 0x7c, 0x3d, 0x39, 0x0b, 0xea, 0xc9, 0xfb, 0x93, 0x05, 0x4f, 0xea, 0x61, 0xdd, 0x1e, + 0x8d, 0x48, 0xf2, 0x2e, 0xb7, 0x94, 0x31, 0xe8, 0xaf, 0xd4, 0x06, 0xfd, 0x85, 0x26, 0xfb, 0xe4, + 0x13, 0x32, 0xfa, 0xdf, 0x35, 0xf9, 0x97, 0x36, 0x7c, 0xe9, 0xb0, 0xdc, 0x78, 0xe7, 0x3c, 0xa0, + 0xe9, 0x98, 0x70, 0xfe, 0x0e, 0xed, 0x3d, 0x82, 0x1e, 0x25, 0xaf, 0x2b, 0x9b, 0xd4, 0x76, 0x5c, + 0x56, 0x8c, 0xc9, 0xbc, 0x5c, 0xef, 0xf2, 0xfe, 0x63, 0xc1, 0xba, 0x94, 0xf3, 0xe3, 0x68, 0x74, + 0xf5, 0x0e, 0x9d, 0x3f, 0x86, 0xb5, 0x2b, 0xb4, 0x40, 0x50, 0x77, 0x68, 0xdb, 0x35, 0xee, 0x25, + 0xdd, 0xff, 0xd4, 0x82, 0x07, 0x52, 0xd0, 0x0b, 0x7a, 0x1d, 0xbd, 0xcb, 0x62, 0x3d, 0x85, 0x7e, + 0x24, 0x4d, 0xb8, 0x63, 0x00, 0xea, 0xec, 0x4b, 0x46, 0xe0, 0xcf, 0x16, 0xf4, 0xa5, 0xa4, 0x7d, + 0x9a, 0x11, 0x7e, 0x67, 0xff, 0x7f, 0x04, 0x1d, 0x42, 0x33, 0x1e, 0xd0, 0xbb, 0x74, 0x48, 0x9d, + 0x75, 0xc9, 0x26, 0x79, 0x05, 0x0f, 0xe4, 0x3b, 0x90, 0xd6, 0x71, 0xc4, 0xc4, 0x1a, 0x84, 0x72, + 0xcc, 0x94, 0xf7, 0xa2, 0x82, 0x34, 0x5f, 0xf8, 0xd4, 0x5f, 0x37, 0xd5, 0x0b, 0xdf, 0x53, 0x80, + 0x20, 0x0c, 0x3f, 0x66, 0x3c, 0x8c, 0x68, 0x71, 0x7c, 0x68, 0x88, 0xf7, 0x11, 0x74, 0xc5, 0xcc, + 0x7c, 0xae, 0xbd, 0xe8, 0xdc, 0xfa, 0xe6, 0xa4, 0xbf, 0x06, 0xd9, 0xe6, 0x6b, 0x90, 0xf7, 0x33, + 0xf8, 0xc2, 0x9c, 0xe1, 0x18, 0xf5, 0x5d, 0xf9, 0x50, 0x55, 0x28, 0x51, 0xc1, 0x5f, 0x74, 0x8b, + 0xd4, 0x6d, 0xf1, 0x0d, 0x26, 0xef, 0x17, 0x16, 0xbc, 0x3f, 0x27, 0x7e, 0x3b, 0x49, 0x38, 0xbb, + 0x56, 0xc5, 0x7d, 0x1f, 0x6a, 0xcc, 0xd6, 0x6a, 0xd7, 0x5b, 0xeb, 0x42, 0x23, 0x8c, 0xe3, 0xe0, + 0x73, 0x30, 0xe2, 0x0f, 0x16, 0xf4, 0x95, 0x11, 0x61, 0xa8, 0xd4, 0x7e, 0x1b, 0x9a, 0xf2, 0x91, + 0x5b, 0x29, 0x7c, 0x7f, 0xa1, 0xc2, 0xe2, 0x71, 0xde, 0x57, 0x8b, 0xe7, 0x2b, 0xd2, 0x5e, 0x34, + 0x06, 0x7e, 0xb7, 0xec, 0x00, 0x4b, 0x3f, 0x43, 0x2b, 0x06, 0xef, 0xa7, 0x45, 0x31, 0xef, 0x91, + 0x98, 0xdc, 0x67, 0x8c, 0xbc, 0x97, 0xb0, 0x86, 0x2f, 0xee, 0x55, 0x0c, 0xee, 0x45, 0xec, 0xc7, + 0xb0, 0x8e, 0x62, 0xef, 0xdd, 0xde, 0x72, 0x77, 0x88, 0xf8, 0xec, 0x5e, 0x06, 0x74, 0x72, 0x9f, + 0xd2, 0xbf, 0x01, 0x0f, 0x8b, 0xd8, 0xbf, 0x4c, 0xc2, 0xf2, 0x8a, 0x72, 0xc3, 0x53, 0xd7, 0x45, + 0x13, 0xff, 0x31, 0xfe, 0xd6, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x10, 0x4c, 0x40, 0x71, 0x44, 0x1e, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index ac8f8601f..2f51bda22 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -333,7 +333,7 @@ message FromToUserID{ } //FromUserID apply to add ToUserID -message FriendApplicationAddedTips{ +message FriendApplicationTips{ FromToUserID fromToUserID = 1; } @@ -377,6 +377,6 @@ message FriendInfoChangedTips{ FromToUserID fromToUserID = 1; } //////////////////////user///////////////////// -message SelfInfoUpdatedTips{ +message UserInfoUpdatedTips{ string userID = 1; }