diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 07b4d5479..7f8fd7db2 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -51,20 +51,20 @@ func main() { //group related routing group groupRouterGroup := r.Group("/group") { - groupRouterGroup.POST("/create_group", group.CreateGroup) //1 - groupRouterGroup.POST("/set_group_info", group.SetGroupInfo) //1 - groupRouterGroup.POST("join_group", group.JoinGroup) //1 - groupRouterGroup.POST("/quit_group", group.QuitGroup) //1 - groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1 - groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) //1 - groupRouterGroup.POST("/get_group_applicationList", group.GetGroupApplicationList) //1 - groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1 - groupRouterGroup.POST("/kick_group", group.KickGroupMember) //1 - groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList) //no use - groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1 - groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo) //1 - groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1 - groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList) //1 + groupRouterGroup.POST("/create_group", group.CreateGroup) //1 + groupRouterGroup.POST("/set_group_info", group.SetGroupInfo) //1 + groupRouterGroup.POST("join_group", group.JoinGroup) //1 + groupRouterGroup.POST("/quit_group", group.QuitGroup) //1 + groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1 + groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) //1 + groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1 + groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1 + groupRouterGroup.POST("/kick_group", group.KickGroupMember) //1 + groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList) //no use + groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1 + groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo) //1 + groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1 + groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList) //1 } //certificate authRouterGroup := r.Group("/auth") diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 5d2d8405f..c7b725a9e 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -281,7 +281,7 @@ func CreateGroup(c *gin.Context) { } // 群主或管理员收到的 -func GetGroupApplicationList(c *gin.Context) { +func GetRecvGroupApplicationList(c *gin.Context) { params := api.GetGroupApplicationListReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index ba715bf68..f09b9acd7 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -60,10 +60,10 @@ func newUserSendMsgReq(params *ManagementSendMsgReq) *pbChat.SendMsgReq { MsgFrom: constant.SysMsgType, ContentType: params.ContentType, Content: []byte(newContent), - ForceList: params.ForceList, - CreateTime: utils.GetCurrentTimestampByMill(), - Options: options, - OfflinePushInfo: params.OfflinePushInfo, + // ForceList: params.ForceList, + CreateTime: utils.GetCurrentTimestampByMill(), + Options: options, + OfflinePushInfo: params.OfflinePushInfo, }, } return &pbData diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 5dc1cae3b..5c6263e74 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_551a30e7c7c24c98, []int{0} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{1} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{2} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{3} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{4} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{5} + return fileDescriptor_ws_44bd6efa690189ed, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -601,7 +601,7 @@ func (m *BlackInfo) GetEx() string { type GroupRequest struct { UserInfo *PublicUserInfo `protobuf:"bytes,1,opt,name=userInfo" json:"userInfo,omitempty"` GroupInfo *GroupInfo `protobuf:"bytes,2,opt,name=groupInfo" json:"groupInfo,omitempty"` - HandleResult string `protobuf:"bytes,3,opt,name=handleResult" json:"handleResult,omitempty"` + HandleResult int32 `protobuf:"varint,3,opt,name=handleResult" json:"handleResult,omitempty"` ReqMsg string `protobuf:"bytes,4,opt,name=reqMsg" json:"reqMsg,omitempty"` HandleMsg string `protobuf:"bytes,5,opt,name=handleMsg" json:"handleMsg,omitempty"` ReqTime uint32 `protobuf:"varint,6,opt,name=reqTime" json:"reqTime,omitempty"` @@ -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_551a30e7c7c24c98, []int{6} + return fileDescriptor_ws_44bd6efa690189ed, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -651,11 +651,11 @@ func (m *GroupRequest) GetGroupInfo() *GroupInfo { return nil } -func (m *GroupRequest) GetHandleResult() string { +func (m *GroupRequest) GetHandleResult() int32 { if m != nil { return m.HandleResult } - return "" + return 0 } func (m *GroupRequest) GetReqMsg() string { @@ -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_551a30e7c7c24c98, []int{7} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{8} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{9} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{10} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{11} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{12} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{13} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{14} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{15} + return fileDescriptor_ws_44bd6efa690189ed, []int{15} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1313,12 +1313,12 @@ type MsgData struct { MsgFrom int32 `protobuf:"varint,10,opt,name=msgFrom" json:"msgFrom,omitempty"` ContentType int32 `protobuf:"varint,11,opt,name=contentType" json:"contentType,omitempty"` Content []byte `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"` - ForceList []string `protobuf:"bytes,13,rep,name=forceList" json:"forceList,omitempty"` Seq int64 `protobuf:"varint,14,opt,name=seq" json:"seq,omitempty"` SendTime int64 `protobuf:"varint,15,opt,name=sendTime" json:"sendTime,omitempty"` CreateTime int64 `protobuf:"varint,16,opt,name=createTime" json:"createTime,omitempty"` - Options map[string]bool `protobuf:"bytes,17,rep,name=options" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` - OfflinePushInfo *OfflinePushInfo `protobuf:"bytes,18,opt,name=offlinePushInfo" json:"offlinePushInfo,omitempty"` + Status int32 `protobuf:"varint,17,opt,name=status" json:"status,omitempty"` + Options map[string]bool `protobuf:"bytes,18,rep,name=options" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` + OfflinePushInfo *OfflinePushInfo `protobuf:"bytes,19,opt,name=offlinePushInfo" json:"offlinePushInfo,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -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_551a30e7c7c24c98, []int{16} + return fileDescriptor_ws_44bd6efa690189ed, []int{16} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1432,13 +1432,6 @@ func (m *MsgData) GetContent() []byte { return nil } -func (m *MsgData) GetForceList() []string { - if m != nil { - return m.ForceList - } - return nil -} - func (m *MsgData) GetSeq() int64 { if m != nil { return m.Seq @@ -1460,6 +1453,13 @@ func (m *MsgData) GetCreateTime() int64 { return 0 } +func (m *MsgData) GetStatus() int32 { + if m != nil { + return m.Status + } + return 0 +} + func (m *MsgData) GetOptions() map[string]bool { if m != nil { return m.Options @@ -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_551a30e7c7c24c98, []int{17} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{18} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{19} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{20} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{21} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{22} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{23} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{24} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{25} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{26} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{27} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{28} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{29} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{30} + return fileDescriptor_ws_44bd6efa690189ed, []int{30} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2293,7 +2293,7 @@ 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} + return fileDescriptor_ws_44bd6efa690189ed, []int{31} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -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_551a30e7c7c24c98, []int{32} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{33} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{34} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{35} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{36} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{37} + return fileDescriptor_ws_44bd6efa690189ed, []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_551a30e7c7c24c98, []int{38} + return fileDescriptor_ws_44bd6efa690189ed, []int{38} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2634,7 +2634,7 @@ 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} + return fileDescriptor_ws_44bd6efa690189ed, []int{39} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -2705,135 +2705,134 @@ func init() { proto.RegisterType((*UserInfoUpdatedTips)(nil), "server_api_params.UserInfoUpdatedTips") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_551a30e7c7c24c98) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_44bd6efa690189ed) } -var fileDescriptor_ws_551a30e7c7c24c98 = []byte{ - // 2019 bytes of a gzipped FileDescriptorProto +var fileDescriptor_ws_44bd6efa690189ed = []byte{ + // 2010 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, 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, 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, + 0x17, 0x0e, 0x70, 0xe1, 0x0b, 0xc0, 0x91, 0x03, 0x17, 0xc4, 0x05, 0x71, 0x41, 0x5c, 0x38, 0xf2, + 0x05, 0x38, 0xf3, 0x15, 0xb8, 0x72, 0x40, 0x42, 0x5a, 0x54, 0xaf, 0xaa, 0xbb, 0xab, 0xda, 0x4e, + 0xd6, 0x8a, 0xa2, 0x1d, 0x24, 0x6e, 0x7e, 0xbf, 0xae, 0xf7, 0xff, 0xd5, 0xab, 0x57, 0x65, 0xe8, + 0xa7, 0xe1, 0xd5, 0xab, 0xd7, 0xe9, 0x37, 0x5f, 0xa7, 0x5b, 0x09, 0x67, 0x19, 0x73, 0x1f, 0xa4, + 0x84, 0x5f, 0x13, 0xfe, 0x2a, 0x48, 0xa2, 0x57, 0x49, 0xc0, 0x83, 0x69, 0xea, 0xfd, 0xcb, 0x86, + 0xf6, 0x21, 0x67, 0x79, 0xf2, 0x82, 0x8e, 0x99, 0x3b, 0x80, 0xd5, 0x09, 0x12, 0x7b, 0x03, 0x6b, + 0xc3, 0xda, 0x6c, 0xfb, 0x05, 0xe9, 0x3e, 0x81, 0x36, 0xfe, 0x3c, 0x0e, 0xa6, 0x64, 0x60, 0xe3, + 0xb7, 0x0a, 0x70, 0x3d, 0xe8, 0x52, 0x96, 0x45, 0xe3, 0x68, 0x14, 0x64, 0x11, 0xa3, 0x03, 0x07, + 0x17, 0x18, 0x98, 0x58, 0x13, 0xd1, 0x8c, 0xb3, 0x30, 0x1f, 0xe1, 0x9a, 0x15, 0xb9, 0x46, 0xc7, + 0x84, 0xfe, 0x71, 0x30, 0x22, 0x2f, 0xfd, 0xa3, 0x41, 0x43, 0xea, 0x57, 0xa4, 0xbb, 0x01, 0x1d, + 0xf6, 0x9a, 0x12, 0xfe, 0x32, 0x25, 0xfc, 0xc5, 0xde, 0xa0, 0x89, 0x5f, 0x75, 0xc8, 0x7d, 0x0a, + 0x30, 0xe2, 0x24, 0xc8, 0xc8, 0x79, 0x34, 0x25, 0x83, 0xd5, 0x0d, 0x6b, 0xb3, 0xe7, 0x6b, 0x88, + 0x90, 0x30, 0x25, 0xd3, 0x0b, 0xc2, 0x77, 0x59, 0x4e, 0xb3, 0x41, 0x0b, 0x17, 0xe8, 0x90, 0xbb, + 0x06, 0x36, 0x79, 0x33, 0x68, 0xa3, 0x68, 0x9b, 0xbc, 0x71, 0x1f, 0x41, 0x33, 0xcd, 0x82, 0x2c, + 0x4f, 0x07, 0xb0, 0x61, 0x6d, 0x36, 0x7c, 0x45, 0xb9, 0x1f, 0x40, 0x0f, 0xe5, 0xb2, 0xc2, 0x9a, + 0x0e, 0xb2, 0x98, 0x60, 0x19, 0xb1, 0xf3, 0xb7, 0x09, 0x19, 0x74, 0x51, 0x40, 0x05, 0x78, 0x7f, + 0xb1, 0xe1, 0x21, 0xc6, 0x7d, 0x88, 0x06, 0x1c, 0xe4, 0x71, 0xfc, 0x19, 0x19, 0x78, 0x04, 0xcd, + 0x5c, 0xaa, 0x93, 0xe1, 0x57, 0x94, 0xd0, 0xc3, 0x59, 0x4c, 0x8e, 0xc8, 0x35, 0x89, 0x31, 0xf0, + 0x0d, 0xbf, 0x02, 0xdc, 0xc7, 0xd0, 0xfa, 0x84, 0x45, 0x14, 0x63, 0x22, 0x22, 0xee, 0xf8, 0x25, + 0x2d, 0xbe, 0xd1, 0x68, 0x74, 0x45, 0x45, 0x4a, 0x65, 0xb8, 0x4b, 0x5a, 0xcf, 0x44, 0xd3, 0xcc, + 0xc4, 0x87, 0xb0, 0x16, 0x24, 0xc9, 0x30, 0xa0, 0x13, 0xc2, 0xa5, 0xd2, 0x55, 0x54, 0x5a, 0x43, + 0x45, 0x3e, 0x84, 0xa6, 0x33, 0x96, 0xf3, 0x11, 0xc1, 0x70, 0x37, 0x7c, 0x0d, 0x11, 0x72, 0x58, + 0x42, 0xb8, 0x16, 0x46, 0x19, 0xf9, 0x1a, 0xaa, 0xb2, 0x02, 0x45, 0x56, 0xbc, 0xdf, 0x5a, 0xb0, + 0x76, 0x9a, 0x5f, 0xc4, 0xd1, 0x08, 0x17, 0x88, 0xa0, 0x55, 0xa1, 0xb1, 0x8c, 0xd0, 0xe8, 0x0e, + 0xda, 0x37, 0x3b, 0xe8, 0x98, 0x0e, 0x3e, 0x82, 0xe6, 0x84, 0xd0, 0x90, 0x70, 0x0c, 0x58, 0xc3, + 0x57, 0xd4, 0x02, 0xc7, 0x1b, 0x8b, 0x1c, 0xf7, 0x7e, 0x63, 0x43, 0xeb, 0x73, 0x36, 0x6d, 0x03, + 0x3a, 0xc9, 0x25, 0xa3, 0xe4, 0x38, 0x17, 0xc5, 0xa4, 0x92, 0xa9, 0x43, 0xee, 0x7b, 0xd0, 0xb8, + 0x88, 0x78, 0x76, 0x89, 0xd9, 0xec, 0xf9, 0x92, 0x10, 0x28, 0x99, 0x06, 0x91, 0x4c, 0x61, 0xdb, + 0x97, 0x84, 0x8a, 0x78, 0xab, 0xdc, 0x07, 0xe6, 0xce, 0x6a, 0xcf, 0xed, 0xac, 0xf9, 0xc0, 0xc0, + 0xc2, 0xc0, 0xfc, 0xdb, 0x02, 0x38, 0xe0, 0x11, 0xa1, 0x21, 0x86, 0xa6, 0xb6, 0xa5, 0xad, 0xf9, + 0x2d, 0xfd, 0x08, 0x9a, 0x9c, 0x4c, 0x03, 0x7e, 0x55, 0x94, 0xbc, 0xa4, 0x6a, 0x06, 0x39, 0x73, + 0x06, 0x7d, 0x0f, 0x60, 0x8c, 0x7a, 0x84, 0x1c, 0x0c, 0x55, 0xe7, 0xd9, 0x97, 0xb7, 0xe6, 0x9a, + 0xdf, 0x56, 0x91, 0x25, 0x5f, 0x5b, 0x2e, 0xf6, 0x53, 0x10, 0x86, 0xaa, 0x6c, 0x65, 0x86, 0x2b, + 0x60, 0x41, 0xd5, 0x36, 0x6f, 0xa9, 0xda, 0xd5, 0xb2, 0x6a, 0xff, 0x69, 0x41, 0x7b, 0x27, 0x0e, + 0x46, 0x57, 0x4b, 0xba, 0x6e, 0xba, 0x68, 0xcf, 0xb9, 0x78, 0x08, 0xbd, 0x0b, 0x21, 0xae, 0x70, + 0x01, 0xa3, 0xd0, 0x79, 0xf6, 0xd5, 0x05, 0x5e, 0x9a, 0x9b, 0xc5, 0x37, 0xf9, 0x4c, 0x77, 0x57, + 0x3e, 0xdb, 0xdd, 0xc6, 0x2d, 0xee, 0x36, 0x4b, 0x77, 0xff, 0x6e, 0x43, 0x17, 0xdb, 0x9b, 0x4f, + 0x66, 0x39, 0x49, 0x33, 0xf7, 0xfb, 0xd0, 0xca, 0x0b, 0x53, 0xad, 0x65, 0x4d, 0x2d, 0x59, 0xdc, + 0xe7, 0xaa, 0x99, 0x22, 0xbf, 0x8d, 0xfc, 0x4f, 0x16, 0xf0, 0x97, 0x27, 0x99, 0x5f, 0x2d, 0x17, + 0x07, 0xcf, 0x65, 0x40, 0xc3, 0x98, 0xf8, 0x24, 0xcd, 0xe3, 0x4c, 0xf5, 0x48, 0x03, 0x93, 0x95, + 0x36, 0x1b, 0xa6, 0x13, 0x75, 0x2c, 0x29, 0x4a, 0x44, 0x47, 0xae, 0x13, 0x9f, 0xa4, 0xeb, 0x15, + 0x20, 0x36, 0x2a, 0x27, 0x33, 0xcc, 0x90, 0xdc, 0x56, 0x05, 0x59, 0xe9, 0x54, 0x51, 0x93, 0x85, + 0x60, 0x60, 0x22, 0xc5, 0x92, 0x46, 0x01, 0xf2, 0x3c, 0xd2, 0x90, 0xfa, 0x71, 0xe4, 0xfd, 0xc3, + 0x81, 0x9e, 0xdc, 0x3e, 0x45, 0x50, 0x9f, 0x8a, 0x3a, 0x67, 0x53, 0xa3, 0x8a, 0x34, 0x44, 0x58, + 0x21, 0xa8, 0x63, 0xb3, 0xd1, 0x18, 0x98, 0x28, 0x45, 0x41, 0x1f, 0x18, 0x0d, 0x47, 0x87, 0x0a, + 0x2d, 0x87, 0x7a, 0xe3, 0xd1, 0x10, 0xd1, 0xca, 0x32, 0x66, 0x54, 0x47, 0x49, 0x0b, 0xde, 0x8c, + 0x95, 0xfa, 0x65, 0x7d, 0x68, 0x88, 0x88, 0x6f, 0xc6, 0x0a, 0xdd, 0x32, 0x48, 0x15, 0x20, 0x25, + 0x2b, 0xbd, 0xf2, 0x00, 0x29, 0xe9, 0xb9, 0xac, 0xb6, 0x6f, 0xcd, 0x2a, 0x18, 0x59, 0x35, 0x37, + 0x57, 0x67, 0x6e, 0x73, 0x7d, 0x00, 0x3d, 0x29, 0xa7, 0x28, 0xfa, 0xae, 0x3c, 0xe0, 0x0d, 0xd0, + 0xac, 0x8d, 0x5e, 0xbd, 0x36, 0xcc, 0xec, 0xae, 0xdd, 0x90, 0xdd, 0x7e, 0x99, 0xdd, 0x5f, 0xd9, + 0x30, 0x38, 0xcd, 0xe3, 0x78, 0x48, 0xd2, 0x34, 0x98, 0x90, 0x9d, 0xb7, 0x67, 0x64, 0x76, 0x14, + 0xa5, 0x99, 0x4f, 0xd2, 0x44, 0x14, 0x1a, 0xe1, 0x7c, 0x97, 0x85, 0x04, 0xb3, 0xdc, 0xf0, 0x0b, + 0x52, 0xb8, 0x48, 0x38, 0x17, 0x16, 0xa8, 0x16, 0x29, 0x29, 0x81, 0x4f, 0x83, 0x37, 0x67, 0x64, + 0x86, 0x19, 0x75, 0x7c, 0x45, 0x21, 0x1e, 0x51, 0x81, 0xaf, 0x28, 0x1c, 0x29, 0x77, 0x1f, 0x7a, + 0x69, 0x44, 0x27, 0xb2, 0x38, 0x65, 0xb1, 0x3b, 0x9b, 0x9d, 0x67, 0x5f, 0x59, 0xb4, 0xc9, 0x82, + 0xec, 0x92, 0xf0, 0x03, 0xc6, 0xa7, 0x41, 0xe6, 0x9b, 0x5c, 0xee, 0x2e, 0x74, 0x71, 0xe3, 0x15, + 0x52, 0x9a, 0xcb, 0x49, 0x31, 0x98, 0xbc, 0x29, 0x7c, 0x71, 0x71, 0x24, 0x66, 0x37, 0x1e, 0xa7, + 0xa2, 0xa1, 0x62, 0x47, 0x8a, 0x18, 0x2d, 0x27, 0x24, 0x1d, 0x12, 0x21, 0x4c, 0xa5, 0x9c, 0x81, + 0xb3, 0xe1, 0x6c, 0x3a, 0x7e, 0x41, 0x7a, 0x3f, 0x17, 0xf3, 0x44, 0xa9, 0xee, 0x36, 0x2d, 0x8f, + 0xa1, 0x95, 0x92, 0xd9, 0x0e, 0x99, 0x44, 0x14, 0x55, 0x38, 0x7e, 0x49, 0xe3, 0xb0, 0x48, 0x66, + 0xfb, 0x34, 0x2c, 0x02, 0x2e, 0xa9, 0xba, 0x65, 0x2b, 0x73, 0x96, 0x79, 0x9f, 0x5a, 0xd0, 0x37, + 0x0c, 0xf8, 0xbf, 0x4b, 0xf8, 0x7b, 0xe0, 0x1e, 0x92, 0x6c, 0x18, 0xbc, 0xd9, 0xa6, 0xe1, 0x10, + 0xcd, 0xf3, 0xc9, 0xcc, 0xdb, 0x87, 0x87, 0x73, 0x68, 0x9a, 0x68, 0x8e, 0x5a, 0x37, 0x38, 0x6a, + 0xeb, 0x8e, 0x7a, 0xc7, 0xd0, 0xd5, 0x55, 0x8b, 0x8d, 0x17, 0x85, 0x2a, 0xb1, 0x76, 0x14, 0xba, + 0x5b, 0xb0, 0x12, 0x8b, 0xaa, 0xb0, 0xd1, 0xf2, 0xc7, 0x0b, 0x2c, 0x1f, 0xa6, 0x93, 0xbd, 0x20, + 0x0b, 0x7c, 0x5c, 0xe7, 0xcd, 0xa0, 0x2f, 0xec, 0x3e, 0x23, 0x34, 0x1c, 0xa6, 0x13, 0x34, 0x69, + 0x03, 0x3a, 0x92, 0x6b, 0x98, 0x4e, 0xaa, 0xe3, 0x5c, 0x83, 0xc4, 0x8a, 0x51, 0x1c, 0x11, 0x9a, + 0xc9, 0x15, 0xaa, 0x3e, 0x35, 0x48, 0xd6, 0x16, 0x0d, 0xcb, 0x89, 0x06, 0x6b, 0x4b, 0xd2, 0xde, + 0x5f, 0x1b, 0xb0, 0xaa, 0x8c, 0x90, 0x75, 0x46, 0xc3, 0xaa, 0x36, 0x25, 0x25, 0x7b, 0xdd, 0xe8, + 0xba, 0xba, 0x1e, 0x48, 0x4a, 0xbf, 0x50, 0x38, 0xe6, 0x85, 0xa2, 0x66, 0xd3, 0xca, 0xbc, 0x4d, + 0x35, 0xbf, 0x1a, 0xf3, 0x7e, 0x7d, 0x1d, 0xd6, 0x53, 0xec, 0xc7, 0xa7, 0x71, 0x90, 0x8d, 0x19, + 0x9f, 0xaa, 0x81, 0xa8, 0xe1, 0xcf, 0xe1, 0x62, 0x96, 0x90, 0x58, 0x79, 0x1e, 0xc8, 0x86, 0x5f, + 0x43, 0x45, 0xf7, 0x95, 0x48, 0x71, 0x2e, 0xc8, 0x49, 0xd4, 0x04, 0xa5, 0x6d, 0x69, 0x1a, 0x31, + 0x8a, 0x17, 0x2c, 0xd9, 0xfe, 0x75, 0x48, 0x78, 0x3e, 0x4d, 0x27, 0x07, 0x9c, 0x4d, 0xd5, 0x3c, + 0x5a, 0x90, 0xe8, 0x39, 0xa3, 0x19, 0xa1, 0x19, 0xf2, 0x76, 0x24, 0xaf, 0x06, 0x09, 0x5e, 0x45, + 0x62, 0xef, 0xef, 0xfa, 0x05, 0xe9, 0xae, 0x83, 0x93, 0x92, 0x19, 0x36, 0x74, 0xc7, 0x17, 0x3f, + 0x8d, 0xcc, 0xf5, 0xcd, 0xcc, 0xd5, 0x4e, 0x9a, 0x75, 0xfc, 0xaa, 0x9f, 0x34, 0xd5, 0x15, 0xf3, + 0x81, 0x71, 0xc5, 0xdc, 0x86, 0x55, 0x96, 0x88, 0xfe, 0x90, 0x0e, 0x5c, 0xac, 0xcb, 0xaf, 0xdd, + 0x5c, 0x97, 0x5b, 0x27, 0x72, 0xe5, 0x3e, 0xcd, 0xf8, 0x5b, 0xbf, 0xe0, 0x73, 0x8f, 0xa0, 0xcf, + 0xc6, 0xe3, 0x38, 0xa2, 0xe4, 0x34, 0x4f, 0x2f, 0x71, 0x70, 0x7a, 0x88, 0x83, 0x93, 0xb7, 0x40, + 0xd4, 0x89, 0xb9, 0xd2, 0xaf, 0xb3, 0x3e, 0x7e, 0x0e, 0x5d, 0x5d, 0x8d, 0x08, 0xc3, 0x15, 0x79, + 0xab, 0x6a, 0x50, 0xfc, 0x14, 0x77, 0x89, 0xeb, 0x20, 0xce, 0xe5, 0x94, 0xd1, 0xf2, 0x25, 0xf1, + 0xdc, 0xfe, 0x8e, 0xe5, 0xfd, 0xda, 0x82, 0x7e, 0x4d, 0x81, 0x58, 0x9d, 0x45, 0x59, 0x4c, 0x94, + 0x04, 0x49, 0xb8, 0x2e, 0xac, 0x84, 0x24, 0x1d, 0xa9, 0x12, 0xc6, 0xdf, 0xea, 0xa0, 0x74, 0xca, + 0xdb, 0x88, 0x07, 0xdd, 0xe8, 0xe4, 0x4c, 0x08, 0x3a, 0x63, 0x39, 0x0d, 0xcb, 0x77, 0x04, 0x0d, + 0x13, 0x25, 0x14, 0x9d, 0x9c, 0xed, 0x04, 0xe1, 0x84, 0xc8, 0xdb, 0x7e, 0x03, 0x6d, 0x32, 0x41, + 0x6f, 0x0f, 0x5a, 0xe7, 0x51, 0x92, 0xee, 0xb2, 0xe9, 0x54, 0x24, 0x22, 0x24, 0x99, 0xb8, 0x0a, + 0x59, 0x98, 0x6f, 0x45, 0x89, 0x52, 0x09, 0xc9, 0x38, 0xc8, 0xe3, 0x4c, 0x2c, 0x2d, 0x36, 0xae, + 0x06, 0x79, 0x7f, 0xb3, 0x61, 0x1d, 0xe7, 0xce, 0x5d, 0x4c, 0x6b, 0x28, 0x40, 0xf7, 0x19, 0x34, + 0x70, 0x9b, 0xa9, 0x59, 0xf7, 0xf6, 0x59, 0x55, 0x2e, 0x75, 0x7f, 0x00, 0x4d, 0x86, 0x2d, 0x51, + 0x0d, 0xb8, 0x1f, 0xde, 0xc4, 0x64, 0x3e, 0x19, 0xf8, 0x8a, 0xcb, 0x3d, 0x00, 0x90, 0xaf, 0x19, + 0xe5, 0x21, 0xb7, 0xbc, 0x0c, 0x8d, 0x53, 0x04, 0xaf, 0x3c, 0x9e, 0xb4, 0x77, 0x03, 0x13, 0x74, + 0x8f, 0x61, 0x0d, 0xcd, 0x3e, 0x29, 0x2e, 0x2d, 0x18, 0xe3, 0xe5, 0x35, 0xd6, 0xb8, 0xbd, 0xdf, + 0x59, 0x2a, 0x8c, 0xe2, 0xeb, 0x19, 0xc1, 0xd8, 0x6a, 0x21, 0xb1, 0xee, 0x14, 0x92, 0xc7, 0xd0, + 0x9a, 0xe6, 0xda, 0x1d, 0xca, 0xf1, 0x4b, 0xba, 0x4a, 0x91, 0xb3, 0x74, 0x8a, 0xbc, 0xdf, 0x5b, + 0x30, 0xf8, 0x88, 0x45, 0x14, 0x3f, 0x6c, 0x27, 0x49, 0xac, 0x1e, 0xb7, 0xee, 0x9c, 0xf3, 0x1f, + 0x42, 0x3b, 0x90, 0x62, 0x68, 0xa6, 0xd2, 0xbe, 0xc4, 0xbd, 0xa8, 0xe2, 0xd1, 0x46, 0x5c, 0x47, + 0x1f, 0x71, 0xbd, 0x3f, 0x5a, 0xb0, 0x26, 0x83, 0xf2, 0x93, 0x3c, 0xca, 0xee, 0x6c, 0xdf, 0x0e, + 0xb4, 0x66, 0x79, 0x94, 0xdd, 0xa1, 0x2a, 0x4b, 0xbe, 0xf9, 0x7a, 0x72, 0x16, 0xd4, 0x93, 0xf7, + 0x27, 0x0b, 0x9e, 0xd4, 0xc3, 0xba, 0x3d, 0x1a, 0x91, 0xe4, 0x5d, 0x6e, 0x29, 0x63, 0xc4, 0x5f, + 0xa9, 0x8d, 0xf8, 0x0b, 0x4d, 0xf6, 0xc9, 0x27, 0x64, 0xf4, 0xbf, 0x6b, 0xf2, 0x2f, 0x6d, 0xf8, + 0xd2, 0x61, 0xb9, 0xf1, 0xce, 0x79, 0x40, 0xd3, 0x31, 0xe1, 0xfc, 0x1d, 0xda, 0x7b, 0x04, 0x3d, + 0x4a, 0x5e, 0x57, 0x36, 0xa9, 0xed, 0xb8, 0xac, 0x18, 0x93, 0x79, 0xb9, 0xde, 0xe5, 0xfd, 0xc7, + 0x82, 0x75, 0x29, 0xe7, 0xc7, 0xd1, 0xe8, 0xea, 0x1d, 0x3a, 0x7f, 0x0c, 0x6b, 0x57, 0x68, 0x81, + 0xa0, 0xee, 0xd0, 0xb6, 0x6b, 0xdc, 0x4b, 0xba, 0xff, 0xa9, 0x05, 0x0f, 0xa4, 0xa0, 0x17, 0xf4, + 0x3a, 0x7a, 0x97, 0xc5, 0x7a, 0x0a, 0xfd, 0x48, 0x9a, 0x70, 0xc7, 0x00, 0xd4, 0xd9, 0x97, 0x8c, + 0xc0, 0x9f, 0x2d, 0xe8, 0x4b, 0x49, 0xfb, 0x34, 0x23, 0xfc, 0xce, 0xfe, 0xff, 0x08, 0x3a, 0x84, + 0x66, 0x3c, 0xa0, 0x77, 0xe9, 0x90, 0x3a, 0xeb, 0x92, 0x4d, 0xf2, 0x0a, 0x1e, 0xc8, 0x17, 0x20, + 0xad, 0xe3, 0x88, 0x59, 0x35, 0x08, 0xe5, 0xf8, 0x29, 0x6f, 0x44, 0x05, 0x69, 0xbe, 0xed, 0xa9, + 0x3f, 0x6d, 0xaa, 0xb7, 0xbd, 0xa7, 0x00, 0x41, 0x18, 0x7e, 0xcc, 0x78, 0x18, 0xd1, 0xe2, 0xf8, + 0xd0, 0x10, 0xef, 0x23, 0xe8, 0x8a, 0x69, 0xf9, 0x5c, 0x7b, 0xcb, 0xb9, 0xf5, 0xb5, 0x49, 0x7f, + 0x07, 0xb2, 0xcd, 0x77, 0x20, 0xef, 0x67, 0xf0, 0x85, 0x39, 0xc3, 0x31, 0xea, 0xbb, 0xf2, 0x89, + 0xaa, 0x50, 0xa2, 0x82, 0xbf, 0xe8, 0xfe, 0xa8, 0xdb, 0xe2, 0x1b, 0x4c, 0xde, 0x2f, 0x2c, 0x78, + 0x7f, 0x4e, 0xfc, 0x76, 0x92, 0x70, 0x76, 0xad, 0x8a, 0xfb, 0x3e, 0xd4, 0x98, 0xad, 0xd5, 0xae, + 0xb7, 0xd6, 0x85, 0x46, 0x18, 0xc7, 0xc1, 0xe7, 0x60, 0xc4, 0x1f, 0x2c, 0xe8, 0x2b, 0x23, 0xc2, + 0x50, 0xa9, 0xfd, 0x36, 0x34, 0xe5, 0xf3, 0xb6, 0x52, 0xf8, 0xfe, 0x42, 0x85, 0xc5, 0xb3, 0xbc, + 0xaf, 0x16, 0xcf, 0x57, 0xa4, 0xbd, 0x68, 0x0c, 0xfc, 0x6e, 0xd9, 0x01, 0x96, 0x7e, 0x80, 0x56, + 0x0c, 0xde, 0x4f, 0x8b, 0x62, 0xde, 0x23, 0x31, 0xb9, 0xcf, 0x18, 0x79, 0x2f, 0x61, 0x0d, 0xdf, + 0xda, 0xab, 0x18, 0xdc, 0x8b, 0xd8, 0x8f, 0x61, 0x1d, 0xc5, 0xde, 0xbb, 0xbd, 0xe5, 0xee, 0x10, + 0xf1, 0xd9, 0xbd, 0x0c, 0xe8, 0xe4, 0x3e, 0xa5, 0x7f, 0x03, 0x1e, 0x16, 0xb1, 0x7f, 0x99, 0x84, + 0xe5, 0x15, 0xe5, 0x86, 0x47, 0xae, 0x8b, 0x26, 0xfe, 0x57, 0xfc, 0xad, 0xff, 0x06, 0x00, 0x00, + 0xff, 0xff, 0xaf, 0x96, 0xca, 0x38, 0x3e, 0x1e, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index a74e3e13f..eede88e04 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -77,7 +77,7 @@ message BlackInfo{ message GroupRequest{ PublicUserInfo userInfo = 1; GroupInfo groupInfo = 2; - string handleResult = 3; + int32 handleResult = 3; string reqMsg = 4; string handleMsg = 5; uint32 reqTime = 6;