diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index fccba41c1..8580de2cc 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -26,7 +26,7 @@ func main() { userRouterGroup := r.Group("/user") { userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1 - userRouterGroup.POST("/get_user_info", user.GetUsersInfo) //1 + userRouterGroup.POST("/get_users_info", user.GetUsersInfo) //1 userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1 } //friend routing group @@ -34,17 +34,19 @@ func main() { { // friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo) friendRouterGroup.POST("/add_friend", friend.AddFriend) //1 + friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) //1 friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1 friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList) //1 friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) //1 - friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist) //1 - friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist) //1 - friendRouterGroup.POST("/remove_blacklist", friend.RemoveBlacklist) //1 - friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) //1 friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1 friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark) //1 - friendRouterGroup.POST("/is_friend", friend.IsFriend) //1 - friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1 + + friendRouterGroup.POST("/add_black", friend.AddBlack) //1 + friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1 + friendRouterGroup.POST("/remove_black", friend.RemoveBlack) //1 + + friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1 + friendRouterGroup.POST("/is_friend", friend.IsFriend) //1 } //group related routing group groupRouterGroup := r.Group("/group") diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index 3cd14ff73..42f4ba86a 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -16,7 +16,7 @@ import ( "strings" ) -func AddBlacklist(c *gin.Context) { +func AddBlack(c *gin.Context) { params := api.AddBlacklistReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) @@ -257,7 +257,7 @@ func SetFriendRemark(c *gin.Context) { c.JSON(http.StatusOK, resp) } -func RemoveBlacklist(c *gin.Context) { +func RemoveBlack(c *gin.Context) { params := api.RemoveBlackListReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b691458f3..767adba27 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -407,8 +407,21 @@ func (s *groupServer) GetGroupApplicationList(_ context.Context, req *pbGroup.Ge log.NewDebug(req.OperationID, "GetGroupApplicationList reply ", reply) resp := pbGroup.GetGroupApplicationListResp{} for _, v := range reply { - var node open_im_sdk.GroupRequest + node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} + group, err := imdb.GetGroupInfoByGroupID(v.GroupID) + if err != nil { + log.Error(req.OperationID, "GetGroupInfoByGroupID failed ", err.Error(), v.GroupID) + continue + } + user, err := imdb.GetUserByUserID(v.UserID) + if err != nil { + log.Error(req.OperationID, "GetUserByUserID failed ", err.Error(), v.UserID) + continue + } + cp.GroupRequestDBCopyOpenIM(&node, &v) + cp.UserDBCopyOpenIMPublic(node.UserInfo, user) + cp.GroupDBCopyOpenIM(node.GroupInfo, group) log.NewDebug(req.OperationID, "node ", node, "v ", v) resp.GroupRequestList = append(resp.GroupRequestList, &node) } diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_model.go index 21e9d5156..60b470685 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_model.go @@ -2,6 +2,7 @@ package im_mysql_model import ( "Open_IM/pkg/common/db" + "Open_IM/pkg/utils" "time" ) @@ -37,7 +38,7 @@ func InsertIntoGroup(groupInfo db.Group) error { func GetGroupInfoByGroupID(groupId string) (*db.Group, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { - return nil, err + return nil, utils.Wrap(err, "") } var groupInfo db.Group err = dbConn.Table("groups").Where("group_id=?", groupId).Find(&groupInfo).Error diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go index b181d79b0..ed061a509 100644 --- a/pkg/common/utils/utils.go +++ b/pkg/common/utils/utils.go @@ -114,6 +114,10 @@ func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *db.Black) { } } +func UserDBCopyOpenIMPublic(dst *open_im_sdk.PublicUserInfo, src *db.User) { + utils.CopyStructFields(dst, src) +} + // //func PublicUserDBCopyOpenIM(dst *open_im_sdk.PublicUserInfo, src *db.User){ // diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index ea305a14b..15741944a 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{0} + return fileDescriptor_group_a130b5186d308ee6, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -82,7 +82,7 @@ func (m *GroupAddMemberInfo) Reset() { *m = GroupAddMemberInfo{} } func (m *GroupAddMemberInfo) String() string { return proto.CompactTextString(m) } func (*GroupAddMemberInfo) ProtoMessage() {} func (*GroupAddMemberInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{1} + return fileDescriptor_group_a130b5186d308ee6, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -131,7 +131,7 @@ func (m *CreateGroupReq) Reset() { *m = CreateGroupReq{} } func (m *CreateGroupReq) String() string { return proto.CompactTextString(m) } func (*CreateGroupReq) ProtoMessage() {} func (*CreateGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{2} + return fileDescriptor_group_a130b5186d308ee6, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -199,7 +199,7 @@ func (m *CreateGroupResp) Reset() { *m = CreateGroupResp{} } func (m *CreateGroupResp) String() string { return proto.CompactTextString(m) } func (*CreateGroupResp) ProtoMessage() {} func (*CreateGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{3} + return fileDescriptor_group_a130b5186d308ee6, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -253,7 +253,7 @@ func (m *GetGroupsInfoReq) Reset() { *m = GetGroupsInfoReq{} } func (m *GetGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoReq) ProtoMessage() {} func (*GetGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{4} + return fileDescriptor_group_a130b5186d308ee6, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -307,7 +307,7 @@ func (m *GetGroupsInfoResp) Reset() { *m = GetGroupsInfoResp{} } func (m *GetGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoResp) ProtoMessage() {} func (*GetGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{5} + return fileDescriptor_group_a130b5186d308ee6, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -361,7 +361,7 @@ func (m *SetGroupInfoReq) Reset() { *m = SetGroupInfoReq{} } func (m *SetGroupInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoReq) ProtoMessage() {} func (*SetGroupInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{6} + return fileDescriptor_group_a130b5186d308ee6, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -413,7 +413,7 @@ func (m *SetGroupInfoResp) Reset() { *m = SetGroupInfoResp{} } func (m *SetGroupInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoResp) ProtoMessage() {} func (*SetGroupInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{7} + return fileDescriptor_group_a130b5186d308ee6, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -453,7 +453,7 @@ func (m *GetGroupApplicationListReq) Reset() { *m = GetGroupApplicationL func (m *GetGroupApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListReq) ProtoMessage() {} func (*GetGroupApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{8} + return fileDescriptor_group_a130b5186d308ee6, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -507,7 +507,7 @@ func (m *GetGroupApplicationListResp) Reset() { *m = GetGroupApplication func (m *GetGroupApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListResp) ProtoMessage() {} func (*GetGroupApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{9} + return fileDescriptor_group_a130b5186d308ee6, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -563,7 +563,7 @@ func (m *TransferGroupOwnerReq) Reset() { *m = TransferGroupOwnerReq{} } func (m *TransferGroupOwnerReq) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerReq) ProtoMessage() {} func (*TransferGroupOwnerReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{10} + return fileDescriptor_group_a130b5186d308ee6, []int{10} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -629,7 +629,7 @@ func (m *TransferGroupOwnerResp) Reset() { *m = TransferGroupOwnerResp{} func (m *TransferGroupOwnerResp) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerResp) ProtoMessage() {} func (*TransferGroupOwnerResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{11} + return fileDescriptor_group_a130b5186d308ee6, []int{11} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -670,7 +670,7 @@ func (m *JoinGroupReq) Reset() { *m = JoinGroupReq{} } func (m *JoinGroupReq) String() string { return proto.CompactTextString(m) } func (*JoinGroupReq) ProtoMessage() {} func (*JoinGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{12} + return fileDescriptor_group_a130b5186d308ee6, []int{12} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -729,7 +729,7 @@ func (m *JoinGroupResp) Reset() { *m = JoinGroupResp{} } func (m *JoinGroupResp) String() string { return proto.CompactTextString(m) } func (*JoinGroupResp) ProtoMessage() {} func (*JoinGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{13} + return fileDescriptor_group_a130b5186d308ee6, []int{13} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -772,7 +772,7 @@ func (m *GroupApplicationResponseReq) Reset() { *m = GroupApplicationRes func (m *GroupApplicationResponseReq) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseReq) ProtoMessage() {} func (*GroupApplicationResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{14} + return fileDescriptor_group_a130b5186d308ee6, []int{14} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -845,7 +845,7 @@ func (m *GroupApplicationResponseResp) Reset() { *m = GroupApplicationRe func (m *GroupApplicationResponseResp) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseResp) ProtoMessage() {} func (*GroupApplicationResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{15} + return fileDescriptor_group_a130b5186d308ee6, []int{15} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -885,7 +885,7 @@ func (m *QuitGroupReq) Reset() { *m = QuitGroupReq{} } func (m *QuitGroupReq) String() string { return proto.CompactTextString(m) } func (*QuitGroupReq) ProtoMessage() {} func (*QuitGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{16} + return fileDescriptor_group_a130b5186d308ee6, []int{16} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -937,7 +937,7 @@ func (m *QuitGroupResp) Reset() { *m = QuitGroupResp{} } func (m *QuitGroupResp) String() string { return proto.CompactTextString(m) } func (*QuitGroupResp) ProtoMessage() {} func (*QuitGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{17} + return fileDescriptor_group_a130b5186d308ee6, []int{17} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -979,7 +979,7 @@ func (m *GetGroupMemberListReq) Reset() { *m = GetGroupMemberListReq{} } func (m *GetGroupMemberListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListReq) ProtoMessage() {} func (*GetGroupMemberListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{18} + return fileDescriptor_group_a130b5186d308ee6, []int{18} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1048,7 +1048,7 @@ func (m *GetGroupMemberListResp) Reset() { *m = GetGroupMemberListResp{} func (m *GetGroupMemberListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListResp) ProtoMessage() {} func (*GetGroupMemberListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{19} + return fileDescriptor_group_a130b5186d308ee6, []int{19} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1110,7 +1110,7 @@ func (m *GetGroupMembersInfoReq) Reset() { *m = GetGroupMembersInfoReq{} func (m *GetGroupMembersInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoReq) ProtoMessage() {} func (*GetGroupMembersInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{20} + return fileDescriptor_group_a130b5186d308ee6, []int{20} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1171,7 +1171,7 @@ func (m *GetGroupMembersInfoResp) Reset() { *m = GetGroupMembersInfoResp func (m *GetGroupMembersInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoResp) ProtoMessage() {} func (*GetGroupMembersInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{21} + return fileDescriptor_group_a130b5186d308ee6, []int{21} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1227,7 +1227,7 @@ func (m *KickGroupMemberReq) Reset() { *m = KickGroupMemberReq{} } func (m *KickGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberReq) ProtoMessage() {} func (*KickGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{22} + return fileDescriptor_group_a130b5186d308ee6, []int{22} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1294,7 +1294,7 @@ func (m *Id2Result) Reset() { *m = Id2Result{} } func (m *Id2Result) String() string { return proto.CompactTextString(m) } func (*Id2Result) ProtoMessage() {} func (*Id2Result) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{23} + return fileDescriptor_group_a130b5186d308ee6, []int{23} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1341,7 +1341,7 @@ func (m *KickGroupMemberResp) Reset() { *m = KickGroupMemberResp{} } func (m *KickGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberResp) ProtoMessage() {} func (*KickGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{24} + return fileDescriptor_group_a130b5186d308ee6, []int{24} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1395,7 +1395,7 @@ func (m *GetJoinedGroupListReq) Reset() { *m = GetJoinedGroupListReq{} } func (m *GetJoinedGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListReq) ProtoMessage() {} func (*GetJoinedGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{25} + return fileDescriptor_group_a130b5186d308ee6, []int{25} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1449,7 +1449,7 @@ func (m *GetJoinedGroupListResp) Reset() { *m = GetJoinedGroupListResp{} func (m *GetJoinedGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListResp) ProtoMessage() {} func (*GetJoinedGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{26} + return fileDescriptor_group_a130b5186d308ee6, []int{26} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1505,7 +1505,7 @@ func (m *InviteUserToGroupReq) Reset() { *m = InviteUserToGroupReq{} } func (m *InviteUserToGroupReq) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupReq) ProtoMessage() {} func (*InviteUserToGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{27} + return fileDescriptor_group_a130b5186d308ee6, []int{27} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1573,7 +1573,7 @@ func (m *InviteUserToGroupResp) Reset() { *m = InviteUserToGroupResp{} } func (m *InviteUserToGroupResp) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupResp) ProtoMessage() {} func (*InviteUserToGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{28} + return fileDescriptor_group_a130b5186d308ee6, []int{28} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1627,7 +1627,7 @@ func (m *GetGroupAllMemberReq) Reset() { *m = GetGroupAllMemberReq{} } func (m *GetGroupAllMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberReq) ProtoMessage() {} func (*GetGroupAllMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{29} + return fileDescriptor_group_a130b5186d308ee6, []int{29} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1681,7 +1681,7 @@ func (m *GetGroupAllMemberResp) Reset() { *m = GetGroupAllMemberResp{} } func (m *GetGroupAllMemberResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberResp) ProtoMessage() {} func (*GetGroupAllMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_5b7911b898fdd5c5, []int{30} + return fileDescriptor_group_a130b5186d308ee6, []int{30} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -2257,86 +2257,86 @@ var _Group_serviceDesc = grpc.ServiceDesc{ Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_5b7911b898fdd5c5) } - -var fileDescriptor_group_5b7911b898fdd5c5 = []byte{ - // 1235 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x49, 0x6f, 0x1c, 0x45, - 0x14, 0x56, 0x79, 0x3c, 0x4e, 0xe6, 0xd9, 0xe3, 0xa5, 0xbc, 0x4d, 0x3a, 0xc6, 0x9a, 0x14, 0x12, - 0xb2, 0x10, 0xb2, 0x85, 0x41, 0xb9, 0x24, 0x02, 0xbc, 0x26, 0x93, 0xc4, 0xb6, 0xdc, 0x31, 0x17, - 0x2e, 0x66, 0xe2, 0x2e, 0xb7, 0x1a, 0xf7, 0x74, 0xb7, 0xbb, 0x7a, 0x62, 0xe0, 0x02, 0x08, 0xc1, - 0x05, 0x21, 0x71, 0xe2, 0xce, 0x85, 0x33, 0x07, 0x4e, 0x5c, 0xf8, 0x1d, 0xfc, 0x04, 0xfe, 0x05, - 0xaa, 0xa5, 0x7b, 0xaa, 0x57, 0x8f, 0x66, 0x24, 0x72, 0x19, 0xe9, 0x2d, 0xd5, 0xef, 0xbd, 0xaf, - 0xde, 0x56, 0x03, 0x0b, 0x76, 0xe8, 0xf7, 0x83, 0x2d, 0xf1, 0xbb, 0x19, 0x84, 0x7e, 0xe4, 0xe3, - 0xba, 0x20, 0x8c, 0x07, 0x27, 0x01, 0xf5, 0xce, 0x3b, 0x47, 0x5b, 0xc1, 0x95, 0xbd, 0x25, 0x24, - 0x5b, 0xcc, 0xba, 0x3a, 0xbf, 0x61, 0x5b, 0x37, 0x4c, 0x6a, 0x92, 0x8f, 0x00, 0xf6, 0xfc, 0x5e, - 0xcf, 0xf7, 0x4c, 0xca, 0x02, 0xdc, 0x82, 0x3b, 0x07, 0x61, 0xb8, 0xe7, 0x5b, 0xb4, 0x85, 0xda, - 0x68, 0xa3, 0x6e, 0xc6, 0x24, 0x5e, 0x81, 0xa9, 0x83, 0x30, 0x3c, 0x62, 0x76, 0x6b, 0xa2, 0x8d, - 0x36, 0x1a, 0xa6, 0xa2, 0xc8, 0x33, 0xc0, 0x4f, 0xb8, 0xad, 0x1d, 0xcb, 0x3a, 0xa2, 0xbd, 0x57, - 0x34, 0xec, 0x78, 0x97, 0x3e, 0xd7, 0xfe, 0x94, 0xd1, 0xb0, 0xb3, 0x2f, 0x3e, 0xd3, 0x30, 0x15, - 0x85, 0xd7, 0xa0, 0x61, 0xfa, 0x2e, 0x7d, 0x41, 0x5f, 0x53, 0x57, 0x7c, 0xa8, 0x6e, 0x0e, 0x18, - 0xe4, 0x5f, 0x04, 0xb3, 0x7b, 0x21, 0xed, 0x46, 0x54, 0x7c, 0xd2, 0xa4, 0xd7, 0x78, 0x07, 0x66, - 0x3b, 0x9e, 0x13, 0xc9, 0x4f, 0xbf, 0x70, 0x58, 0xd4, 0x42, 0xed, 0xda, 0xc6, 0xf4, 0xf6, 0xbd, - 0x4d, 0x19, 0x6e, 0xde, 0xb6, 0x99, 0x39, 0x80, 0x3f, 0x84, 0x86, 0xd0, 0xe2, 0x42, 0x61, 0x73, - 0x7a, 0x7b, 0x65, 0xd3, 0xe7, 0xc0, 0x38, 0xbd, 0x73, 0x66, 0x5d, 0x6d, 0x26, 0x52, 0x73, 0xa0, - 0x88, 0xdb, 0x30, 0x7d, 0x12, 0xd0, 0xb0, 0x1b, 0x39, 0xbe, 0xd7, 0xd9, 0x6f, 0xd5, 0x44, 0x18, - 0x3a, 0x0b, 0x1b, 0x70, 0xf7, 0x24, 0x50, 0x51, 0x4e, 0x0a, 0x71, 0x42, 0x8b, 0xd3, 0x37, 0x1e, - 0x0d, 0x95, 0xb8, 0xae, 0x4e, 0x0f, 0x58, 0xe4, 0x2b, 0x98, 0x4b, 0x85, 0x3a, 0x0a, 0xf8, 0xe9, - 0xd0, 0x6a, 0x43, 0x86, 0x46, 0x42, 0x98, 0x7f, 0x42, 0x23, 0x41, 0x33, 0x21, 0xa3, 0xd7, 0xdc, - 0x61, 0xa9, 0xb0, 0x9f, 0x80, 0xdc, 0x30, 0x75, 0x56, 0x16, 0x90, 0x89, 0x6a, 0x40, 0x6a, 0x69, - 0x40, 0xc8, 0xf7, 0x08, 0x16, 0x32, 0x46, 0x47, 0x8a, 0xf8, 0x31, 0x34, 0x93, 0x40, 0x84, 0xa7, - 0x35, 0x91, 0x0e, 0x65, 0x51, 0xa7, 0x95, 0xc9, 0x0f, 0x08, 0xe6, 0x5e, 0x2a, 0x2f, 0xe2, 0xc8, - 0x53, 0x18, 0xa2, 0x61, 0xd3, 0x43, 0x8f, 0x75, 0xa2, 0xe0, 0xf2, 0x2b, 0x53, 0x87, 0x1c, 0xc0, - 0x7c, 0xda, 0x0d, 0x16, 0xe0, 0xf7, 0xf5, 0x42, 0x54, 0x8e, 0x2c, 0xa8, 0x2c, 0x1f, 0x08, 0x4c, - 0x4d, 0x89, 0x7c, 0x0d, 0x46, 0x8c, 0xe9, 0x4e, 0x10, 0xb8, 0xce, 0x85, 0xf8, 0x3e, 0x8f, 0x94, - 0x07, 0xa6, 0xbb, 0x88, 0xaa, 0x5d, 0x2c, 0xb8, 0xcc, 0x75, 0x80, 0xc3, 0xd0, 0xef, 0xa5, 0xae, - 0x53, 0xe3, 0x90, 0x5f, 0x11, 0xdc, 0x2f, 0x35, 0x3e, 0xd2, 0xd5, 0x1e, 0xc0, 0x7c, 0x5c, 0xf6, - 0x7d, 0xca, 0x22, 0xed, 0x76, 0xef, 0xe5, 0xef, 0x43, 0x29, 0x99, 0xb9, 0x23, 0xe4, 0x6f, 0x04, - 0xcb, 0x67, 0x61, 0xd7, 0x63, 0x97, 0x34, 0x14, 0x42, 0x51, 0x75, 0x1c, 0x90, 0x16, 0xdc, 0x51, - 0x09, 0xad, 0xf0, 0x88, 0x49, 0xfc, 0x0e, 0xcc, 0x9e, 0xb8, 0x96, 0x5e, 0xb1, 0xd2, 0xb5, 0x0c, - 0x97, 0xeb, 0x1d, 0xd3, 0x1b, 0x5d, 0x4f, 0x02, 0x93, 0xe1, 0x66, 0xe1, 0x9d, 0xac, 0xae, 0x95, - 0x7a, 0xa6, 0x56, 0x9e, 0xc3, 0x4a, 0x51, 0x00, 0xa3, 0xe5, 0xc8, 0x8f, 0x08, 0x66, 0x9e, 0xf9, - 0x8e, 0x97, 0x74, 0xd4, 0x72, 0x14, 0xd6, 0x01, 0x4c, 0x7a, 0x7d, 0x44, 0x19, 0xeb, 0xda, 0x54, - 0x21, 0xa0, 0x71, 0xaa, 0xea, 0xfb, 0xf6, 0x88, 0xc9, 0x2e, 0x34, 0x35, 0x3f, 0x46, 0x0b, 0xe6, - 0x1f, 0x9e, 0x74, 0x99, 0x8c, 0xe3, 0x02, 0xdf, 0x63, 0x54, 0x75, 0x31, 0xdd, 0x0b, 0x54, 0x8d, - 0x7b, 0xb6, 0x6e, 0x35, 0x64, 0x6a, 0x39, 0x64, 0xb4, 0x62, 0x98, 0xcc, 0x16, 0x03, 0x97, 0x3f, - 0xed, 0x7a, 0x96, 0x4b, 0x2d, 0x9e, 0xd6, 0xf2, 0x3e, 0x35, 0x0e, 0x26, 0x30, 0x23, 0x29, 0x93, - 0xb2, 0xbe, 0x1b, 0xb5, 0xa6, 0x44, 0x45, 0xa4, 0x78, 0xe4, 0x14, 0xd6, 0xca, 0x43, 0x1b, 0x0d, - 0xae, 0x4b, 0x98, 0x39, 0xed, 0x3b, 0xd1, 0x10, 0x57, 0x3f, 0x5e, 0x73, 0xdf, 0x85, 0xa6, 0x66, - 0x67, 0x34, 0x5f, 0x7f, 0x43, 0xb0, 0x1c, 0xf7, 0x93, 0xc1, 0xf0, 0xae, 0xf6, 0x7a, 0xac, 0x26, - 0xcc, 0xfb, 0xd0, 0xa1, 0xe3, 0x46, 0x34, 0x14, 0x17, 0x5a, 0x37, 0x15, 0xc5, 0xed, 0x1d, 0xd3, - 0x2f, 0xa3, 0x97, 0xf4, 0x5a, 0xdc, 0x64, 0xdd, 0x8c, 0x49, 0xf2, 0x3b, 0x82, 0x95, 0x22, 0x1f, - 0x47, 0x6a, 0x77, 0x9f, 0x00, 0xf4, 0x06, 0x5b, 0x8d, 0x6c, 0x74, 0xed, 0x7c, 0xa3, 0x93, 0x76, - 0x0e, 0xfb, 0xae, 0x2b, 0x26, 0x85, 0x76, 0x86, 0xdb, 0xf4, 0x94, 0xa3, 0x32, 0x82, 0x98, 0x24, - 0xbf, 0xe4, 0x1c, 0x4d, 0x06, 0x7d, 0x65, 0xf9, 0x6b, 0x0e, 0x4d, 0x88, 0x0d, 0x40, 0x37, 0x37, - 0x5e, 0xf9, 0xff, 0x8c, 0x60, 0xb5, 0xd0, 0xa5, 0x37, 0x03, 0x1e, 0xf9, 0x03, 0x01, 0x7e, 0xee, - 0x5c, 0x5c, 0x69, 0x7a, 0xd5, 0xf0, 0xbc, 0x0b, 0xf3, 0x5c, 0x9f, 0x5a, 0x32, 0x64, 0x0d, 0xa4, - 0x1c, 0x9f, 0xbb, 0x6d, 0xd2, 0x2e, 0xf3, 0x3d, 0x05, 0x94, 0xa2, 0xb2, 0x30, 0xd5, 0xab, 0xcb, - 0x6c, 0x2a, 0x53, 0x66, 0x8f, 0xa0, 0xd1, 0xb1, 0xb6, 0x65, 0xbb, 0x28, 0xdd, 0xb0, 0x85, 0x69, - 0xd1, 0x64, 0xe4, 0x7a, 0xad, 0x28, 0xf2, 0x0d, 0x2c, 0xe6, 0xc2, 0x1d, 0x09, 0xfa, 0x87, 0xd0, - 0x4c, 0xbc, 0xd0, 0xd0, 0x9f, 0x57, 0xe5, 0x9d, 0xc8, 0xcc, 0xb4, 0x1a, 0xe9, 0x8b, 0xfa, 0xe6, - 0x23, 0x80, 0x5a, 0xc2, 0x8b, 0xb8, 0xbe, 0xd3, 0xcd, 0x15, 0xe5, 0x9a, 0x6b, 0x1b, 0xa6, 0xfd, - 0x7c, 0x6f, 0xf2, 0x87, 0xec, 0x4d, 0xdf, 0xca, 0x52, 0xc8, 0xd9, 0x1d, 0x6b, 0xdf, 0x1e, 0x62, - 0xf3, 0x1c, 0x28, 0x92, 0x3f, 0x11, 0x2c, 0x75, 0xbc, 0xd7, 0x4e, 0x44, 0xb9, 0x4f, 0x67, 0x7e, - 0xd2, 0x8f, 0x6f, 0xef, 0xba, 0xe5, 0x23, 0x69, 0x90, 0x62, 0x93, 0xa9, 0x14, 0x7b, 0x0f, 0x16, - 0xa4, 0x2d, 0x3d, 0x4f, 0xeb, 0x22, 0x4f, 0xf3, 0x82, 0xca, 0x74, 0xfb, 0x0e, 0xc1, 0x72, 0x81, - 0xdb, 0xff, 0x6b, 0xd2, 0x78, 0xb0, 0x94, 0x2c, 0x99, 0xae, 0x3b, 0x4c, 0x99, 0x8e, 0xb7, 0x98, - 0xff, 0xa4, 0x4d, 0x21, 0xcd, 0xe0, 0x9b, 0xe9, 0x51, 0xdb, 0x7f, 0xdd, 0x05, 0xf9, 0x90, 0xc7, - 0x8f, 0x61, 0xfa, 0x62, 0xf0, 0x5a, 0xc4, 0xcb, 0xf1, 0x2c, 0x4d, 0x3d, 0x96, 0x8d, 0x95, 0x22, - 0x36, 0x0b, 0xf0, 0x43, 0x68, 0x7c, 0x11, 0xaf, 0x5e, 0x78, 0x51, 0x29, 0xe9, 0x4b, 0xa1, 0xb1, - 0x94, 0x67, 0xca, 0x73, 0xd7, 0xf1, 0x5c, 0x4f, 0xce, 0xe9, 0x1b, 0x45, 0x72, 0x2e, 0x3d, 0xfe, - 0x77, 0xa1, 0x69, 0xeb, 0x6f, 0x3d, 0xbc, 0x1a, 0xbf, 0xd6, 0x33, 0xcf, 0x4e, 0xa3, 0x55, 0x2c, - 0x60, 0x01, 0xfe, 0x18, 0x66, 0x98, 0xf6, 0x44, 0xc2, 0x71, 0x6c, 0x99, 0xe7, 0x9b, 0xb1, 0x5a, - 0xc8, 0x67, 0x01, 0xfe, 0x1c, 0x56, 0xed, 0xe2, 0xf7, 0x09, 0x7e, 0x90, 0xb1, 0x9a, 0x7f, 0x3c, - 0x19, 0xe4, 0x36, 0x15, 0x16, 0xe0, 0x53, 0xc0, 0x51, 0x6e, 0x4f, 0xc7, 0x6b, 0xea, 0x64, 0xe1, - 0x1b, 0xc4, 0x78, 0xab, 0x42, 0xca, 0x02, 0x7c, 0x01, 0x2d, 0xbb, 0x64, 0x09, 0xc4, 0x24, 0xf5, - 0x97, 0x47, 0xe1, 0x02, 0x6c, 0xbc, 0x7d, 0xab, 0x8e, 0xf4, 0xdb, 0xce, 0x6d, 0x31, 0x89, 0xdf, - 0x85, 0x4b, 0x58, 0xe2, 0x77, 0xc9, 0xfa, 0x73, 0x06, 0x8b, 0x76, 0x7e, 0xb8, 0xe3, 0xe2, 0x53, - 0xc9, 0xed, 0xaf, 0x57, 0x89, 0x59, 0x80, 0x9f, 0xc2, 0xdc, 0x55, 0x7a, 0x66, 0xe1, 0xf8, 0x7f, - 0x9f, 0xfc, 0xe8, 0x36, 0x8c, 0x32, 0x51, 0x12, 0x72, 0x66, 0x08, 0xe8, 0x21, 0xe7, 0xe7, 0x92, - 0x1e, 0x72, 0xd1, 0xf4, 0x38, 0x86, 0x05, 0x27, 0xdb, 0x1d, 0xf1, 0xfd, 0xb8, 0xa1, 0x15, 0xb4, - 0x7b, 0x63, 0xad, 0x5c, 0x28, 0xbf, 0x67, 0x67, 0x3b, 0x4f, 0xf2, 0xbd, 0xa2, 0x26, 0x68, 0xac, - 0x95, 0x0b, 0x59, 0xb0, 0x3b, 0xf7, 0x59, 0x73, 0x53, 0xfe, 0x27, 0xf8, 0x48, 0xfc, 0xbe, 0x9a, - 0x12, 0x7f, 0xf8, 0x7d, 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0x58, 0xf3, 0xe0, 0x2f, - 0x14, 0x00, 0x00, +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_a130b5186d308ee6) } + +var fileDescriptor_group_a130b5186d308ee6 = []byte{ + // 1246 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x6f, 0x23, 0xc5, + 0x13, 0x57, 0xc7, 0x71, 0x76, 0x5d, 0x89, 0xf3, 0xe8, 0xbc, 0xfc, 0x9f, 0xf5, 0x3f, 0x64, 0x1b, + 0x69, 0x15, 0x21, 0x64, 0x8b, 0x20, 0xed, 0x81, 0x45, 0xa0, 0x38, 0x8f, 0x5d, 0x6f, 0x36, 0x89, + 0x32, 0x1b, 0x2e, 0x5c, 0x82, 0x37, 0xd3, 0x19, 0x0d, 0x19, 0xcf, 0x8c, 0xa7, 0xc7, 0x09, 0xe2, + 0xb2, 0xe2, 0xb2, 0x12, 0xe2, 0x02, 0xe2, 0xca, 0x85, 0x3b, 0x07, 0x0e, 0x9c, 0xb8, 0xf0, 0x39, + 0xf8, 0x14, 0x7c, 0x05, 0x34, 0xdd, 0x3d, 0xe3, 0x9e, 0x67, 0xb2, 0xb6, 0xc4, 0x5e, 0x2c, 0x75, + 0x55, 0xf5, 0xd4, 0xfb, 0x57, 0xd5, 0x86, 0x25, 0xd3, 0x77, 0x87, 0x5e, 0x9b, 0xff, 0xb6, 0x3c, + 0xdf, 0x0d, 0x5c, 0x5c, 0xe5, 0x07, 0xed, 0xe1, 0x89, 0x47, 0x9d, 0xf3, 0xee, 0x51, 0xdb, 0xbb, + 0x32, 0xdb, 0x9c, 0xd3, 0x66, 0xc6, 0xd5, 0xf9, 0x0d, 0x6b, 0xdf, 0x30, 0x21, 0x49, 0x3e, 0x03, + 0xd8, 0x75, 0xfb, 0x7d, 0xd7, 0xd1, 0x29, 0xf3, 0x70, 0x03, 0xee, 0xed, 0xfb, 0xfe, 0xae, 0x6b, + 0xd0, 0x06, 0xda, 0x44, 0x5b, 0x55, 0x3d, 0x3a, 0xe2, 0x35, 0x98, 0xd9, 0xf7, 0xfd, 0x23, 0x66, + 0x36, 0xa6, 0x36, 0xd1, 0x56, 0x4d, 0x97, 0x27, 0xf2, 0x1c, 0xf0, 0xd3, 0x50, 0xd7, 0x8e, 0x61, + 0x1c, 0xd1, 0xfe, 0x2b, 0xea, 0x77, 0x9d, 0x4b, 0x37, 0x94, 0xfe, 0x82, 0x51, 0xbf, 0xbb, 0xc7, + 0x3f, 0x53, 0xd3, 0xe5, 0x09, 0x37, 0xa1, 0xa6, 0xbb, 0x36, 0x7d, 0x41, 0xaf, 0xa9, 0xcd, 0x3f, + 0x54, 0xd5, 0x47, 0x04, 0xf2, 0x0f, 0x82, 0xf9, 0x5d, 0x9f, 0xf6, 0x02, 0xca, 0x3f, 0xa9, 0xd3, + 0x01, 0xde, 0x81, 0xf9, 0xae, 0x63, 0x05, 0xe2, 0xd3, 0x2f, 0x2c, 0x16, 0x34, 0xd0, 0x66, 0x65, + 0x6b, 0x76, 0xfb, 0x7f, 0x2d, 0xe1, 0x6e, 0x56, 0xb7, 0x9e, 0xba, 0x80, 0x3f, 0x81, 0x1a, 0x97, + 0x0a, 0x99, 0x5c, 0xe7, 0xec, 0x76, 0xb3, 0xc5, 0xa8, 0x7f, 0x4d, 0xfd, 0xf3, 0x9e, 0x67, 0x9d, + 0x7b, 0x3d, 0xbf, 0xd7, 0x67, 0xad, 0x58, 0x46, 0x1f, 0x89, 0xe3, 0x4d, 0x98, 0x3d, 0xf1, 0xa8, + 0xdf, 0x0b, 0x2c, 0xd7, 0xe9, 0xee, 0x35, 0x2a, 0xdc, 0x19, 0x95, 0x84, 0x35, 0xb8, 0x7f, 0xe2, + 0x49, 0x5f, 0xa7, 0x39, 0x3b, 0x3e, 0xf3, 0xdb, 0x37, 0x0e, 0xf5, 0x25, 0xbb, 0x2a, 0x6f, 0x8f, + 0x48, 0xe4, 0x35, 0x2c, 0x24, 0x1c, 0x1e, 0x27, 0x05, 0x49, 0x07, 0x2b, 0x6f, 0xe5, 0x20, 0xf1, + 0x61, 0xf1, 0x29, 0x0d, 0xf8, 0x99, 0x71, 0x1e, 0x1d, 0x84, 0x66, 0x0b, 0x81, 0xbd, 0x38, 0xe0, + 0x35, 0x5d, 0x25, 0xa5, 0xc3, 0x32, 0x55, 0x1e, 0x96, 0x4a, 0x32, 0x2c, 0xe4, 0x7b, 0x04, 0x4b, + 0x29, 0xa5, 0x63, 0xf9, 0xdd, 0x81, 0x7a, 0xec, 0x08, 0xb7, 0xb4, 0xc2, 0x4b, 0xa3, 0xdc, 0xf7, + 0xe4, 0x15, 0xf2, 0x03, 0x82, 0x85, 0x97, 0xd2, 0x96, 0xc8, 0xff, 0x44, 0x3c, 0xd1, 0xdb, 0x15, + 0x8c, 0xea, 0xf7, 0x54, 0x4e, 0x39, 0x94, 0x16, 0x13, 0xd9, 0x87, 0xc5, 0xa4, 0x31, 0xcc, 0xc3, + 0x1f, 0xa9, 0x0d, 0x2a, 0xcd, 0x59, 0x92, 0xd5, 0x3f, 0x62, 0xe8, 0x8a, 0x10, 0xf9, 0x16, 0xb4, + 0x28, 0xbe, 0x3b, 0x9e, 0x67, 0x5b, 0x17, 0xfc, 0xfb, 0xa1, 0xbf, 0xa1, 0x7b, 0xaa, 0x89, 0xa8, + 0xdc, 0xc4, 0x9c, 0xc4, 0x6e, 0x00, 0x1c, 0xf8, 0x6e, 0x3f, 0x91, 0x5a, 0x85, 0x42, 0x7e, 0x41, + 0xf0, 0xa0, 0x50, 0xf9, 0x58, 0x69, 0x3e, 0x84, 0xc5, 0x08, 0x0e, 0x86, 0x94, 0x05, 0x4a, 0xa6, + 0xdf, 0x2b, 0xca, 0x8a, 0x14, 0xd5, 0x33, 0x17, 0xc9, 0x5f, 0x08, 0x56, 0xcf, 0xfc, 0x9e, 0xc3, + 0x2e, 0xa9, 0xcf, 0x99, 0xbc, 0x1b, 0xc3, 0xb0, 0x34, 0xe0, 0x9e, 0x2c, 0x71, 0x19, 0x95, 0xe8, + 0x88, 0x1f, 0xc1, 0xfc, 0x89, 0x6d, 0xa8, 0x9d, 0x2c, 0x0c, 0x4c, 0x51, 0x43, 0xb9, 0x63, 0x7a, + 0xa3, 0xca, 0x89, 0xf0, 0xa4, 0xa8, 0xe9, 0x20, 0x4f, 0x97, 0x77, 0x4f, 0x35, 0xd5, 0x3d, 0x87, + 0xb0, 0x96, 0xe7, 0xc0, 0x78, 0x95, 0xf2, 0x06, 0xc1, 0xdc, 0x73, 0xd7, 0x72, 0x62, 0xbc, 0x2d, + 0x8e, 0xc2, 0x06, 0x80, 0x4e, 0x07, 0x47, 0x94, 0xb1, 0x9e, 0x49, 0x65, 0x04, 0x14, 0x4a, 0x59, + 0xc7, 0xdf, 0xee, 0x31, 0xe9, 0x40, 0x5d, 0xb1, 0x63, 0x3c, 0x67, 0xfe, 0x0e, 0x4b, 0x2f, 0x55, + 0x77, 0x21, 0xc3, 0x75, 0x18, 0x95, 0xb8, 0xa6, 0x5a, 0x81, 0xca, 0xe3, 0x9e, 0xee, 0x5e, 0x25, + 0x32, 0x95, 0x4c, 0x64, 0x94, 0x96, 0x98, 0x4e, 0xb7, 0x44, 0xc8, 0x7f, 0xd6, 0x73, 0x0c, 0x9b, + 0x1a, 0x61, 0x71, 0x8b, 0x7c, 0x2a, 0x14, 0x4c, 0x60, 0x4e, 0x9c, 0x74, 0xca, 0x86, 0x76, 0xd0, + 0x98, 0xe1, 0x7d, 0x91, 0xa0, 0x91, 0x53, 0x68, 0x16, 0xbb, 0x36, 0x5e, 0xb8, 0x2e, 0x61, 0xee, + 0x74, 0x68, 0x05, 0x77, 0x48, 0xfd, 0x64, 0x70, 0xdf, 0x81, 0xba, 0xa2, 0x67, 0x3c, 0x5b, 0x7f, + 0x45, 0xb0, 0x1a, 0xa1, 0xca, 0x68, 0xb4, 0x97, 0x5b, 0x3d, 0x11, 0x14, 0x87, 0x68, 0x74, 0x60, + 0xd9, 0x01, 0xf5, 0x79, 0x42, 0xab, 0xba, 0x3c, 0x85, 0xfa, 0x8e, 0xe9, 0x37, 0xc1, 0x4b, 0x3a, + 0xe0, 0x99, 0xac, 0xea, 0xd1, 0x91, 0xfc, 0x86, 0x60, 0x2d, 0xcf, 0xc6, 0xb1, 0x40, 0xef, 0x00, + 0xa0, 0x3f, 0xda, 0x79, 0x04, 0xdc, 0x3d, 0x2a, 0x82, 0x3b, 0xa1, 0xed, 0x60, 0x68, 0xdb, 0x7c, + 0x6a, 0x28, 0x37, 0x43, 0xcd, 0x8e, 0x34, 0x57, 0xf8, 0x11, 0x1d, 0xc9, 0x8f, 0x19, 0x73, 0xe3, + 0x05, 0xa0, 0x14, 0x04, 0x14, 0xb3, 0xa6, 0xf8, 0x66, 0xa0, 0xaa, 0x9b, 0x0c, 0x04, 0x7e, 0x46, + 0xb0, 0x9e, 0x6b, 0xd2, 0xbb, 0x0c, 0x21, 0xf9, 0x1d, 0x01, 0x3e, 0xb4, 0x2e, 0xae, 0x14, 0xb9, + 0xf2, 0x20, 0x7d, 0x00, 0x8b, 0xa1, 0x3c, 0x35, 0x84, 0xe3, 0x4a, 0xa8, 0x32, 0xf4, 0xd0, 0x78, + 0x9d, 0xf6, 0x98, 0xeb, 0xc8, 0x70, 0xc9, 0x53, 0x3a, 0x58, 0xd5, 0xf2, 0x96, 0x9b, 0x49, 0xb5, + 0xdc, 0x13, 0xa8, 0x75, 0x8d, 0x6d, 0x01, 0x1d, 0x85, 0xbb, 0x38, 0x57, 0xcd, 0x01, 0x47, 0x2c, + 0xe2, 0xf2, 0x44, 0x5e, 0xc3, 0x72, 0xc6, 0xdd, 0xb1, 0x12, 0xf0, 0x18, 0xea, 0xb1, 0x15, 0x4a, + 0x0e, 0x16, 0x65, 0xab, 0xc7, 0x3c, 0x3d, 0x29, 0x46, 0x86, 0xbc, 0xd7, 0xc3, 0x71, 0x40, 0x0d, + 0x6e, 0x45, 0xd4, 0xeb, 0x49, 0xa0, 0x45, 0x19, 0xa0, 0xdd, 0x84, 0x59, 0x37, 0x8b, 0x53, 0xee, + 0x1d, 0x71, 0xea, 0x8d, 0x68, 0x88, 0x8c, 0xde, 0x89, 0x76, 0xf2, 0x3b, 0xef, 0xa5, 0x23, 0x71, + 0xf2, 0x07, 0x82, 0x95, 0xae, 0x73, 0x6d, 0x05, 0x34, 0xb4, 0xec, 0xcc, 0x8d, 0x11, 0xfa, 0x76, + 0x1c, 0x2e, 0x1e, 0x52, 0xa3, 0x42, 0x9b, 0x4e, 0x14, 0xda, 0x87, 0xb0, 0x24, 0x74, 0xa9, 0xd5, + 0x5a, 0xe5, 0xd5, 0x9a, 0x65, 0x94, 0x16, 0xdd, 0x77, 0x08, 0x56, 0x73, 0xcc, 0xfe, 0x4f, 0x4b, + 0xc7, 0x81, 0x95, 0x78, 0xf9, 0xb4, 0xed, 0xbb, 0x34, 0xeb, 0x64, 0x0b, 0xfb, 0x4f, 0xca, 0x5c, + 0x52, 0x14, 0xbe, 0x4b, 0xbc, 0xda, 0xfe, 0xf3, 0x3e, 0x88, 0xe7, 0x3f, 0xfe, 0x14, 0x66, 0x2f, + 0x46, 0xaf, 0x4b, 0xbc, 0x1a, 0xcd, 0xd8, 0xc4, 0x13, 0x5b, 0x5b, 0xcb, 0x23, 0x33, 0x0f, 0x3f, + 0x86, 0xda, 0xd7, 0xd1, 0x4a, 0x86, 0x97, 0xa5, 0x90, 0xba, 0x2c, 0x6a, 0x2b, 0x59, 0xa2, 0xb8, + 0x37, 0x88, 0xe6, 0x7d, 0x7c, 0x4f, 0xdd, 0x34, 0xe2, 0x7b, 0xc9, 0xb5, 0xa0, 0x03, 0x75, 0x53, + 0x7d, 0x15, 0xe2, 0xf5, 0xe8, 0x8d, 0x9f, 0x7a, 0xa0, 0x6a, 0x8d, 0x7c, 0x06, 0xf3, 0xf0, 0xe7, + 0x30, 0xc7, 0x94, 0x07, 0x14, 0x8e, 0x7c, 0x4b, 0x3d, 0xf1, 0xb4, 0xf5, 0x5c, 0x3a, 0xf3, 0xf0, + 0x57, 0xb0, 0x6e, 0xe6, 0xbf, 0x5e, 0xf0, 0xc3, 0x94, 0xd6, 0xec, 0xd3, 0x4a, 0x23, 0xb7, 0x89, + 0x30, 0x0f, 0x9f, 0x02, 0x0e, 0x32, 0xfb, 0x3b, 0x6e, 0xca, 0x9b, 0xb9, 0x6f, 0x13, 0xed, 0xff, + 0x25, 0x5c, 0xe6, 0xe1, 0x0b, 0x68, 0x98, 0x05, 0xcb, 0x21, 0x26, 0x89, 0x3f, 0x4a, 0x72, 0x17, + 0x63, 0xed, 0xfd, 0x5b, 0x65, 0x84, 0xdd, 0x66, 0x66, 0xbb, 0x89, 0xed, 0xce, 0x5d, 0xce, 0x62, + 0xbb, 0x0b, 0xd6, 0xa2, 0x33, 0x58, 0x36, 0xb3, 0xe3, 0x1e, 0xe7, 0xdf, 0x8a, 0xb3, 0xbf, 0x51, + 0xc6, 0x66, 0x1e, 0x7e, 0x06, 0x0b, 0x57, 0xc9, 0xf9, 0x85, 0xa3, 0x7f, 0x8b, 0xb2, 0x63, 0x5c, + 0xd3, 0x8a, 0x58, 0xb1, 0xcb, 0xa9, 0x81, 0xa0, 0xba, 0x9c, 0x9d, 0x51, 0xaa, 0xcb, 0x79, 0x93, + 0xe4, 0x18, 0x96, 0xac, 0x34, 0x46, 0xe2, 0x07, 0x11, 0xac, 0xe5, 0x80, 0xbe, 0xd6, 0x2c, 0x66, + 0x8a, 0xef, 0x99, 0x69, 0xfc, 0x89, 0xbf, 0x97, 0x07, 0x85, 0x5a, 0xb3, 0x98, 0xc9, 0xbc, 0xce, + 0xc2, 0x97, 0xf5, 0x96, 0xf8, 0x27, 0xf1, 0x09, 0xff, 0x7d, 0x35, 0xc3, 0xff, 0x26, 0xfc, 0xf8, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x24, 0x19, 0x44, 0x65, 0x14, 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index c10ae01f9..6ba7c52ba 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -16,7 +16,7 @@ message GroupAddMemberInfo{ message CreateGroupReq{ repeated GroupAddMemberInfo InitMemberList = 1; - open_im_sdk.GroupInfo GroupInfo = 2; + server_api_params.GroupInfo GroupInfo = 2; string OperationID = 3; string OpUserID = 4; //app manager or group owner string OwnerUserID = 5; //owner @@ -24,7 +24,7 @@ message CreateGroupReq{ message CreateGroupResp{ int32 ErrCode = 1; string ErrMsg = 2; - open_im_sdk.GroupInfo GroupInfo = 3; + server_api_params.GroupInfo GroupInfo = 3; } @@ -36,12 +36,12 @@ message GetGroupsInfoReq{ message GetGroupsInfoResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupInfo GroupInfoList = 3; + repeated server_api_params.GroupInfo GroupInfoList = 3; } message SetGroupInfoReq{ - open_im_sdk.GroupInfo GroupInfo = 1; + server_api_params.GroupInfo GroupInfo = 1; string OpUserID = 2; //app manager or group owner string OperationID = 3; } @@ -58,7 +58,7 @@ message GetGroupApplicationListReq { message GetGroupApplicationListResp { int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupRequest GroupRequestList = 3; + repeated server_api_params.GroupRequest GroupRequestList = 3; } @@ -120,7 +120,7 @@ message GetGroupMemberListReq { message GetGroupMemberListResp { int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupMemberFullInfo memberList = 3; + repeated server_api_params.GroupMemberFullInfo memberList = 3; int32 nextSeq = 4; } @@ -135,7 +135,7 @@ message GetGroupMembersInfoReq { message GetGroupMembersInfoResp { int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupMemberFullInfo memberList = 3; + repeated server_api_params.GroupMemberFullInfo memberList = 3; } message KickGroupMemberReq { @@ -166,7 +166,7 @@ message GetJoinedGroupListReq { message GetJoinedGroupListResp{ int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupInfo GroupList = 3; + repeated server_api_params.GroupInfo GroupList = 3; } @@ -192,7 +192,7 @@ message GetGroupAllMemberReq { message GetGroupAllMemberResp { int32 ErrCode = 1; string ErrMsg = 2; - repeated open_im_sdk.GroupMemberFullInfo memberList = 3; + repeated server_api_params.GroupMemberFullInfo memberList = 3; } diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index a785dab20..935b15cee 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_1bc577ef51df0a70, []int{0} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{1} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{2} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{3} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{4} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{5} + return fileDescriptor_ws_1c8466de999dbc0c, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -599,25 +599,25 @@ func (m *BlackInfo) GetEx() string { } type GroupRequest struct { - UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` - GroupID string `protobuf:"bytes,2,opt,name=groupID" json:"groupID,omitempty"` - HandleResult string `protobuf:"bytes,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"` - HandleUserID string `protobuf:"bytes,7,opt,name=handleUserID" json:"handleUserID,omitempty"` - HandleTime uint32 `protobuf:"varint,8,opt,name=handleTime" json:"handleTime,omitempty"` - Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + 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"` + 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"` + HandleUserID string `protobuf:"bytes,7,opt,name=handleUserID" json:"handleUserID,omitempty"` + HandleTime uint32 `protobuf:"varint,8,opt,name=handleTime" json:"handleTime,omitempty"` + Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } 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_1bc577ef51df0a70, []int{6} + return fileDescriptor_ws_1c8466de999dbc0c, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -637,18 +637,18 @@ func (m *GroupRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GroupRequest proto.InternalMessageInfo -func (m *GroupRequest) GetUserID() string { +func (m *GroupRequest) GetUserInfo() *PublicUserInfo { if m != nil { - return m.UserID + return m.UserInfo } - return "" + return nil } -func (m *GroupRequest) GetGroupID() string { +func (m *GroupRequest) GetGroupInfo() *GroupInfo { if m != nil { - return m.GroupID + return m.GroupInfo } - return "" + return nil } func (m *GroupRequest) GetHandleResult() 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_1bc577ef51df0a70, []int{7} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{8} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{9} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{10} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{11} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{12} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{13} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{14} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{15} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{16} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{17} + return fileDescriptor_ws_1c8466de999dbc0c, []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_1bc577ef51df0a70, []int{18} + return fileDescriptor_ws_1c8466de999dbc0c, []int{18} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1605,7 +1605,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{19} + return fileDescriptor_ws_1c8466de999dbc0c, []int{19} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -1660,7 +1660,7 @@ func (m *MemberLeaveTips) Reset() { *m = MemberLeaveTips{} } func (m *MemberLeaveTips) String() string { return proto.CompactTextString(m) } func (*MemberLeaveTips) ProtoMessage() {} func (*MemberLeaveTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{20} + return fileDescriptor_ws_1c8466de999dbc0c, []int{20} } func (m *MemberLeaveTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberLeaveTips.Unmarshal(m, b) @@ -1715,7 +1715,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{21} + return fileDescriptor_ws_1c8466de999dbc0c, []int{21} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -1777,7 +1777,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{22} + return fileDescriptor_ws_1c8466de999dbc0c, []int{22} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -1840,7 +1840,7 @@ func (m *MemberInfoChangedTips) Reset() { *m = MemberInfoChangedTips{} } func (m *MemberInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*MemberInfoChangedTips) ProtoMessage() {} func (*MemberInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{23} + return fileDescriptor_ws_1c8466de999dbc0c, []int{23} } func (m *MemberInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInfoChangedTips.Unmarshal(m, b) @@ -1909,7 +1909,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{24} + return fileDescriptor_ws_1c8466de999dbc0c, []int{24} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1970,7 +1970,7 @@ func (m *GroupInfoChangedTips) Reset() { *m = GroupInfoChangedTips{} } func (m *GroupInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoChangedTips) ProtoMessage() {} func (*GroupInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{25} + return fileDescriptor_ws_1c8466de999dbc0c, []int{25} } func (m *GroupInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoChangedTips.Unmarshal(m, b) @@ -2024,7 +2024,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{26} + return fileDescriptor_ws_1c8466de999dbc0c, []int{26} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -2079,7 +2079,7 @@ func (m *ApplicationProcessedTips) Reset() { *m = ApplicationProcessedTi func (m *ApplicationProcessedTips) String() string { return proto.CompactTextString(m) } func (*ApplicationProcessedTips) ProtoMessage() {} func (*ApplicationProcessedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{27} + return fileDescriptor_ws_1c8466de999dbc0c, []int{27} } func (m *ApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplicationProcessedTips.Unmarshal(m, b) @@ -2140,7 +2140,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{28} + return fileDescriptor_ws_1c8466de999dbc0c, []int{28} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2193,7 +2193,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{29} + return fileDescriptor_ws_1c8466de999dbc0c, []int{29} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2239,7 +2239,7 @@ func (m *FriendApplicationAddedTips) Reset() { *m = FriendApplicationAdd func (m *FriendApplicationAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationAddedTips) ProtoMessage() {} func (*FriendApplicationAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{30} + return fileDescriptor_ws_1c8466de999dbc0c, []int{30} } func (m *FriendApplicationAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationAddedTips.Unmarshal(m, b) @@ -2269,6 +2269,7 @@ func (m *FriendApplicationAddedTips) GetFromToUserID() *FromToUserID { // FromUserID accept or reject ToUserID type FriendApplicationProcessedTips struct { FromToUserID *FromToUserID `protobuf:"bytes,1,opt,name=fromToUserID" json:"fromToUserID,omitempty"` + HandleResult int32 `protobuf:"varint,2,opt,name=handleResult" json:"handleResult,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2278,7 +2279,7 @@ func (m *FriendApplicationProcessedTips) Reset() { *m = FriendApplicatio func (m *FriendApplicationProcessedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationProcessedTips) ProtoMessage() {} func (*FriendApplicationProcessedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{31} + return fileDescriptor_ws_1c8466de999dbc0c, []int{31} } func (m *FriendApplicationProcessedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationProcessedTips.Unmarshal(m, b) @@ -2305,6 +2306,13 @@ func (m *FriendApplicationProcessedTips) GetFromToUserID() *FromToUserID { return nil } +func (m *FriendApplicationProcessedTips) GetHandleResult() int32 { + if m != nil { + return m.HandleResult + } + return 0 +} + // FromUserID Added a friend ToUserID type FriendAddedTips struct { Friend *FriendInfo `protobuf:"bytes,1,opt,name=friend" json:"friend,omitempty"` @@ -2319,7 +2327,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_1bc577ef51df0a70, []int{32} + return fileDescriptor_ws_1c8466de999dbc0c, []int{32} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2372,7 +2380,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_1bc577ef51df0a70, []int{33} + return fileDescriptor_ws_1c8466de999dbc0c, []int{33} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2410,7 +2418,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_1bc577ef51df0a70, []int{34} + return fileDescriptor_ws_1c8466de999dbc0c, []int{34} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -2448,7 +2456,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_1bc577ef51df0a70, []int{35} + return fileDescriptor_ws_1c8466de999dbc0c, []int{35} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -2486,7 +2494,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_1bc577ef51df0a70, []int{36} + return fileDescriptor_ws_1c8466de999dbc0c, []int{36} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -2525,7 +2533,7 @@ func (m *SelfInfoUpdatedTips) Reset() { *m = SelfInfoUpdatedTips{} } func (m *SelfInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*SelfInfoUpdatedTips) ProtoMessage() {} func (*SelfInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_1bc577ef51df0a70, []int{37} + return fileDescriptor_ws_1c8466de999dbc0c, []int{37} } func (m *SelfInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SelfInfoUpdatedTips.Unmarshal(m, b) @@ -2594,133 +2602,135 @@ func init() { proto.RegisterType((*SelfInfoUpdatedTips)(nil), "server_api_params.SelfInfoUpdatedTips") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_1bc577ef51df0a70) } - -var fileDescriptor_ws_1bc577ef51df0a70 = []byte{ - // 1989 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0x57, 0xb7, 0x3f, 0x12, 0x3f, 0xdb, 0x71, 0xa6, 0x67, 0x76, 0xb0, 0xc2, 0x32, 0x84, 0xd6, - 0x6a, 0x89, 0x90, 0x08, 0x52, 0x10, 0x12, 0x2c, 0x12, 0x30, 0x93, 0x2f, 0x66, 0x89, 0x33, 0x51, - 0x67, 0x46, 0xcb, 0x01, 0x69, 0x54, 0x71, 0x97, 0x9d, 0x26, 0xed, 0x2a, 0xbb, 0xba, 0x9c, 0x99, - 0xb9, 0x70, 0xe6, 0xc2, 0x11, 0x8e, 0x5c, 0x11, 0x12, 0x37, 0x84, 0xb8, 0x71, 0xe0, 0xdf, 0xe0, - 0x5f, 0xe0, 0x0a, 0x12, 0x12, 0xd2, 0xa2, 0x7a, 0x55, 0xdd, 0x5d, 0xe5, 0x8f, 0xac, 0x31, 0x11, - 0x7b, 0xd8, 0x9b, 0xdf, 0xaf, 0xeb, 0x7d, 0xbf, 0x7a, 0x55, 0xf5, 0x0c, 0x9d, 0x2c, 0xbe, 0x79, - 0xfd, 0x26, 0xfb, 0xd6, 0x9b, 0x6c, 0x7f, 0x2c, 0xb8, 0xe4, 0xc1, 0x83, 0x8c, 0x8a, 0x5b, 0x2a, - 0x5e, 0x93, 0x71, 0xf2, 0x7a, 0x4c, 0x04, 0x19, 0x65, 0xe1, 0x3f, 0x7c, 0x68, 0x9c, 0x0a, 0x3e, - 0x1d, 0x3f, 0x67, 0x03, 0x1e, 0x74, 0x61, 0x63, 0x88, 0xc4, 0x51, 0xd7, 0xdb, 0xf5, 0xf6, 0x1a, - 0x51, 0x4e, 0x06, 0xef, 0x43, 0x03, 0x7f, 0x9e, 0x93, 0x11, 0xed, 0xfa, 0xf8, 0xad, 0x04, 0x82, - 0x10, 0x5a, 0x8c, 0xcb, 0x64, 0x90, 0xf4, 0x89, 0x4c, 0x38, 0xeb, 0x56, 0x70, 0x81, 0x83, 0xa9, - 0x35, 0x09, 0x93, 0x82, 0xc7, 0xd3, 0x3e, 0xae, 0xa9, 0xea, 0x35, 0x36, 0xa6, 0xf4, 0x0f, 0x48, - 0x9f, 0xbe, 0x8a, 0xce, 0xba, 0x35, 0xad, 0xdf, 0x90, 0xc1, 0x2e, 0x34, 0xf9, 0x1b, 0x46, 0xc5, - 0xab, 0x8c, 0x8a, 0xe7, 0x47, 0xdd, 0x3a, 0x7e, 0xb5, 0xa1, 0xe0, 0x09, 0x40, 0x5f, 0x50, 0x22, - 0xe9, 0xcb, 0x64, 0x44, 0xbb, 0x1b, 0xbb, 0xde, 0x5e, 0x3b, 0xb2, 0x10, 0x25, 0x61, 0x44, 0x47, - 0x57, 0x54, 0x1c, 0xf2, 0x29, 0x93, 0xdd, 0x4d, 0x5c, 0x60, 0x43, 0xc1, 0x16, 0xf8, 0xf4, 0x6d, - 0xb7, 0x81, 0xa2, 0x7d, 0xfa, 0x36, 0x78, 0x0c, 0xf5, 0x4c, 0x12, 0x39, 0xcd, 0xba, 0xb0, 0xeb, - 0xed, 0xd5, 0x22, 0x43, 0x05, 0x1f, 0x40, 0x1b, 0xe5, 0xf2, 0xdc, 0x9a, 0x26, 0xb2, 0xb8, 0x60, - 0x11, 0xb1, 0x97, 0xef, 0xc6, 0xb4, 0xdb, 0x42, 0x01, 0x25, 0x10, 0xfe, 0xd9, 0x87, 0x87, 0x18, - 0xf7, 0x1e, 0x1a, 0x70, 0x32, 0x4d, 0xd3, 0xcf, 0xc8, 0xc0, 0x63, 0xa8, 0x4f, 0xb5, 0x3a, 0x1d, - 0x7e, 0x43, 0x29, 0x3d, 0x82, 0xa7, 0xf4, 0x8c, 0xde, 0xd2, 0x14, 0x03, 0x5f, 0x8b, 0x4a, 0x20, - 0xd8, 0x81, 0xcd, 0x9f, 0xf3, 0x84, 0x61, 0x4c, 0x54, 0xc4, 0x2b, 0x51, 0x41, 0xab, 0x6f, 0x2c, - 0xe9, 0xdf, 0x30, 0x95, 0x52, 0x1d, 0xee, 0x82, 0xb6, 0x33, 0x51, 0x77, 0x33, 0xf1, 0x21, 0x6c, - 0x91, 0xf1, 0xb8, 0x47, 0xd8, 0x90, 0x0a, 0xad, 0x74, 0x03, 0x95, 0xce, 0xa0, 0x2a, 0x1f, 0x4a, - 0xd3, 0x25, 0x9f, 0x8a, 0x3e, 0xc5, 0x70, 0xd7, 0x22, 0x0b, 0x51, 0x72, 0xf8, 0x98, 0x0a, 0x2b, - 0x8c, 0x3a, 0xf2, 0x33, 0xa8, 0xc9, 0x0a, 0xe4, 0x59, 0x09, 0x7f, 0xeb, 0xc1, 0xd6, 0xc5, 0xf4, - 0x2a, 0x4d, 0xfa, 0xb8, 0x40, 0x05, 0xad, 0x0c, 0x8d, 0xe7, 0x84, 0xc6, 0x76, 0xd0, 0x5f, 0xee, - 0x60, 0xc5, 0x75, 0xf0, 0x31, 0xd4, 0x87, 0x94, 0xc5, 0x54, 0x60, 0xc0, 0x6a, 0x91, 0xa1, 0x16, - 0x38, 0x5e, 0x5b, 0xe4, 0x78, 0xf8, 0x1b, 0x1f, 0x36, 0xff, 0xcf, 0xa6, 0xed, 0x42, 0x73, 0x7c, - 0xcd, 0x19, 0x3d, 0x9f, 0xaa, 0x62, 0x32, 0xc9, 0xb4, 0xa1, 0xe0, 0x11, 0xd4, 0xae, 0x12, 0x21, - 0xaf, 0x31, 0x9b, 0xed, 0x48, 0x13, 0x0a, 0xa5, 0x23, 0x92, 0xe8, 0x14, 0x36, 0x22, 0x4d, 0x98, - 0x88, 0x6f, 0x16, 0xfb, 0xc0, 0xdd, 0x59, 0x8d, 0xb9, 0x9d, 0x35, 0x1f, 0x18, 0x58, 0x18, 0x98, - 0x7f, 0x79, 0x00, 0x27, 0x22, 0xa1, 0x2c, 0xc6, 0xd0, 0xcc, 0x6c, 0x69, 0x6f, 0x7e, 0x4b, 0x3f, - 0x86, 0xba, 0xa0, 0x23, 0x22, 0x6e, 0xf2, 0x92, 0xd7, 0xd4, 0x8c, 0x41, 0x95, 0x39, 0x83, 0xbe, - 0x0f, 0x30, 0x40, 0x3d, 0x4a, 0x0e, 0x86, 0xaa, 0x79, 0xf0, 0xe5, 0xfd, 0xb9, 0xe6, 0xb7, 0x9f, - 0x67, 0x29, 0xb2, 0x96, 0xab, 0xfd, 0x44, 0xe2, 0xd8, 0x94, 0xad, 0xce, 0x70, 0x09, 0x2c, 0xa8, - 0xda, 0xfa, 0x1d, 0x55, 0xbb, 0x51, 0x54, 0xed, 0xdf, 0x3d, 0x68, 0x3c, 0x4b, 0x49, 0xff, 0x66, - 0x45, 0xd7, 0x5d, 0x17, 0xfd, 0x39, 0x17, 0x4f, 0xa1, 0x7d, 0xa5, 0xc4, 0xe5, 0x2e, 0x60, 0x14, - 0x9a, 0x07, 0x5f, 0x5b, 0xe0, 0xa5, 0xbb, 0x59, 0x22, 0x97, 0xcf, 0x75, 0xb7, 0xfa, 0xd9, 0xee, - 0xd6, 0xee, 0x70, 0xb7, 0x5e, 0xb8, 0xfb, 0x4b, 0x1f, 0x5a, 0xd8, 0xde, 0x22, 0x3a, 0x99, 0xd2, - 0x4c, 0x2e, 0xdd, 0x07, 0x56, 0xbf, 0xf3, 0xdd, 0x7e, 0x17, 0x42, 0xeb, 0x9a, 0xb0, 0x38, 0xa5, - 0x11, 0xcd, 0xa6, 0xa9, 0xcc, 0xcf, 0x14, 0x1b, 0xd3, 0x05, 0x32, 0xe9, 0x65, 0x43, 0x73, 0x9a, - 0x18, 0x4a, 0x39, 0xa5, 0xd7, 0xa9, 0x4f, 0xda, 0xe2, 0x12, 0x50, 0x3a, 0x05, 0x9d, 0x60, 0x60, - 0xf5, 0x6e, 0xc8, 0xc9, 0x52, 0xa7, 0x71, 0x76, 0xc3, 0xd6, 0x59, 0x66, 0x46, 0xd3, 0x28, 0x40, - 0x1f, 0x23, 0x16, 0x32, 0x7b, 0x8a, 0x84, 0x7f, 0xab, 0x40, 0x5b, 0x57, 0x7d, 0x1e, 0x8b, 0x27, - 0xaa, 0x3c, 0xf9, 0xc8, 0x49, 0xbe, 0x85, 0x28, 0x2b, 0x14, 0x75, 0xee, 0xf6, 0x07, 0x07, 0x53, - 0x15, 0xa4, 0xe8, 0x13, 0xa7, 0x4f, 0xd8, 0x50, 0xae, 0xe5, 0xd4, 0xee, 0x17, 0x16, 0xa2, 0x3a, - 0x90, 0xe4, 0x4e, 0x52, 0x0b, 0x5a, 0xf1, 0x4a, 0x5e, 0xe8, 0xd7, 0x69, 0xb5, 0x10, 0x15, 0x5f, - 0xc9, 0x73, 0xdd, 0x3a, 0x48, 0x25, 0xa0, 0x25, 0x1b, 0xbd, 0xba, 0xef, 0x17, 0xf4, 0x5c, 0x56, - 0x1b, 0xf8, 0x7d, 0x59, 0x56, 0xc1, 0xc9, 0xaa, 0xbb, 0x27, 0x9a, 0x73, 0x7b, 0xe2, 0x03, 0x68, - 0x6b, 0x39, 0x79, 0xad, 0xb6, 0xf4, 0xb9, 0xec, 0x80, 0x6e, 0x6d, 0xb4, 0x67, 0x6b, 0xc3, 0xcd, - 0xee, 0xd6, 0x92, 0xec, 0x76, 0xec, 0x42, 0xef, 0x5e, 0x4c, 0xd3, 0xb4, 0x47, 0xb3, 0x8c, 0x0c, - 0xe9, 0xb3, 0x77, 0x97, 0x74, 0x72, 0x96, 0x64, 0x32, 0xa2, 0xd9, 0x58, 0x15, 0x1a, 0x15, 0xe2, - 0x90, 0xc7, 0x14, 0xb3, 0x5c, 0x8b, 0x72, 0x52, 0xb9, 0x48, 0x85, 0x50, 0x16, 0x98, 0xce, 0xa6, - 0x29, 0x85, 0x8f, 0xc8, 0xdb, 0x4b, 0x3a, 0xc1, 0x8c, 0x56, 0x22, 0x43, 0x21, 0x9e, 0x30, 0x85, - 0x57, 0x0d, 0x8e, 0x54, 0x70, 0x0c, 0xed, 0x2c, 0x61, 0x43, 0x5d, 0x9c, 0xba, 0xd8, 0x2b, 0x7b, - 0xcd, 0x83, 0xaf, 0x2e, 0x68, 0x03, 0xa7, 0x44, 0x5e, 0x53, 0x71, 0xc2, 0xc5, 0x88, 0xc8, 0xc8, - 0xe5, 0x0a, 0x0e, 0xa1, 0x85, 0xdb, 0x2e, 0x97, 0x52, 0x5f, 0x4d, 0x8a, 0xc3, 0x14, 0x8e, 0xe0, - 0x4b, 0x8b, 0x23, 0x31, 0x59, 0xba, 0xfb, 0x55, 0x1f, 0xc4, 0x46, 0x92, 0x70, 0x56, 0x74, 0x00, - 0x1b, 0x52, 0x21, 0xcc, 0xb4, 0x9c, 0x6e, 0x65, 0xb7, 0xb2, 0x57, 0x89, 0x72, 0x32, 0xfc, 0x85, - 0xba, 0x06, 0x14, 0xea, 0xee, 0xd2, 0xb2, 0x03, 0x9b, 0x19, 0x9d, 0x3c, 0xa3, 0xc3, 0x84, 0xa1, - 0x8a, 0x4a, 0x54, 0xd0, 0x78, 0xc7, 0xa3, 0x93, 0x63, 0x16, 0xe7, 0x01, 0xd7, 0xd4, 0xac, 0x65, - 0xd5, 0x39, 0xcb, 0xc2, 0x4f, 0x3d, 0xe8, 0x38, 0x06, 0x7c, 0xe1, 0x12, 0xfe, 0x08, 0x82, 0x53, - 0x2a, 0x7b, 0xe4, 0xed, 0x53, 0x16, 0xf7, 0xd0, 0xbc, 0x88, 0x4e, 0xc2, 0x63, 0x78, 0x38, 0x87, - 0x66, 0x63, 0xcb, 0x51, 0x6f, 0x89, 0xa3, 0xbe, 0xed, 0x68, 0x78, 0x0e, 0x2d, 0x5b, 0xb5, 0xda, - 0x78, 0x49, 0x6c, 0x12, 0xeb, 0x27, 0x71, 0xb0, 0x0f, 0xd5, 0x54, 0x55, 0x85, 0x8f, 0x96, 0xef, - 0x2c, 0xb0, 0xbc, 0x97, 0x0d, 0x8f, 0x88, 0x24, 0x11, 0xae, 0x0b, 0x27, 0xd0, 0x51, 0x76, 0x5f, - 0x52, 0x16, 0xf7, 0xb2, 0x21, 0x9a, 0xb4, 0x0b, 0x4d, 0xcd, 0xd5, 0xcb, 0x86, 0xe5, 0x29, 0x6c, - 0x41, 0x6a, 0x45, 0x3f, 0x4d, 0x28, 0x93, 0x7a, 0x85, 0xa9, 0x4f, 0x0b, 0xd2, 0xb5, 0xc5, 0xe2, - 0xe2, 0x22, 0x82, 0xb5, 0xa5, 0xe9, 0xf0, 0xaf, 0x35, 0xd8, 0x30, 0x46, 0xe8, 0x3a, 0x63, 0x71, - 0x59, 0x9b, 0x9a, 0xd2, 0xbd, 0xae, 0x7f, 0x5b, 0xde, 0xea, 0x35, 0x65, 0x9f, 0x8b, 0x15, 0xf7, - 0x5c, 0x9c, 0xb1, 0xa9, 0x3a, 0x6f, 0xd3, 0x8c, 0x5f, 0xb5, 0x79, 0xbf, 0xbe, 0x01, 0xdb, 0x19, - 0xf6, 0xe3, 0x8b, 0x94, 0xc8, 0x01, 0x17, 0x23, 0x73, 0x8f, 0xa9, 0x45, 0x73, 0xb8, 0xba, 0x02, - 0x68, 0xac, 0x38, 0x0f, 0x74, 0xc3, 0x9f, 0x41, 0x55, 0xf7, 0xd5, 0x48, 0x7e, 0x2e, 0xe8, 0x0b, - 0xa4, 0x0b, 0x6a, 0xdb, 0xb2, 0x2c, 0xe1, 0x0c, 0xdf, 0x45, 0xba, 0xfd, 0xdb, 0x90, 0xf2, 0x7c, - 0x94, 0x0d, 0x4f, 0x04, 0x1f, 0x99, 0x6b, 0x64, 0x4e, 0xa2, 0xe7, 0x9c, 0x49, 0xca, 0x24, 0xf2, - 0x36, 0x35, 0xaf, 0x05, 0x29, 0x5e, 0x43, 0x62, 0xef, 0x6f, 0x45, 0x39, 0xa9, 0xba, 0xfe, 0x80, - 0x8b, 0x3e, 0xc5, 0x4e, 0xd2, 0xde, 0xad, 0xa8, 0xae, 0x5f, 0x00, 0xc1, 0x36, 0x54, 0x32, 0x3a, - 0xc1, 0x76, 0x5f, 0x89, 0xd4, 0x4f, 0x27, 0xaf, 0x1d, 0x37, 0xaf, 0x33, 0xe7, 0xd0, 0x36, 0x7e, - 0xb5, 0xcf, 0xa1, 0xa7, 0xb0, 0xc1, 0xc7, 0xaa, 0x4b, 0x64, 0xdd, 0x07, 0x58, 0x9d, 0x5f, 0x5f, - 0x5e, 0x9d, 0xfb, 0x2f, 0xf4, 0xca, 0x63, 0x26, 0xc5, 0xbb, 0x28, 0xe7, 0x0b, 0xce, 0xa0, 0xc3, - 0x07, 0x83, 0x34, 0x61, 0xf4, 0x62, 0x9a, 0x5d, 0xe3, 0x05, 0x2f, 0xc0, 0x0b, 0x5e, 0xb8, 0x40, - 0xd4, 0x0b, 0x77, 0x65, 0x34, 0xcb, 0xba, 0xf3, 0x11, 0xb4, 0x6c, 0x35, 0xca, 0xdd, 0x1b, 0xfa, - 0xce, 0x54, 0xa2, 0xfa, 0xa9, 0x1e, 0x02, 0xb7, 0x24, 0x9d, 0xea, 0xbb, 0xc6, 0x66, 0xa4, 0x89, - 0x8f, 0xfc, 0xef, 0x7a, 0xe1, 0xaf, 0x3d, 0xe8, 0xcc, 0x28, 0x50, 0xab, 0x65, 0x22, 0x53, 0x6a, - 0x24, 0x68, 0x22, 0x08, 0xa0, 0x1a, 0xd3, 0xac, 0x6f, 0x0a, 0x19, 0x7f, 0x9b, 0xe3, 0xb2, 0x52, - 0x3c, 0x25, 0x42, 0x68, 0x25, 0x2f, 0x2e, 0x95, 0xa0, 0x4b, 0x3e, 0x65, 0x71, 0x31, 0x04, 0xb0, - 0x30, 0x55, 0x48, 0xc9, 0x8b, 0xcb, 0x67, 0x24, 0x1e, 0x52, 0xfd, 0x54, 0xaf, 0xa1, 0x4d, 0x2e, - 0x18, 0x1e, 0xc1, 0xe6, 0xcb, 0x64, 0x9c, 0x1d, 0xf2, 0xd1, 0x48, 0x6d, 0xa2, 0x98, 0x4a, 0xf5, - 0x8e, 0xf1, 0x30, 0xeb, 0x86, 0x52, 0x05, 0x13, 0xd3, 0x01, 0x99, 0xa6, 0x52, 0x2d, 0xcd, 0xb7, - 0xaf, 0x05, 0x85, 0x7f, 0xf2, 0xa0, 0xa3, 0x5f, 0xe0, 0xc7, 0x4c, 0x52, 0xa1, 0xb0, 0xe0, 0x00, - 0x6a, 0xb8, 0xd7, 0x50, 0x58, 0xf3, 0xe0, 0xfd, 0x45, 0x4d, 0x31, 0x9f, 0x98, 0x44, 0x7a, 0x69, - 0xf0, 0x63, 0x68, 0x52, 0x26, 0x05, 0x61, 0x12, 0x9f, 0x1c, 0x3e, 0x72, 0x7e, 0xb8, 0x8c, 0xd3, - 0x7d, 0xf3, 0x47, 0x36, 0xab, 0xf2, 0xbe, 0x38, 0x65, 0xac, 0xae, 0xe2, 0x82, 0xe1, 0x1f, 0x0b, - 0xbb, 0xcf, 0x28, 0xb9, 0xa5, 0x6b, 0xdb, 0x7d, 0x02, 0x90, 0x2a, 0x01, 0x62, 0x0d, 0xb3, 0x2d, - 0xce, 0x15, 0xad, 0xfe, 0xd4, 0x83, 0x07, 0x5a, 0xc8, 0x73, 0x76, 0x9b, 0x48, 0x1a, 0xaf, 0x6d, - 0xf7, 0x0f, 0xa0, 0xce, 0xc7, 0x6b, 0xd8, 0x6c, 0xb8, 0x82, 0x0b, 0xe8, 0x24, 0xda, 0x04, 0x45, - 0x16, 0xd7, 0x8b, 0xd5, 0x05, 0xcd, 0xb2, 0xcf, 0x47, 0xa0, 0xba, 0x28, 0x02, 0xff, 0xf6, 0x60, - 0x5b, 0x4b, 0xfa, 0x49, 0xd2, 0xbf, 0xf9, 0x1c, 0x03, 0x70, 0x0e, 0x5b, 0x37, 0x68, 0xc1, 0x9a, - 0xfe, 0xcf, 0x70, 0xaf, 0xe8, 0xfe, 0xaf, 0x7c, 0x78, 0x2f, 0x2f, 0x80, 0x01, 0x3f, 0xbc, 0x26, - 0x6c, 0x68, 0x62, 0xa0, 0x7a, 0x2a, 0x92, 0xd8, 0xda, 0xf5, 0xe5, 0xc9, 0x42, 0xfe, 0x67, 0x7f, - 0x8f, 0xa0, 0x31, 0x48, 0x18, 0x49, 0xad, 0xb7, 0xf2, 0xaa, 0x22, 0x4a, 0x46, 0x75, 0x2a, 0x8c, - 0xa6, 0xa6, 0xef, 0x9b, 0x69, 0x5a, 0x4e, 0x97, 0x59, 0xac, 0xad, 0x9c, 0xc5, 0xf0, 0x9f, 0x1e, - 0x6c, 0x23, 0x78, 0x88, 0xa7, 0xc7, 0xfa, 0xe5, 0xf0, 0x23, 0xd8, 0x30, 0xd3, 0xc7, 0xff, 0x32, - 0x3e, 0x39, 0x9b, 0xea, 0x04, 0x7a, 0x16, 0xba, 0x46, 0x31, 0x58, 0x9c, 0x2b, 0x16, 0xc2, 0x1f, - 0x3c, 0x78, 0x54, 0x38, 0x61, 0xd7, 0x81, 0x3a, 0xe3, 0x0d, 0x59, 0x16, 0x82, 0x0d, 0x95, 0xe1, - 0xf1, 0xd7, 0xd9, 0x2d, 0x95, 0x75, 0xaa, 0x27, 0xfc, 0x9d, 0x07, 0xdd, 0x8f, 0x79, 0xc2, 0x70, - 0xcd, 0xd3, 0xf1, 0x38, 0x35, 0x43, 0xed, 0xb5, 0xf3, 0xf5, 0x43, 0x68, 0x10, 0x2d, 0x86, 0x49, - 0xe3, 0xc8, 0x0a, 0xa3, 0x9b, 0x92, 0x47, 0xdf, 0x1b, 0x49, 0x56, 0xcc, 0xda, 0x0d, 0x15, 0xfe, - 0xc5, 0x83, 0xae, 0x65, 0xe0, 0x85, 0xe0, 0x7d, 0x9a, 0x65, 0x9f, 0x63, 0xa3, 0x41, 0x43, 0x8b, - 0x01, 0x4e, 0x2d, 0x32, 0x94, 0xe5, 0x40, 0xd5, 0x71, 0xe0, 0x06, 0x1e, 0xe8, 0x69, 0x89, 0xe5, - 0x85, 0xba, 0xd7, 0x91, 0x58, 0x5f, 0xc6, 0xf4, 0xeb, 0x21, 0x27, 0xdd, 0xf1, 0x95, 0xf9, 0x5f, - 0xa2, 0x1c, 0x5f, 0x3d, 0x01, 0x20, 0x71, 0xfc, 0x09, 0x17, 0x71, 0xc2, 0x86, 0x26, 0x52, 0x16, - 0x12, 0x7e, 0x0c, 0x2d, 0x75, 0xb3, 0x7c, 0x69, 0xcd, 0x3d, 0xee, 0x9c, 0xcc, 0xd8, 0x33, 0x13, - 0xdf, 0x9d, 0x99, 0x84, 0x04, 0x76, 0xe6, 0x0c, 0x7f, 0x1a, 0xc7, 0x26, 0xf4, 0x87, 0x7a, 0xa6, - 0x93, 0x6b, 0x32, 0x19, 0x58, 0xf4, 0xe0, 0xb2, 0x0d, 0x8a, 0x1c, 0xa6, 0x90, 0xc2, 0x93, 0x39, - 0x15, 0x6e, 0x86, 0xef, 0x45, 0xcd, 0xef, 0x3d, 0xe8, 0x18, 0x3d, 0x85, 0xfd, 0xdf, 0x81, 0xba, - 0x9e, 0x91, 0x1a, 0x91, 0x5f, 0x59, 0x28, 0x32, 0x9f, 0xed, 0x46, 0x66, 0xf1, 0x7c, 0x37, 0xf0, - 0x17, 0x74, 0x83, 0xe0, 0x7b, 0x33, 0xdb, 0x73, 0x85, 0xad, 0x90, 0xef, 0xcc, 0x9f, 0xe6, 0xe5, - 0x72, 0x44, 0x53, 0x2a, 0xef, 0x33, 0x0a, 0xaf, 0x60, 0x0b, 0x07, 0xb6, 0xf7, 0x9c, 0xc3, 0x4f, - 0x60, 0x1b, 0xc5, 0xde, 0xbb, 0xbd, 0x3f, 0x83, 0xf7, 0xca, 0x04, 0xd8, 0x2d, 0xf5, 0x5e, 0xa4, - 0x7f, 0x13, 0x1e, 0x5e, 0xd2, 0x74, 0xa0, 0x64, 0xbf, 0x1a, 0xc7, 0xc5, 0x59, 0xb5, 0x64, 0xe4, - 0x72, 0x55, 0xc7, 0x3f, 0x1c, 0xbf, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x60, 0xab, - 0x3f, 0x83, 0x1c, 0x00, 0x00, +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_1c8466de999dbc0c) } + +var fileDescriptor_ws_1c8466de999dbc0c = []byte{ + // 2018 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0xcd, 0x6f, 0x1c, 0x49, + 0x15, 0x57, 0xf7, 0x7c, 0xd8, 0xf3, 0x66, 0xc6, 0xe3, 0x74, 0xb2, 0x61, 0x14, 0x96, 0x60, 0x5a, + 0xab, 0xc5, 0x42, 0xc2, 0x48, 0x41, 0x48, 0x10, 0xc4, 0x47, 0xe2, 0x8f, 0x90, 0xc5, 0xe3, 0x58, + 0xed, 0x44, 0xcb, 0x01, 0x29, 0x2a, 0x4f, 0xd7, 0x8c, 0x1b, 0xf7, 0x54, 0xf5, 0x54, 0x77, 0x3b, + 0xc9, 0x85, 0x33, 0x1c, 0x38, 0xc2, 0x91, 0x2b, 0x42, 0xe2, 0x86, 0x10, 0x37, 0x0e, 0xfc, 0x07, + 0x9c, 0xf9, 0x17, 0xb8, 0x82, 0x84, 0x84, 0xb4, 0xa8, 0x5e, 0x55, 0x77, 0x57, 0x4d, 0x8f, 0xbd, + 0xc3, 0x60, 0xb1, 0x07, 0x6e, 0xf3, 0x7e, 0x5d, 0xef, 0xfb, 0xd5, 0xab, 0xaa, 0x37, 0x30, 0x48, + 0xc3, 0xcb, 0xd7, 0x6f, 0xd2, 0xaf, 0xbd, 0x49, 0xf7, 0x12, 0xc1, 0x33, 0xee, 0xdd, 0x49, 0xa9, + 0xb8, 0xa2, 0xe2, 0x35, 0x49, 0xa2, 0xd7, 0x09, 0x11, 0x64, 0x96, 0xfa, 0x7f, 0x77, 0xa1, 0xf3, + 0x4c, 0xf0, 0x3c, 0x79, 0xce, 0x26, 0xdc, 0x1b, 0xc2, 0xc6, 0x14, 0x89, 0x83, 0xa1, 0xb3, 0xe3, + 0xec, 0x76, 0x82, 0x82, 0xf4, 0xde, 0x87, 0x0e, 0xfe, 0x3c, 0x21, 0x33, 0x3a, 0x74, 0xf1, 0x5b, + 0x05, 0x78, 0x3e, 0xf4, 0x18, 0xcf, 0xa2, 0x49, 0x34, 0x26, 0x59, 0xc4, 0xd9, 0xb0, 0x81, 0x0b, + 0x2c, 0x4c, 0xae, 0x89, 0x58, 0x26, 0x78, 0x98, 0x8f, 0x71, 0x4d, 0x53, 0xad, 0x31, 0x31, 0xa9, + 0x7f, 0x42, 0xc6, 0xf4, 0x55, 0x70, 0x3c, 0x6c, 0x29, 0xfd, 0x9a, 0xf4, 0x76, 0xa0, 0xcb, 0xdf, + 0x30, 0x2a, 0x5e, 0xa5, 0x54, 0x3c, 0x3f, 0x18, 0xb6, 0xf1, 0xab, 0x09, 0x79, 0x0f, 0x01, 0xc6, + 0x82, 0x92, 0x8c, 0xbe, 0x8c, 0x66, 0x74, 0xb8, 0xb1, 0xe3, 0xec, 0xf6, 0x03, 0x03, 0x91, 0x12, + 0x66, 0x74, 0x76, 0x4e, 0xc5, 0x3e, 0xcf, 0x59, 0x36, 0xdc, 0xc4, 0x05, 0x26, 0xe4, 0x6d, 0x81, + 0x4b, 0xdf, 0x0e, 0x3b, 0x28, 0xda, 0xa5, 0x6f, 0xbd, 0xfb, 0xd0, 0x4e, 0x33, 0x92, 0xe5, 0xe9, + 0x10, 0x76, 0x9c, 0xdd, 0x56, 0xa0, 0x29, 0xef, 0x03, 0xe8, 0xa3, 0x5c, 0x5e, 0x58, 0xd3, 0x45, + 0x16, 0x1b, 0x2c, 0x23, 0xf6, 0xf2, 0x5d, 0x42, 0x87, 0x3d, 0x14, 0x50, 0x01, 0xfe, 0x1f, 0x5d, + 0xb8, 0x8b, 0x71, 0x1f, 0xa1, 0x01, 0x47, 0x79, 0x1c, 0x7f, 0x4a, 0x06, 0xee, 0x43, 0x3b, 0x57, + 0xea, 0x54, 0xf8, 0x35, 0x25, 0xf5, 0x08, 0x1e, 0xd3, 0x63, 0x7a, 0x45, 0x63, 0x0c, 0x7c, 0x2b, + 0xa8, 0x00, 0xef, 0x01, 0x6c, 0xfe, 0x84, 0x47, 0x0c, 0x63, 0x22, 0x23, 0xde, 0x08, 0x4a, 0x5a, + 0x7e, 0x63, 0xd1, 0xf8, 0x92, 0xc9, 0x94, 0xaa, 0x70, 0x97, 0xb4, 0x99, 0x89, 0xb6, 0x9d, 0x89, + 0x0f, 0x61, 0x8b, 0x24, 0xc9, 0x88, 0xb0, 0x29, 0x15, 0x4a, 0xe9, 0x06, 0x2a, 0x5d, 0x40, 0x65, + 0x3e, 0xa4, 0xa6, 0x33, 0x9e, 0x8b, 0x31, 0xc5, 0x70, 0xb7, 0x02, 0x03, 0x91, 0x72, 0x78, 0x42, + 0x85, 0x11, 0x46, 0x15, 0xf9, 0x05, 0x54, 0x67, 0x05, 0x8a, 0xac, 0xf8, 0xbf, 0x76, 0x60, 0xeb, + 0x34, 0x3f, 0x8f, 0xa3, 0x31, 0x2e, 0x90, 0x41, 0xab, 0x42, 0xe3, 0x58, 0xa1, 0x31, 0x1d, 0x74, + 0xaf, 0x77, 0xb0, 0x61, 0x3b, 0x78, 0x1f, 0xda, 0x53, 0xca, 0x42, 0x2a, 0x30, 0x60, 0xad, 0x40, + 0x53, 0x4b, 0x1c, 0x6f, 0x2d, 0x73, 0xdc, 0xff, 0x95, 0x0b, 0x9b, 0xff, 0x63, 0xd3, 0x76, 0xa0, + 0x9b, 0x5c, 0x70, 0x46, 0x4f, 0x72, 0x59, 0x4c, 0x3a, 0x99, 0x26, 0xe4, 0xdd, 0x83, 0xd6, 0x79, + 0x24, 0xb2, 0x0b, 0xcc, 0x66, 0x3f, 0x50, 0x84, 0x44, 0xe9, 0x8c, 0x44, 0x2a, 0x85, 0x9d, 0x40, + 0x11, 0x3a, 0xe2, 0x9b, 0xe5, 0x3e, 0xb0, 0x77, 0x56, 0xa7, 0xb6, 0xb3, 0xea, 0x81, 0x81, 0xa5, + 0x81, 0xf9, 0xa7, 0x03, 0x70, 0x24, 0x22, 0xca, 0x42, 0x0c, 0xcd, 0xc2, 0x96, 0x76, 0xea, 0x5b, + 0xfa, 0x3e, 0xb4, 0x05, 0x9d, 0x11, 0x71, 0x59, 0x94, 0xbc, 0xa2, 0x16, 0x0c, 0x6a, 0xd4, 0x0c, + 0xfa, 0x36, 0xc0, 0x04, 0xf5, 0x48, 0x39, 0x18, 0xaa, 0xee, 0xa3, 0xcf, 0xef, 0xd5, 0x9a, 0xdf, + 0x5e, 0x91, 0xa5, 0xc0, 0x58, 0x2e, 0xf7, 0x13, 0x09, 0x43, 0x5d, 0xb6, 0x2a, 0xc3, 0x15, 0xb0, + 0xa4, 0x6a, 0xdb, 0x37, 0x54, 0xed, 0x46, 0x59, 0xb5, 0x7f, 0x73, 0xa0, 0xf3, 0x34, 0x26, 0xe3, + 0xcb, 0x15, 0x5d, 0xb7, 0x5d, 0x74, 0x6b, 0x2e, 0x3e, 0x83, 0xfe, 0xb9, 0x14, 0x57, 0xb8, 0x80, + 0x51, 0xe8, 0x3e, 0xfa, 0xd2, 0x12, 0x2f, 0xed, 0xcd, 0x12, 0xd8, 0x7c, 0xb6, 0xbb, 0xcd, 0x4f, + 0x77, 0xb7, 0x75, 0x83, 0xbb, 0xed, 0xd2, 0xdd, 0xbf, 0xb8, 0xd0, 0xc3, 0xf6, 0x16, 0xd0, 0x79, + 0x4e, 0xd3, 0xcc, 0xfb, 0x0e, 0x6c, 0xe6, 0x85, 0xa9, 0xce, 0xaa, 0xa6, 0x96, 0x2c, 0xde, 0x63, + 0xdd, 0x4c, 0x91, 0xdf, 0x45, 0xfe, 0xf7, 0x97, 0xf0, 0x97, 0x27, 0x59, 0x50, 0x2d, 0x97, 0x07, + 0xcf, 0x05, 0x61, 0x61, 0x4c, 0x03, 0x9a, 0xe6, 0x71, 0x56, 0x1c, 0x4e, 0x26, 0xa6, 0x2a, 0x6d, + 0x3e, 0x4a, 0xa7, 0xfa, 0x58, 0xd2, 0x94, 0x8c, 0x8e, 0x5a, 0x27, 0x3f, 0x29, 0xd7, 0x2b, 0x40, + 0x6e, 0x54, 0x41, 0xe7, 0x98, 0x21, 0xb5, 0xad, 0x0a, 0xb2, 0xd2, 0xa9, 0xa3, 0xb6, 0x61, 0xea, + 0xac, 0x52, 0xac, 0x68, 0x14, 0xa0, 0xce, 0x23, 0x03, 0x59, 0x3c, 0x8e, 0xfc, 0xbf, 0x36, 0xa0, + 0xaf, 0xb6, 0x4f, 0x11, 0xd4, 0x87, 0xb2, 0xce, 0xf9, 0xcc, 0xaa, 0x22, 0x03, 0x91, 0x56, 0x48, + 0xea, 0xc4, 0x6e, 0x34, 0x16, 0x26, 0x4b, 0x51, 0xd2, 0x47, 0x56, 0xc3, 0x31, 0xa1, 0x42, 0xcb, + 0x33, 0xb3, 0xf1, 0x18, 0x88, 0x6c, 0x65, 0x19, 0xb7, 0xaa, 0xa3, 0xa4, 0x25, 0x6f, 0xc6, 0x4b, + 0xfd, 0xaa, 0x3e, 0x0c, 0x44, 0xc6, 0x37, 0xe3, 0x85, 0x6e, 0x15, 0xa4, 0x0a, 0x50, 0x92, 0xb5, + 0x5e, 0x75, 0x80, 0x94, 0x74, 0x2d, 0xab, 0x1d, 0xfc, 0x7e, 0x5d, 0x56, 0xc1, 0xca, 0xaa, 0xbd, + 0xb9, 0xba, 0xb5, 0xcd, 0xf5, 0x01, 0xf4, 0x95, 0x9c, 0xa2, 0xe8, 0x7b, 0xea, 0x80, 0xb7, 0x40, + 0xbb, 0x36, 0xfa, 0x8b, 0xb5, 0x61, 0x67, 0x77, 0xeb, 0x9a, 0xec, 0x0e, 0xca, 0xec, 0xfe, 0xcc, + 0x85, 0xe1, 0x69, 0x1e, 0xc7, 0x23, 0x9a, 0xa6, 0x64, 0x4a, 0x9f, 0xbe, 0x3b, 0xa3, 0xf3, 0xe3, + 0x28, 0xcd, 0x02, 0x9a, 0x26, 0xb2, 0xd0, 0xa8, 0x10, 0xfb, 0x3c, 0xa4, 0x98, 0xe5, 0x56, 0x50, + 0x90, 0xd2, 0x45, 0x2a, 0x84, 0xb4, 0x40, 0xb7, 0x48, 0x45, 0x49, 0x7c, 0x46, 0xde, 0x9e, 0xd1, + 0x39, 0x66, 0xb4, 0x11, 0x68, 0x0a, 0xf1, 0x88, 0x49, 0xbc, 0xa9, 0x71, 0xa4, 0xbc, 0x43, 0xe8, + 0xa7, 0x11, 0x9b, 0xaa, 0xe2, 0x54, 0xc5, 0xde, 0xd8, 0xed, 0x3e, 0xfa, 0xe2, 0xb2, 0x4d, 0x46, + 0xb2, 0x0b, 0x2a, 0x8e, 0xb8, 0x98, 0x91, 0x2c, 0xb0, 0xb9, 0xbc, 0x7d, 0xe8, 0xe1, 0xc6, 0x2b, + 0xa4, 0xb4, 0x57, 0x93, 0x62, 0x31, 0xf9, 0x33, 0xf8, 0xdc, 0xf2, 0x48, 0xcc, 0xaf, 0x3d, 0x4e, + 0x65, 0x43, 0xc5, 0x8e, 0x14, 0x71, 0x56, 0xde, 0x90, 0x4c, 0x48, 0x86, 0x30, 0x55, 0x72, 0x86, + 0x8d, 0x9d, 0xc6, 0x6e, 0x23, 0x28, 0x48, 0xff, 0xa7, 0xf2, 0x3e, 0x51, 0xaa, 0xbb, 0x49, 0xcb, + 0x03, 0xd8, 0x4c, 0xe9, 0xfc, 0x29, 0x9d, 0x46, 0x0c, 0x55, 0x34, 0x82, 0x92, 0xc6, 0xcb, 0x22, + 0x9d, 0x1f, 0xb2, 0xb0, 0x08, 0xb8, 0xa2, 0x16, 0x2d, 0x6b, 0xd6, 0x2c, 0xf3, 0x3f, 0x71, 0x60, + 0x60, 0x19, 0xf0, 0x7f, 0x97, 0xf0, 0x7b, 0xe0, 0x3d, 0xa3, 0xd9, 0x88, 0xbc, 0x7d, 0xc2, 0xc2, + 0x11, 0x9a, 0x17, 0xd0, 0xb9, 0x7f, 0x08, 0x77, 0x6b, 0x68, 0x9a, 0x18, 0x8e, 0x3a, 0xd7, 0x38, + 0xea, 0x9a, 0x8e, 0xfa, 0x27, 0xd0, 0x33, 0x55, 0xcb, 0x8d, 0x17, 0x85, 0x3a, 0xb1, 0x6e, 0x14, + 0x7a, 0x7b, 0xd0, 0x8c, 0x65, 0x55, 0xb8, 0x68, 0xf9, 0x83, 0x25, 0x96, 0x8f, 0xd2, 0xe9, 0x01, + 0xc9, 0x48, 0x80, 0xeb, 0xfc, 0x39, 0x0c, 0xa4, 0xdd, 0x67, 0x94, 0x85, 0xa3, 0x74, 0x8a, 0x26, + 0xed, 0x40, 0x57, 0x71, 0x8d, 0xd2, 0x69, 0x75, 0x9c, 0x1b, 0x90, 0x5c, 0x31, 0x8e, 0x23, 0xca, + 0x32, 0xb5, 0x42, 0xd7, 0xa7, 0x01, 0xa9, 0xda, 0x62, 0x61, 0x79, 0xa3, 0xc1, 0xda, 0x52, 0xb4, + 0xff, 0xe7, 0x16, 0x6c, 0x68, 0x23, 0x54, 0x9d, 0xb1, 0xb0, 0xaa, 0x4d, 0x45, 0xa9, 0x5e, 0x37, + 0xbe, 0xaa, 0x9e, 0x07, 0x8a, 0x32, 0x1f, 0x14, 0x0d, 0xfb, 0x41, 0xb1, 0x60, 0x53, 0xb3, 0x6e, + 0xd3, 0x82, 0x5f, 0xad, 0xba, 0x5f, 0x5f, 0x81, 0xed, 0x14, 0xfb, 0xf1, 0x69, 0x4c, 0xb2, 0x09, + 0x17, 0x33, 0x7d, 0x21, 0x6a, 0x05, 0x35, 0x5c, 0xde, 0x25, 0x14, 0x56, 0x9e, 0x07, 0xaa, 0xe1, + 0x2f, 0xa0, 0xb2, 0xfb, 0x2a, 0xa4, 0x38, 0x17, 0xd4, 0x4d, 0xd4, 0x06, 0x95, 0x6d, 0x69, 0x1a, + 0x71, 0x86, 0x0f, 0x2c, 0xd5, 0xfe, 0x4d, 0x48, 0x7a, 0x3e, 0x4b, 0xa7, 0x47, 0x82, 0xcf, 0xf4, + 0x7d, 0xb4, 0x20, 0xd1, 0x73, 0xce, 0x32, 0xca, 0x32, 0xe4, 0xed, 0x2a, 0x5e, 0x03, 0x92, 0xbc, + 0x9a, 0xc4, 0xde, 0xdf, 0x0b, 0x0a, 0x52, 0x76, 0xfd, 0x09, 0x17, 0x63, 0x8a, 0x9d, 0xa4, 0xbf, + 0xd3, 0x90, 0x5d, 0xbf, 0x04, 0xbc, 0x6d, 0x68, 0xa4, 0x74, 0x8e, 0xed, 0xbe, 0x11, 0xc8, 0x9f, + 0x56, 0x5e, 0x07, 0x76, 0x5e, 0x17, 0xce, 0xa1, 0x6d, 0xfc, 0x6a, 0x9e, 0x43, 0x4f, 0x60, 0x83, + 0x27, 0xb2, 0x4b, 0xa4, 0xc3, 0x3b, 0x58, 0x9d, 0x5f, 0xbe, 0xbe, 0x3a, 0xf7, 0x5e, 0xa8, 0x95, + 0x87, 0x2c, 0x13, 0xef, 0x82, 0x82, 0xcf, 0x3b, 0x86, 0x01, 0x9f, 0x4c, 0xe2, 0x88, 0xd1, 0xd3, + 0x3c, 0xbd, 0xc0, 0xeb, 0x93, 0x87, 0xd7, 0x27, 0x7f, 0x89, 0xa8, 0x17, 0xf6, 0xca, 0x60, 0x91, + 0xf5, 0xc1, 0x63, 0xe8, 0x99, 0x6a, 0xa4, 0xbb, 0x97, 0xf4, 0x9d, 0xae, 0x44, 0xf9, 0x53, 0xbe, + 0x28, 0xae, 0x48, 0x9c, 0xab, 0xbb, 0xc6, 0x66, 0xa0, 0x88, 0xc7, 0xee, 0x37, 0x1d, 0xff, 0x97, + 0x0e, 0x0c, 0x16, 0x14, 0xc8, 0xd5, 0x59, 0x94, 0xc5, 0x54, 0x4b, 0x50, 0x84, 0xe7, 0x41, 0x33, + 0xa4, 0xe9, 0x58, 0x17, 0x32, 0xfe, 0xd6, 0xc7, 0x65, 0xa3, 0x7c, 0x93, 0xf8, 0xd0, 0x8b, 0x5e, + 0x9c, 0x49, 0x41, 0x67, 0x3c, 0x67, 0x61, 0x39, 0x4d, 0x30, 0x30, 0x59, 0x48, 0xd1, 0x8b, 0xb3, + 0xa7, 0x24, 0x9c, 0x52, 0xf5, 0xe6, 0x6f, 0xa1, 0x4d, 0x36, 0xe8, 0x1f, 0xc0, 0xe6, 0xcb, 0x28, + 0x49, 0xf7, 0xf9, 0x6c, 0x26, 0x37, 0x51, 0x48, 0x33, 0xf9, 0x20, 0x72, 0x30, 0xeb, 0x9a, 0x92, + 0x05, 0x13, 0xd2, 0x09, 0xc9, 0xe3, 0x4c, 0x2e, 0x2d, 0xb6, 0xaf, 0x01, 0xf9, 0x7f, 0x70, 0x60, + 0xa0, 0x9e, 0xf2, 0x87, 0x2c, 0xa3, 0x42, 0x62, 0xde, 0x23, 0x68, 0xe1, 0x5e, 0xd3, 0x17, 0xde, + 0x9b, 0x2f, 0xac, 0x6a, 0xa9, 0xf7, 0x03, 0xe8, 0x52, 0x96, 0x09, 0xc2, 0x32, 0x7c, 0xbb, 0xa8, + 0xab, 0xee, 0x87, 0xd7, 0x71, 0xda, 0xc3, 0x83, 0xc0, 0x64, 0x95, 0xde, 0x97, 0xa7, 0x8c, 0xd1, + 0x55, 0x6c, 0xd0, 0xff, 0x7d, 0x69, 0xf7, 0x31, 0x25, 0x57, 0x74, 0x6d, 0xbb, 0x8f, 0x00, 0x62, + 0x29, 0x40, 0xac, 0x61, 0xb6, 0xc1, 0xb9, 0xa2, 0xd5, 0x9f, 0x38, 0x70, 0x47, 0x09, 0x79, 0xce, + 0xae, 0xa2, 0x8c, 0x86, 0x6b, 0xdb, 0xfd, 0x5d, 0x68, 0xf3, 0x64, 0x0d, 0x9b, 0x35, 0x97, 0x77, + 0x0a, 0x83, 0x48, 0x99, 0x20, 0xc9, 0xf2, 0x7a, 0xb1, 0xba, 0xa0, 0x45, 0xf6, 0x7a, 0x04, 0x9a, + 0xcb, 0x22, 0xf0, 0x2f, 0x07, 0xb6, 0x95, 0xa4, 0x1f, 0x46, 0xe3, 0xcb, 0xcf, 0x30, 0x00, 0x27, + 0xb0, 0x75, 0x89, 0x16, 0xac, 0xe9, 0xff, 0x02, 0xf7, 0x8a, 0xee, 0xff, 0xc2, 0x85, 0xf7, 0x8a, + 0x02, 0x98, 0xf0, 0xfd, 0x0b, 0xc2, 0xa6, 0x3a, 0x06, 0xb2, 0xa7, 0x22, 0x89, 0xad, 0x5d, 0x5d, + 0x9e, 0x0c, 0xe4, 0xbf, 0xf6, 0xf7, 0x00, 0x3a, 0x93, 0x88, 0x91, 0xd8, 0x78, 0x74, 0xaf, 0x2a, + 0xa2, 0x62, 0x94, 0xa7, 0xc2, 0x2c, 0xd7, 0x7d, 0x5f, 0x8f, 0xe5, 0x0a, 0xba, 0xca, 0x62, 0x6b, + 0xe5, 0x2c, 0xfa, 0xff, 0x70, 0x60, 0x1b, 0xc1, 0x7d, 0x3c, 0x3d, 0xd6, 0x2f, 0x87, 0xef, 0xc3, + 0x86, 0x1e, 0x63, 0xfe, 0x87, 0xf1, 0x29, 0xd8, 0x64, 0x27, 0x50, 0x43, 0xd5, 0x35, 0x8a, 0xc1, + 0xe0, 0x5c, 0xb1, 0x10, 0x7e, 0xe7, 0xc0, 0xbd, 0xd2, 0x09, 0xb3, 0x0e, 0xe4, 0x19, 0xaf, 0xc9, + 0xaa, 0x10, 0x4c, 0xa8, 0x0a, 0x8f, 0xbb, 0xce, 0x6e, 0x69, 0xac, 0x53, 0x3d, 0xfe, 0x6f, 0x1c, + 0x18, 0x7e, 0xc4, 0x23, 0x86, 0x6b, 0x9e, 0x24, 0x49, 0xac, 0xa7, 0xe3, 0x6b, 0xe7, 0xeb, 0x7b, + 0xd0, 0x21, 0x4a, 0x0c, 0xcb, 0xb4, 0x23, 0x2b, 0x0c, 0x56, 0x2a, 0x1e, 0x75, 0x6f, 0x24, 0x69, + 0x39, 0xb4, 0xd7, 0x94, 0xff, 0x27, 0x07, 0x86, 0x86, 0x81, 0xa7, 0x82, 0x8f, 0x69, 0x9a, 0x7e, + 0x86, 0x8d, 0x06, 0x0d, 0x2d, 0x07, 0x38, 0xad, 0x40, 0x53, 0x86, 0x03, 0x4d, 0xcb, 0x81, 0x4b, + 0xb8, 0xa3, 0xa6, 0x25, 0x86, 0x17, 0xf2, 0x5e, 0x47, 0x42, 0x75, 0x19, 0x53, 0xaf, 0x87, 0x82, + 0xb4, 0xe7, 0x60, 0xfa, 0x0f, 0x8e, 0x6a, 0x0e, 0xf6, 0x10, 0x80, 0x84, 0xe1, 0xc7, 0x5c, 0x84, + 0x11, 0x9b, 0xea, 0x48, 0x19, 0x88, 0xff, 0x11, 0xf4, 0xe4, 0xcd, 0xf2, 0xa5, 0x31, 0xf7, 0xb8, + 0x71, 0x32, 0x63, 0xce, 0x4c, 0x5c, 0x7b, 0x66, 0xe2, 0x13, 0x78, 0x50, 0x33, 0xfc, 0x49, 0x18, + 0xea, 0xd0, 0xef, 0xab, 0x99, 0x4e, 0xa1, 0x49, 0x67, 0x60, 0xd9, 0x83, 0xcb, 0x34, 0x28, 0xb0, + 0x98, 0xfc, 0x9f, 0x3b, 0xf0, 0xb0, 0xa6, 0xc3, 0x4e, 0xf1, 0x6d, 0xe8, 0xa9, 0x0d, 0x69, 0xdc, + 0xfa, 0x90, 0xc6, 0xff, 0xad, 0x03, 0x03, 0x6d, 0x4b, 0xe9, 0xe4, 0x37, 0xa0, 0xad, 0x26, 0xb2, + 0x5a, 0xed, 0x17, 0x96, 0xaa, 0x2d, 0x26, 0xc9, 0x81, 0x5e, 0x5c, 0x6f, 0x19, 0xee, 0x92, 0x96, + 0xe1, 0x7d, 0x6b, 0x61, 0x0f, 0xaf, 0xb0, 0x5f, 0x8a, 0xed, 0xfb, 0xa3, 0xa2, 0xa6, 0x0e, 0x68, + 0x4c, 0xb3, 0xdb, 0xcc, 0xc8, 0x2b, 0xd8, 0xc2, 0xf1, 0xf0, 0x2d, 0x27, 0xfa, 0x63, 0xd8, 0x46, + 0xb1, 0xb7, 0x6e, 0xef, 0x8f, 0xe1, 0xbd, 0x2a, 0x01, 0x66, 0xdf, 0xbd, 0x15, 0xe9, 0x5f, 0x85, + 0xbb, 0x67, 0x34, 0x9e, 0x48, 0xd9, 0xaf, 0x92, 0xb0, 0x3c, 0xd0, 0xae, 0x99, 0xcb, 0x9c, 0xb7, + 0xf1, 0xef, 0xcd, 0xaf, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x44, 0xad, 0x58, 0x38, 0xf1, 0x1c, + 0x00, 0x00, }