From c2bd1d0d839a925c9de1ee3c09a35b33a5b811a6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 11 Aug 2022 19:47:59 +0800 Subject: [PATCH] callback kickoff --- internal/cms_api/group/group.go | 235 ++-------- internal/cms_api/router.go | 7 +- internal/rpc/group/group.go | 178 +++----- pkg/cms_api_struct/group.go | 74 +-- pkg/common/log/logrus.go | 16 +- pkg/proto/group/group.pb.go | 775 +++++++++++--------------------- pkg/proto/group/group.proto | 23 +- 7 files changed, 422 insertions(+), 886 deletions(-) diff --git a/internal/cms_api/group/group.go b/internal/cms_api/group/group.go index 9cdc94790..d486dbaf5 100644 --- a/internal/cms_api/group/group.go +++ b/internal/cms_api/group/group.go @@ -22,7 +22,7 @@ func GetGroupByID(c *gin.Context) { var ( req cms_api_struct.GetGroupByIDRequest resp cms_api_struct.GetGroupByIDResponse - reqPb pbGroup.GetGroupByIdReq + reqPb pbGroup.GetGroupByIDReq ) if err := c.ShouldBindQuery(&req); err != nil { log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error()) @@ -46,7 +46,10 @@ func GetGroupByID(c *gin.Context) { openIMHttp.RespHttp200(c, err, nil) return } - utils.CopyStructFields(&resp, respPb) + utils.CopyStructFields(&resp, respPb.CMSGroup.GroupInfo) + resp.GroupOwnerID = respPb.CMSGroup.GroupOwnerUserID + resp.GroupOwnerName = respPb.CMSGroup.GroupOwnerUserName + log.NewInfo("", utils.GetSelfFuncName(), "req: ", resp) openIMHttp.RespHttp200(c, constant.OK, resp) } @@ -81,16 +84,11 @@ func GetGroups(c *gin.Context) { return } for _, v := range respPb.CMSGroups { - resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{ - GroupName: v.GroupInfo.GroupName, - GroupID: v.GroupInfo.GroupID, - GroupMasterName: v.GroupMasterName, - GroupMasterId: v.GroupMasterId, - CreateTime: (utils.UnixSecondToTime(int64(v.GroupInfo.CreateTime))).String(), - IsBanChat: constant.GroupIsBanChat(v.GroupInfo.Status), - IsBanPrivateChat: false, - ProfilePhoto: v.GroupInfo.FaceURL, - }) + groupResp := cms_api_struct.GroupResponse{} + utils.CopyStructFields(&groupResp, v.GroupInfo) + groupResp.GroupOwnerName = v.GroupOwnerUserName + groupResp.GroupOwnerID = v.GroupOwnerUserID + resp.Groups = append(resp.Groups, groupResp) } resp.GroupNums = int(respPb.GroupNum) resp.CurrentPage = int(respPb.Pagination.PageNumber) @@ -130,16 +128,11 @@ func GetGroupByName(c *gin.Context) { return } for _, v := range respPb.CMSGroups { - resp.Groups = append(resp.Groups, cms_api_struct.GroupResponse{ - GroupName: v.GroupInfo.GroupName, - GroupID: v.GroupInfo.GroupID, - GroupMasterName: v.GroupMasterName, - GroupMasterId: v.GroupMasterId, - CreateTime: (utils.UnixSecondToTime(int64(v.GroupInfo.CreateTime))).String(), - IsBanChat: constant.GroupIsBanChat(v.GroupInfo.Status), - IsBanPrivateChat: false, - ProfilePhoto: v.GroupInfo.FaceURL, - }) + groupResp := cms_api_struct.GroupResponse{} + utils.CopyStructFields(&groupResp, v.GroupInfo) + groupResp.GroupOwnerName = v.GroupOwnerUserName + groupResp.GroupOwnerID = v.GroupOwnerUserID + resp.Groups = append(resp.Groups, groupResp) } resp.CurrentPage = int(respPb.Pagination.PageNumber) resp.ShowNumber = int(respPb.Pagination.ShowNumber) @@ -189,133 +182,6 @@ func CreateGroup(c *gin.Context) { openIMHttp.RespHttp200(c, constant.OK, nil) } -func BanGroupChat(c *gin.Context) { - var ( - req cms_api_struct.BanGroupChatRequest - reqPb pbGroup.OperateGroupStatusReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed", err.Error()) - openIMHttp.RespHttp200(c, constant.ErrArgs, nil) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.Status = constant.GroupBanChat - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - - client := pbGroup.NewGroupClient(etcdConn) - _, err := client.OperateGroupStatus(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BanGroupChat failed ", err.Error()) - openIMHttp.RespHttp200(c, err, nil) - return - } - openIMHttp.RespHttp200(c, constant.OK, nil) - -} - -func BanPrivateChat(c *gin.Context) { - var ( - req cms_api_struct.BanPrivateChatRequest - reqPb pbGroup.OperateGroupStatusReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) - openIMHttp.RespHttp200(c, constant.ErrArgs, nil) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.Status = constant.GroupBanPrivateChat - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbGroup.NewGroupClient(etcdConn) - _, err := client.OperateGroupStatus(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed", err.Error()) - openIMHttp.RespHttp200(c, err, nil) - return - } - openIMHttp.RespHttp200(c, constant.OK, nil) -} - -func OpenGroupChat(c *gin.Context) { - var ( - req cms_api_struct.BanPrivateChatRequest - reqPb pbGroup.OperateGroupStatusReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) - openIMHttp.RespHttp200(c, constant.ErrArgs, nil) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.Status = constant.GroupOk - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbGroup.NewGroupClient(etcdConn) - _, err := client.OperateGroupStatus(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed ", err.Error()) - openIMHttp.RespHttp200(c, err, nil) - return - } - openIMHttp.RespHttp200(c, constant.OK, nil) -} - -func OpenPrivateChat(c *gin.Context) { - var ( - req cms_api_struct.BanPrivateChatRequest - reqPb pbGroup.OperateGroupStatusReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OpenPrivateChat failed ", err.Error()) - openIMHttp.RespHttp200(c, constant.ErrArgs, nil) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.Status = constant.GroupOk - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - - client := pbGroup.NewGroupClient(etcdConn) - _, err := client.OperateGroupStatus(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus failed ", err.Error()) - openIMHttp.RespHttp200(c, err, nil) - return - } - openIMHttp.RespHttp200(c, constant.OK, nil) -} - func GetGroupMembers(c *gin.Context) { var ( req cms_api_struct.GetGroupMembersRequest @@ -333,7 +199,7 @@ func GetGroupMembers(c *gin.Context) { PageNumber: int32(req.PageNumber), ShowNumber: int32(req.ShowNumber), } - reqPb.GroupId = req.GroupId + reqPb.GroupID = req.GroupID reqPb.UserName = req.UserName etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { @@ -355,12 +221,7 @@ func GetGroupMembers(c *gin.Context) { } resp.MemberNums = int(respPb.MemberNums) for _, groupMembers := range respPb.Members { - resp.GroupMembers = append(resp.GroupMembers, cms_api_struct.GroupMemberResponse{ - MemberPosition: int(groupMembers.RoleLevel), - MemberNickName: groupMembers.Nickname, - MemberId: groupMembers.UserID, - JoinTime: utils.UnixSecondToTime(int64(groupMembers.JoinTime)).String(), - }) + resp.GroupMembers = append(resp.GroupMembers, *groupMembers) } log.NewInfo("", utils.GetSelfFuncName(), "req: ", resp) openIMHttp.RespHttp200(c, constant.OK, resp) @@ -373,25 +234,25 @@ func AddGroupMembers(c *gin.Context) { reqPb pbGroup.AddGroupMembersCMSReq ) if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationId, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) + log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) openIMHttp.RespHttp200(c, constant.ErrArgs, nil) return } - reqPb.OperationId = utils.OperationIDGenerator() + reqPb.OperationID = utils.OperationIDGenerator() log.NewInfo("", utils.GetSelfFuncName(), "req: ", req) - reqPb.UserIds = req.Members - reqPb.GroupId = req.GroupId - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationId) + reqPb.UserIDList = req.Members + reqPb.GroupID = req.GroupId + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { - errMsg := reqPb.OperationId + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationId, errMsg) + errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" + log.NewError(reqPb.OperationID, errMsg) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } client := pbGroup.NewGroupClient(etcdConn) respPb, err := client.AddGroupMembersCMS(context.Background(), &reqPb) if err != nil { - log.NewError(reqPb.OperationId, utils.GetSelfFuncName(), "AddGroupMembersCMS failed", err.Error()) + log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "AddGroupMembersCMS failed", err.Error()) openIMHttp.RespHttp200(c, err, nil) return } @@ -414,8 +275,8 @@ func RemoveGroupMembers(c *gin.Context) { } reqPb.OperationID = utils.OperationIDGenerator() log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.UserIds = req.Members - reqPb.GroupId = req.GroupId + reqPb.UserIDList = req.Members + reqPb.GroupID = req.GroupId etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" @@ -436,38 +297,7 @@ func RemoveGroupMembers(c *gin.Context) { openIMHttp.RespHttp200(c, constant.OK, resp) } -func DeleteGroup(c *gin.Context) { - var ( - req cms_api_struct.DeleteGroupRequest - _ cms_api_struct.DeleteGroupResponse - reqPb pbGroup.DeleteGroupReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) - openIMHttp.RespHttp200(c, constant.ErrArgs, nil) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbGroup.NewGroupClient(etcdConn) - _, err := client.DeleteGroup(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "DeleteGroup failed", err.Error()) - openIMHttp.RespHttp200(c, err, nil) - return - } - openIMHttp.RespHttp200(c, constant.OK, nil) -} - -func SetGroupMaster(c *gin.Context) { +func SetGroupOwner(c *gin.Context) { var ( req cms_api_struct.SetGroupMasterRequest _ cms_api_struct.SetGroupMasterResponse @@ -480,8 +310,8 @@ func SetGroupMaster(c *gin.Context) { } reqPb.OperationID = utils.OperationIDGenerator() log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.UserId = req.UserId + reqPb.GroupID = req.GroupId + reqPb.UserID = req.UserId reqPb.RoleLevel = constant.GroupOwner etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { @@ -513,8 +343,8 @@ func SetGroupOrdinaryUsers(c *gin.Context) { } reqPb.OperationID = utils.OperationIDGenerator() log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - reqPb.GroupId = req.GroupId - reqPb.UserId = req.UserId + reqPb.GroupID = req.GroupId + reqPb.UserID = req.UserId reqPb.RoleLevel = constant.GroupOrdinaryUsers etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { @@ -553,7 +383,6 @@ func AlterGroupInfo(c *gin.Context) { Introduction: req.Introduction, Notification: req.Notification, FaceURL: req.ProfilePhoto, - // GroupType: int32(req.GroupType), } etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName, reqPb.OperationID) if etcdConn == nil { diff --git a/internal/cms_api/router.go b/internal/cms_api/router.go index 93a689ec9..058cd26ad 100644 --- a/internal/cms_api/router.go +++ b/internal/cms_api/router.go @@ -54,13 +54,8 @@ func NewGinRouter() *gin.Engine { groupRouterGroup.POST("/create_group", group.CreateGroup) groupRouterGroup.POST("/add_members", group.AddGroupMembers) groupRouterGroup.POST("/remove_members", group.RemoveGroupMembers) - groupRouterGroup.POST("/ban_group_private_chat", group.BanPrivateChat) - groupRouterGroup.POST("/open_group_private_chat", group.OpenPrivateChat) - groupRouterGroup.POST("/ban_group_chat", group.BanGroupChat) - groupRouterGroup.POST("/open_group_chat", group.OpenGroupChat) - groupRouterGroup.POST("/delete_group", group.DeleteGroup) groupRouterGroup.POST("/get_members_in_group", group.GetGroupMembers) - groupRouterGroup.POST("/set_group_master", group.SetGroupMaster) + groupRouterGroup.POST("/set_group_master", group.SetGroupOwner) groupRouterGroup.POST("/set_group_ordinary_user", group.SetGroupOrdinaryUsers) groupRouterGroup.POST("/alter_group_info", group.AlterGroupInfo) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 894c859c1..fd180290f 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1333,35 +1333,32 @@ func (s *groupServer) TransferGroupOwner(_ context.Context, req *pbGroup.Transfe } -func (s *groupServer) GetGroupById(_ context.Context, req *pbGroup.GetGroupByIdReq) (*pbGroup.GetGroupByIdResp, error) { +func (s *groupServer) GetGroupByID(_ context.Context, req *pbGroup.GetGroupByIDReq) (*pbGroup.GetGroupByIDResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp := &pbGroup.GetGroupByIdResp{CMSGroup: &pbGroup.CMSGroup{ + resp := &pbGroup.GetGroupByIDResp{CMSGroup: &pbGroup.CMSGroup{ GroupInfo: &open_im_sdk.GroupInfo{}, }} - group, err := imdb.GetGroupById(req.GroupId) + group, err := imdb.GetGroupInfoByGroupID(req.GroupID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupById error", err.Error()) return resp, http.WrapError(constant.ErrDB) } - resp.CMSGroup.GroupInfo = &open_im_sdk.GroupInfo{ - GroupID: group.GroupID, - GroupName: group.GroupName, - FaceURL: group.FaceURL, - OwnerUserID: group.CreatorUserID, - MemberCount: 0, - Status: group.Status, - CreatorUserID: group.CreatorUserID, - GroupType: group.GroupType, - CreateTime: uint32(group.CreateTime.Unix()), - } + utils.CopyStructFields(resp.CMSGroup.GroupInfo, group) groupMember, err := imdb.GetGroupMaster(group.GroupID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMaster", err.Error()) return resp, http.WrapError(constant.ErrDB) } - resp.CMSGroup.GroupMasterName = groupMember.Nickname - resp.CMSGroup.GroupMasterId = groupMember.UserID + groupMemberNum, err := imdb.GetGroupMemberNumByGroupID(req.GroupID) + if err == nil { + resp.CMSGroup.GroupInfo.MemberCount = uint32(groupMemberNum) + } else { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) + } + resp.CMSGroup.GroupOwnerUserName = groupMember.Nickname + resp.CMSGroup.GroupOwnerUserID = groupMember.UserID resp.CMSGroup.GroupInfo.CreatorUserID = group.CreatorUserID + utils.CopyStructFields(resp.CMSGroup.GroupInfo, group) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil } @@ -1373,12 +1370,13 @@ func (s *groupServer) GetGroup(_ context.Context, req *pbGroup.GetGroupReq) (*pb } groups, err := imdb.GetGroupsByName(req.GroupName, req.Pagination.PageNumber, req.Pagination.ShowNumber) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupsByName error", req.String()) + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupsByName error", req.String(), req.GroupName, req.Pagination.PageNumber, req.Pagination.ShowNumber) return resp, http.WrapError(constant.ErrDB) } + log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "groups", groups) nums, err := imdb.GetGroupsCountNum(db.Group{GroupName: req.GroupName}) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupsCountNum error", err.Error()) + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupsCountNum error", err.Error(), req.GroupName) return resp, http.WrapError(constant.ErrDB) } resp.GroupNums = nums @@ -1387,24 +1385,16 @@ func (s *groupServer) GetGroup(_ context.Context, req *pbGroup.GetGroupReq) (*pb ShowNumber: req.Pagination.ShowNumber, } for _, v := range groups { + group := &pbGroup.CMSGroup{GroupInfo: &open_im_sdk.GroupInfo{}} + utils.CopyStructFields(group.GroupInfo, v) groupMember, err := imdb.GetGroupMaster(v.GroupID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMaster error", err.Error()) continue } - resp.CMSGroups = append(resp.CMSGroups, &pbGroup.CMSGroup{ - GroupInfo: &open_im_sdk.GroupInfo{ - GroupID: v.GroupID, - GroupName: v.GroupName, - FaceURL: v.FaceURL, - OwnerUserID: v.CreatorUserID, - Status: v.Status, - CreatorUserID: v.CreatorUserID, - CreateTime: uint32(v.CreateTime.Unix()), - }, - GroupMasterName: groupMember.Nickname, - GroupMasterId: groupMember.UserID, - }) + group.GroupOwnerUserID = groupMember.GroupID + group.GroupOwnerUserName = groupMember.Nickname + resp.CMSGroups = append(resp.CMSGroups, group) } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil @@ -1427,57 +1417,29 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (* log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupsCountNum", err.Error()) return resp, http.WrapError(constant.ErrDB) } - resp.GroupNum = int32(groupsCountNum) + resp.GroupNum = groupsCountNum resp.Pagination.PageNumber = req.Pagination.PageNumber resp.Pagination.ShowNumber = req.Pagination.ShowNumber for _, v := range groups { + group := &pbGroup.CMSGroup{GroupInfo: &open_im_sdk.GroupInfo{}} + utils.CopyStructFields(group.GroupInfo, v) groupMember, err := imdb.GetGroupMaster(v.GroupID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMaster failed", err.Error(), v) continue } - resp.CMSGroups = append(resp.CMSGroups, &pbGroup.CMSGroup{ - GroupInfo: &open_im_sdk.GroupInfo{ - GroupID: v.GroupID, - GroupName: v.GroupName, - FaceURL: v.FaceURL, - OwnerUserID: v.CreatorUserID, - Status: v.Status, - CreatorUserID: v.CreatorUserID, - CreateTime: uint32(v.CreateTime.Unix()), - }, - GroupMasterId: groupMember.UserID, - GroupMasterName: groupMember.Nickname, - }) + group.GroupOwnerUserID = groupMember.GroupID + group.GroupOwnerUserName = groupMember.Nickname + resp.CMSGroups = append(resp.CMSGroups, group) } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "GetGroups ", resp.String()) return resp, nil } -func (s *groupServer) OperateGroupStatus(_ context.Context, req *pbGroup.OperateGroupStatusReq) (*pbGroup.OperateGroupStatusResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) - resp := &pbGroup.OperateGroupStatusResp{} - if err := imdb.OperateGroupStatus(req.GroupId, req.Status); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "OperateGroupStatus", err.Error()) - return resp, http.WrapError(constant.ErrDB) - } - return resp, nil -} - -func (s *groupServer) DeleteGroup(_ context.Context, req *pbGroup.DeleteGroupReq) (*pbGroup.DeleteGroupResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) - resp := &pbGroup.DeleteGroupResp{} - if err := imdb.DeleteGroup(req.GroupId); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "DeleteGroup error", err.Error()) - return resp, http.WrapError(constant.ErrDB) - } - return resp, nil -} - func (s *groupServer) OperateUserRole(_ context.Context, req *pbGroup.OperateUserRoleReq) (*pbGroup.OperateUserRoleResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "args:", req.String()) resp := &pbGroup.OperateUserRoleResp{} - oldOwnerUserID, err := imdb.GetGroupMaster(req.GroupId) + oldOwnerUserID, err := imdb.GetGroupMaster(req.GroupID) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMaster failed", err.Error()) return resp, http.WrapError(constant.ErrDB) @@ -1491,8 +1453,8 @@ func (s *groupServer) OperateUserRole(_ context.Context, req *pbGroup.OperateUse client := pbGroup.NewGroupClient(etcdConn) var reqPb pbGroup.TransferGroupOwnerReq reqPb.OperationID = req.OperationID - reqPb.NewOwnerUserID = req.UserId - reqPb.GroupID = req.GroupId + reqPb.NewOwnerUserID = req.UserID + reqPb.GroupID = req.GroupID reqPb.OpUserID = "cms admin" reqPb.OldOwnerUserID = oldOwnerUserID.UserID reply, err := client.TransferGroupOwner(context.Background(), &reqPb) @@ -1508,12 +1470,12 @@ func (s *groupServer) OperateUserRole(_ context.Context, req *pbGroup.OperateUse func (s *groupServer) GetGroupMembersCMS(_ context.Context, req *pbGroup.GetGroupMembersCMSReq) (*pbGroup.GetGroupMembersCMSResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "args:", req.String()) resp := &pbGroup.GetGroupMembersCMSResp{} - groupMembers, err := imdb.GetGroupMembersByGroupIdCMS(req.GroupId, req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber) + groupMembers, err := imdb.GetGroupMembersByGroupIdCMS(req.GroupID, req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMembersByGroupIdCMS Error", err.Error()) return resp, http.WrapError(constant.ErrDB) } - groupMembersCount, err := imdb.GetGroupMembersCount(req.GroupId, req.UserName) + groupMembersCount, err := imdb.GetGroupMembersCount(req.GroupID, req.UserName) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMembersCMS Error", err.Error()) return resp, http.WrapError(constant.ErrDB) @@ -1521,15 +1483,9 @@ func (s *groupServer) GetGroupMembersCMS(_ context.Context, req *pbGroup.GetGrou log.NewInfo(req.OperationID, groupMembersCount) resp.MemberNums = int32(groupMembersCount) for _, groupMember := range groupMembers { - resp.Members = append(resp.Members, &open_im_sdk.GroupMemberFullInfo{ - GroupID: req.GroupId, - UserID: groupMember.UserID, - RoleLevel: groupMember.RoleLevel, - JoinTime: int32(groupMember.JoinTime.Unix()), - Nickname: groupMember.Nickname, - FaceURL: groupMember.FaceURL, - JoinSource: groupMember.JoinSource, - }) + member := open_im_sdk.GroupMemberFullInfo{} + utils.CopyStructFields(&member, groupMember) + resp.Members = append(resp.Members, &member) } resp.Pagination = &open_im_sdk.ResponsePagination{ CurrentPage: req.Pagination.PageNumber, @@ -1542,8 +1498,8 @@ func (s *groupServer) GetGroupMembersCMS(_ context.Context, req *pbGroup.GetGrou func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.RemoveGroupMembersCMSReq) (*pbGroup.RemoveGroupMembersCMSResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "args:", req.String()) resp := &pbGroup.RemoveGroupMembersCMSResp{} - for _, userId := range req.UserIds { - err := imdb.RemoveGroupMember(req.GroupId, userId) + for _, userId := range req.UserIDList { + err := imdb.RemoveGroupMember(req.GroupID, userId) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) resp.Failed = append(resp.Failed, userId) @@ -1552,20 +1508,20 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo } } reqKick := &pbGroup.KickGroupMemberReq{ - GroupID: req.GroupId, + GroupID: req.GroupID, KickedUserIDList: resp.Success, Reason: "admin kick", OperationID: req.OperationID, - OpUserID: req.OpUserId, + OpUserID: req.OpUserID, } var reqPb pbUser.SetConversationReq var c pbUser.Conversation for _, v := range resp.Success { reqPb.OperationID = req.OperationID c.OwnerUserID = v - c.ConversationID = utils.GetConversationIDBySessionType(req.GroupId, constant.GroupChatType) + c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType) c.ConversationType = constant.GroupChatType - c.GroupID = req.GroupId + c.GroupID = req.GroupID c.IsNotInGroup = true reqPb.Conversation = &c etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, req.OperationID) @@ -1591,7 +1547,7 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo } cacheClient := pbCache.NewCacheClient(etcdConn) cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{ - GroupID: req.GroupId, + GroupID: req.GroupID, OperationID: req.OperationID, }) if err != nil { @@ -1602,16 +1558,16 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String()) return resp, http.WrapError(constant.ErrDB) } - if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupId); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupId) + if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupID); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) } - if err := rocksCache.DelGroupMemberNumFromCache(req.GroupId); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupId) + if err := rocksCache.DelGroupMemberNumFromCache(req.GroupID); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) } for _, userID := range resp.Success { - if err := rocksCache.DelGroupMemberInfoFromCache(req.GroupId, userID); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupId, userID) + if err := rocksCache.DelGroupMemberInfoFromCache(req.GroupID, userID); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID, userID) } } @@ -1621,22 +1577,22 @@ func (s *groupServer) RemoveGroupMembersCMS(_ context.Context, req *pbGroup.Remo } func (s *groupServer) AddGroupMembersCMS(_ context.Context, req *pbGroup.AddGroupMembersCMSReq) (*pbGroup.AddGroupMembersCMSResp, error) { - log.NewInfo(req.OperationId, utils.GetSelfFuncName(), "args:", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "args:", req.String()) resp := &pbGroup.AddGroupMembersCMSResp{} - for _, userId := range req.UserIds { - if isExist := imdb.IsExistGroupMember(req.GroupId, userId); isExist { - log.NewError(req.OperationId, utils.GetSelfFuncName(), "user is exist in group", userId, req.GroupId) + for _, userId := range req.UserIDList { + if isExist := imdb.IsExistGroupMember(req.GroupID, userId); isExist { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "user is exist in group", userId, req.GroupID) resp.Failed = append(resp.Failed, userId) continue } user, err := imdb.GetUserByUserID(userId) if err != nil { - log.NewError(req.OperationId, utils.GetSelfFuncName(), "GetUserByUserID", err.Error()) + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserByUserID", err.Error()) resp.Failed = append(resp.Failed, userId) continue } groupMember := db.GroupMember{ - GroupID: req.GroupId, + GroupID: req.GroupID, UserID: userId, Nickname: user.Nickname, FaceURL: "", @@ -1647,40 +1603,40 @@ func (s *groupServer) AddGroupMembersCMS(_ context.Context, req *pbGroup.AddGrou Ex: "", } if err := imdb.InsertIntoGroupMember(groupMember); err != nil { - log.NewError(req.OperationId, utils.GetSelfFuncName(), "InsertIntoGroupMember failed", req.String()) + log.NewError(req.OperationID, utils.GetSelfFuncName(), "InsertIntoGroupMember failed", req.String()) resp.Failed = append(resp.Failed, userId) } else { resp.Success = append(resp.Success, userId) } } - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationId) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.OperationID) if etcdConn == nil { - errMsg := req.OperationId + "getcdv3.GetConn == nil" - log.NewError(req.OperationId, errMsg) + errMsg := req.OperationID + "getcdv3.GetConn == nil" + log.NewError(req.OperationID, errMsg) return resp, http.WrapError(constant.ErrDB) } cacheClient := pbCache.NewCacheClient(etcdConn) cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{ - GroupID: req.GroupId, - OperationID: req.OperationId, + GroupID: req.GroupID, + OperationID: req.OperationID, }) if err != nil { - log.NewError(req.OperationId, "DelGroupMemberIDListFromCache rpc call failed ", err.Error()) + log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc call failed ", err.Error()) return resp, http.WrapError(constant.ErrDB) } if cacheResp.CommonResp.ErrCode != 0 { - log.NewError(req.OperationId, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String()) + log.NewError(req.OperationID, "DelGroupMemberIDListFromCache rpc logic call failed ", cacheResp.String()) return resp, http.WrapError(constant.ErrDB) } - if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupId); err != nil { - log.NewError(req.OperationId, utils.GetSelfFuncName(), err.Error(), req.GroupId) + if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupID); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) } - if err := rocksCache.DelGroupMemberNumFromCache(req.GroupId); err != nil { - log.NewError(req.OperationId, utils.GetSelfFuncName(), err.Error(), req.GroupId) + if err := rocksCache.DelGroupMemberNumFromCache(req.GroupID); err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.GroupID) } - chat.MemberInvitedNotification(req.OperationId, req.GroupId, req.OpUserId, "admin add you to group", resp.Success) + chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, "admin add you to group", resp.Success) return resp, nil } diff --git a/pkg/cms_api_struct/group.go b/pkg/cms_api_struct/group.go index fdd81118f..903a52d9b 100644 --- a/pkg/cms_api_struct/group.go +++ b/pkg/cms_api_struct/group.go @@ -1,11 +1,30 @@ package cms_api_struct -import server_api_params "Open_IM/pkg/proto/sdk_ws" +import ( + server_api_params "Open_IM/pkg/proto/sdk_ws" +) type GroupResponse struct { GroupOwnerName string `json:"GroupOwnerName"` GroupOwnerID string `json:"GroupOwnerID"` - *server_api_params.GroupInfo + //*server_api_params.GroupInfo + GroupID string `json:"groupID"` + GroupName string `json:"groupName"` + Notification string `json:"notification"` + Introduction string `json:"introduction"` + FaceURL string `json:"faceURL"` + OwnerUserID string `json:"ownerUserID"` + CreateTime uint32 `json:"createTime"` + MemberCount uint32 `json:"memberCount"` + Ex string `json:"ex"` + Status int32 `json:"status"` + CreatorUserID string `json:"creatorUserID"` + GroupType int32 `json:"groupType"` + NeedVerification int32 `json:"needVerification"` + LookMemberInfo int32 `json:"lookMemberInfo"` + ApplyMemberFriend int32 `json:"applyMemberFriend"` + NotificationUpdateTime uint32 `json:"notificationUpdateTime"` + NotificationUserID string `json:"notificationUserID"` } type GetGroupByIDRequest struct { @@ -17,13 +36,13 @@ type GetGroupByIDResponse struct { } type GetGroupRequest struct { - GroupName string `form:"group_name" binding:"required"` + GroupName string `form:"groupName" binding:"required"` RequestPagination } type GetGroupResponse struct { Groups []GroupResponse `json:"groups"` - GroupNums int `json:"group_nums"` + GroupNums int `json:"groupNums"` ResponsePagination } @@ -33,77 +52,70 @@ type GetGroupsRequest struct { type GetGroupsResponse struct { Groups []GroupResponse `json:"groups"` - GroupNums int `json:"group_nums"` + GroupNums int `json:"groupNums"` ResponsePagination } type CreateGroupRequest struct { - GroupName string `json:"group_name" binding:"required"` - GroupMasterId string `json:"group_master_id" binding:"required"` - GroupMembers []string `json:"group_members" binding:"required"` + GroupName string `json:"groupName" binding:"required"` + GroupMasterId string `json:"groupOwnerID" binding:"required"` + GroupMembers []string `json:"groupMembers" binding:"required"` } type CreateGroupResponse struct { } type SetGroupMasterRequest struct { - GroupId string `json:"group_id" binding:"required"` - UserId string `json:"user_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` + UserId string `json:"userID" binding:"required"` } type SetGroupMasterResponse struct { } type SetGroupMemberRequest struct { - GroupId string `json:"group_id" binding:"required"` - UserId string `json:"user_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` + UserId string `json:"userID" binding:"required"` } type SetGroupMemberRespones struct { } type BanGroupChatRequest struct { - GroupId string `json:"group_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` } type BanGroupChatResponse struct { } type BanPrivateChatRequest struct { - GroupId string `json:"group_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` } type BanPrivateChatResponse struct { } type DeleteGroupRequest struct { - GroupId string `json:"group_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` } type DeleteGroupResponse struct { } type GetGroupMembersRequest struct { - GroupId string `form:"group_id" binding:"required"` - UserName string `form:"user_name"` + GroupID string `form:"groupID" binding:"required"` + UserName string `form:"userName"` RequestPagination } -type GroupMemberResponse struct { - MemberPosition int `json:"member_position"` - MemberNickName string `json:"member_nick_name"` - MemberId string `json:"member_id"` - JoinTime string `json:"join_time"` -} - type GetGroupMembersResponse struct { - GroupMembers []GroupMemberResponse `json:"group_members"` + GroupMembers []server_api_params.GroupMemberFullInfo `json:"groupMembers"` ResponsePagination - MemberNums int `json:"member_nums"` + MemberNums int `json:"memberNums"` } type GroupMemberRequest struct { - GroupId string `json:"group_id" binding:"required"` + GroupId string `json:"groupID" binding:"required"` Members []string `json:"members" binding:"required"` } @@ -129,12 +141,12 @@ type RemoveGroupMembersResponse struct { } type AlterGroupInfoRequest struct { - GroupID string `json:"group_id"` - GroupName string `json:"group_name"` + GroupID string `json:"groupID"` + GroupName string `json:"groupName"` Notification string `json:"notification"` Introduction string `json:"introduction"` - ProfilePhoto string `json:"profile_photo"` - GroupType int `json:"group_type"` + ProfilePhoto string `json:"profilePhoto"` + GroupType int `json:"groupType"` } type AlterGroupInfoResponse struct { diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go index caf4c9126..4194d0e95 100644 --- a/pkg/common/log/logrus.go +++ b/pkg/common/log/logrus.go @@ -2,7 +2,7 @@ package log import ( "Open_IM/pkg/common/config" - "bufio" + //"bufio" "fmt" "os" "time" @@ -33,13 +33,13 @@ func loggerInit(moduleName string) *Logger { //All logs will be printed logger.SetLevel(logrus.Level(config.Config.Log.RemainLogLevel)) //Close std console output - src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend) - if err != nil { - panic(err.Error()) - } - writer := bufio.NewWriter(src) - logger.SetOutput(writer) - //logger.SetOutput(os.Stdout) + //src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend) + //if err != nil { + // panic(err.Error()) + //} + //writer := bufio.NewWriter(src) + //logger.SetOutput(writer) + logger.SetOutput(os.Stdout) //Log Console Print Style Setting logger.SetFormatter(&nested.Formatter{ TimestampFormat: "2006-01-02 15:04:05.000", diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index c6801ec0a..d4cd55960 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -37,7 +37,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_264c9a69dcb70bac, []int{0} + return fileDescriptor_group_077aa2a789cf93ed, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -83,7 +83,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_264c9a69dcb70bac, []int{1} + return fileDescriptor_group_077aa2a789cf93ed, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -132,7 +132,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_264c9a69dcb70bac, []int{2} + return fileDescriptor_group_077aa2a789cf93ed, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -200,7 +200,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_264c9a69dcb70bac, []int{3} + return fileDescriptor_group_077aa2a789cf93ed, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -254,7 +254,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_264c9a69dcb70bac, []int{4} + return fileDescriptor_group_077aa2a789cf93ed, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -308,7 +308,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_264c9a69dcb70bac, []int{5} + return fileDescriptor_group_077aa2a789cf93ed, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -362,7 +362,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_264c9a69dcb70bac, []int{6} + return fileDescriptor_group_077aa2a789cf93ed, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -414,7 +414,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_264c9a69dcb70bac, []int{7} + return fileDescriptor_group_077aa2a789cf93ed, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -454,7 +454,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_264c9a69dcb70bac, []int{8} + return fileDescriptor_group_077aa2a789cf93ed, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -508,7 +508,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_264c9a69dcb70bac, []int{9} + return fileDescriptor_group_077aa2a789cf93ed, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -562,7 +562,7 @@ func (m *GetUserReqApplicationListReq) Reset() { *m = GetUserReqApplicat func (m *GetUserReqApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListReq) ProtoMessage() {} func (*GetUserReqApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{10} + return fileDescriptor_group_077aa2a789cf93ed, []int{10} } func (m *GetUserReqApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListReq.Unmarshal(m, b) @@ -615,7 +615,7 @@ func (m *GetUserReqApplicationListResp) Reset() { *m = GetUserReqApplica func (m *GetUserReqApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListResp) ProtoMessage() {} func (*GetUserReqApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{11} + return fileDescriptor_group_077aa2a789cf93ed, []int{11} } func (m *GetUserReqApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListResp.Unmarshal(m, b) @@ -664,7 +664,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_264c9a69dcb70bac, []int{12} + return fileDescriptor_group_077aa2a789cf93ed, []int{12} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -730,7 +730,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_264c9a69dcb70bac, []int{13} + return fileDescriptor_group_077aa2a789cf93ed, []int{13} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -773,7 +773,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_264c9a69dcb70bac, []int{14} + return fileDescriptor_group_077aa2a789cf93ed, []int{14} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -846,7 +846,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_264c9a69dcb70bac, []int{15} + return fileDescriptor_group_077aa2a789cf93ed, []int{15} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -889,7 +889,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_264c9a69dcb70bac, []int{16} + return fileDescriptor_group_077aa2a789cf93ed, []int{16} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -962,7 +962,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_264c9a69dcb70bac, []int{17} + return fileDescriptor_group_077aa2a789cf93ed, []int{17} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -1002,7 +1002,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_264c9a69dcb70bac, []int{18} + return fileDescriptor_group_077aa2a789cf93ed, []int{18} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -1054,7 +1054,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_264c9a69dcb70bac, []int{19} + return fileDescriptor_group_077aa2a789cf93ed, []int{19} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -1096,7 +1096,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_264c9a69dcb70bac, []int{20} + return fileDescriptor_group_077aa2a789cf93ed, []int{20} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1165,7 +1165,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_264c9a69dcb70bac, []int{21} + return fileDescriptor_group_077aa2a789cf93ed, []int{21} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1227,7 +1227,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_264c9a69dcb70bac, []int{22} + return fileDescriptor_group_077aa2a789cf93ed, []int{22} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1288,7 +1288,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_264c9a69dcb70bac, []int{23} + return fileDescriptor_group_077aa2a789cf93ed, []int{23} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1344,7 +1344,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_264c9a69dcb70bac, []int{24} + return fileDescriptor_group_077aa2a789cf93ed, []int{24} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1411,7 +1411,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_264c9a69dcb70bac, []int{25} + return fileDescriptor_group_077aa2a789cf93ed, []int{25} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1458,7 +1458,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_264c9a69dcb70bac, []int{26} + return fileDescriptor_group_077aa2a789cf93ed, []int{26} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1512,7 +1512,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_264c9a69dcb70bac, []int{27} + return fileDescriptor_group_077aa2a789cf93ed, []int{27} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1566,7 +1566,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_264c9a69dcb70bac, []int{28} + return fileDescriptor_group_077aa2a789cf93ed, []int{28} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1622,7 +1622,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_264c9a69dcb70bac, []int{29} + return fileDescriptor_group_077aa2a789cf93ed, []int{29} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1690,7 +1690,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_264c9a69dcb70bac, []int{30} + return fileDescriptor_group_077aa2a789cf93ed, []int{30} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1746,7 +1746,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_264c9a69dcb70bac, []int{31} + return fileDescriptor_group_077aa2a789cf93ed, []int{31} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1814,7 +1814,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_264c9a69dcb70bac, []int{32} + return fileDescriptor_group_077aa2a789cf93ed, []int{32} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -1868,7 +1868,7 @@ func (m *CMSGroup) Reset() { *m = CMSGroup{} } func (m *CMSGroup) String() string { return proto.CompactTextString(m) } func (*CMSGroup) ProtoMessage() {} func (*CMSGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{33} + return fileDescriptor_group_077aa2a789cf93ed, []int{33} } func (m *CMSGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CMSGroup.Unmarshal(m, b) @@ -1922,7 +1922,7 @@ func (m *GetGroupReq) Reset() { *m = GetGroupReq{} } func (m *GetGroupReq) String() string { return proto.CompactTextString(m) } func (*GetGroupReq) ProtoMessage() {} func (*GetGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{34} + return fileDescriptor_group_077aa2a789cf93ed, []int{34} } func (m *GetGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupReq.Unmarshal(m, b) @@ -1976,7 +1976,7 @@ func (m *GetGroupResp) Reset() { *m = GetGroupResp{} } func (m *GetGroupResp) String() string { return proto.CompactTextString(m) } func (*GetGroupResp) ProtoMessage() {} func (*GetGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{35} + return fileDescriptor_group_077aa2a789cf93ed, []int{35} } func (m *GetGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupResp.Unmarshal(m, b) @@ -2029,7 +2029,7 @@ func (m *GetGroupsReq) Reset() { *m = GetGroupsReq{} } func (m *GetGroupsReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsReq) ProtoMessage() {} func (*GetGroupsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{36} + return fileDescriptor_group_077aa2a789cf93ed, []int{36} } func (m *GetGroupsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsReq.Unmarshal(m, b) @@ -2076,7 +2076,7 @@ func (m *GetGroupsResp) Reset() { *m = GetGroupsResp{} } func (m *GetGroupsResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsResp) ProtoMessage() {} func (*GetGroupsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{37} + return fileDescriptor_group_077aa2a789cf93ed, []int{37} } func (m *GetGroupsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsResp.Unmarshal(m, b) @@ -2129,7 +2129,7 @@ func (m *GetGroupMemberReq) Reset() { *m = GetGroupMemberReq{} } func (m *GetGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberReq) ProtoMessage() {} func (*GetGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{38} + return fileDescriptor_group_077aa2a789cf93ed, []int{38} } func (m *GetGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberReq.Unmarshal(m, b) @@ -2163,90 +2163,6 @@ func (m *GetGroupMemberReq) GetOperationID() string { return "" } -type OperateGroupStatusReq struct { - GroupID string `protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` - Status int32 `protobuf:"varint,2,opt,name=Status" json:"Status,omitempty"` - OperationID string `protobuf:"bytes,3,opt,name=OperationID" json:"OperationID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *OperateGroupStatusReq) Reset() { *m = OperateGroupStatusReq{} } -func (m *OperateGroupStatusReq) String() string { return proto.CompactTextString(m) } -func (*OperateGroupStatusReq) ProtoMessage() {} -func (*OperateGroupStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{39} -} -func (m *OperateGroupStatusReq) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_OperateGroupStatusReq.Unmarshal(m, b) -} -func (m *OperateGroupStatusReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_OperateGroupStatusReq.Marshal(b, m, deterministic) -} -func (dst *OperateGroupStatusReq) XXX_Merge(src proto.Message) { - xxx_messageInfo_OperateGroupStatusReq.Merge(dst, src) -} -func (m *OperateGroupStatusReq) XXX_Size() int { - return xxx_messageInfo_OperateGroupStatusReq.Size(m) -} -func (m *OperateGroupStatusReq) XXX_DiscardUnknown() { - xxx_messageInfo_OperateGroupStatusReq.DiscardUnknown(m) -} - -var xxx_messageInfo_OperateGroupStatusReq proto.InternalMessageInfo - -func (m *OperateGroupStatusReq) GetGroupID() string { - if m != nil { - return m.GroupID - } - return "" -} - -func (m *OperateGroupStatusReq) GetStatus() int32 { - if m != nil { - return m.Status - } - return 0 -} - -func (m *OperateGroupStatusReq) GetOperationID() string { - if m != nil { - return m.OperationID - } - return "" -} - -type OperateGroupStatusResp struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *OperateGroupStatusResp) Reset() { *m = OperateGroupStatusResp{} } -func (m *OperateGroupStatusResp) String() string { return proto.CompactTextString(m) } -func (*OperateGroupStatusResp) ProtoMessage() {} -func (*OperateGroupStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{40} -} -func (m *OperateGroupStatusResp) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_OperateGroupStatusResp.Unmarshal(m, b) -} -func (m *OperateGroupStatusResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_OperateGroupStatusResp.Marshal(b, m, deterministic) -} -func (dst *OperateGroupStatusResp) XXX_Merge(src proto.Message) { - xxx_messageInfo_OperateGroupStatusResp.Merge(dst, src) -} -func (m *OperateGroupStatusResp) XXX_Size() int { - return xxx_messageInfo_OperateGroupStatusResp.Size(m) -} -func (m *OperateGroupStatusResp) XXX_DiscardUnknown() { - xxx_messageInfo_OperateGroupStatusResp.DiscardUnknown(m) -} - -var xxx_messageInfo_OperateGroupStatusResp proto.InternalMessageInfo - type OperateUserRoleReq struct { GroupID string `protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` UserID string `protobuf:"bytes,2,opt,name=UserID" json:"UserID,omitempty"` @@ -2261,7 +2177,7 @@ func (m *OperateUserRoleReq) Reset() { *m = OperateUserRoleReq{} } func (m *OperateUserRoleReq) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleReq) ProtoMessage() {} func (*OperateUserRoleReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{41} + return fileDescriptor_group_077aa2a789cf93ed, []int{39} } func (m *OperateUserRoleReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleReq.Unmarshal(m, b) @@ -2319,7 +2235,7 @@ func (m *OperateUserRoleResp) Reset() { *m = OperateUserRoleResp{} } func (m *OperateUserRoleResp) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleResp) ProtoMessage() {} func (*OperateUserRoleResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{42} + return fileDescriptor_group_077aa2a789cf93ed, []int{40} } func (m *OperateUserRoleResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleResp.Unmarshal(m, b) @@ -2339,7 +2255,7 @@ func (m *OperateUserRoleResp) XXX_DiscardUnknown() { var xxx_messageInfo_OperateUserRoleResp proto.InternalMessageInfo -type DeleteGroupReq struct { +type GetGroupByIDReq struct { GroupID string `protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=OperationID" json:"OperationID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -2347,152 +2263,76 @@ type DeleteGroupReq struct { XXX_sizecache int32 `json:"-"` } -func (m *DeleteGroupReq) Reset() { *m = DeleteGroupReq{} } -func (m *DeleteGroupReq) String() string { return proto.CompactTextString(m) } -func (*DeleteGroupReq) ProtoMessage() {} -func (*DeleteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{43} +func (m *GetGroupByIDReq) Reset() { *m = GetGroupByIDReq{} } +func (m *GetGroupByIDReq) String() string { return proto.CompactTextString(m) } +func (*GetGroupByIDReq) ProtoMessage() {} +func (*GetGroupByIDReq) Descriptor() ([]byte, []int) { + return fileDescriptor_group_077aa2a789cf93ed, []int{41} } -func (m *DeleteGroupReq) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteGroupReq.Unmarshal(m, b) +func (m *GetGroupByIDReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetGroupByIDReq.Unmarshal(m, b) } -func (m *DeleteGroupReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteGroupReq.Marshal(b, m, deterministic) +func (m *GetGroupByIDReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetGroupByIDReq.Marshal(b, m, deterministic) } -func (dst *DeleteGroupReq) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteGroupReq.Merge(dst, src) +func (dst *GetGroupByIDReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGroupByIDReq.Merge(dst, src) } -func (m *DeleteGroupReq) XXX_Size() int { - return xxx_messageInfo_DeleteGroupReq.Size(m) +func (m *GetGroupByIDReq) XXX_Size() int { + return xxx_messageInfo_GetGroupByIDReq.Size(m) } -func (m *DeleteGroupReq) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteGroupReq.DiscardUnknown(m) +func (m *GetGroupByIDReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetGroupByIDReq.DiscardUnknown(m) } -var xxx_messageInfo_DeleteGroupReq proto.InternalMessageInfo +var xxx_messageInfo_GetGroupByIDReq proto.InternalMessageInfo -func (m *DeleteGroupReq) GetGroupID() string { +func (m *GetGroupByIDReq) GetGroupID() string { if m != nil { return m.GroupID } return "" } -func (m *DeleteGroupReq) GetOperationID() string { +func (m *GetGroupByIDReq) GetOperationID() string { if m != nil { return m.OperationID } return "" } -type DeleteGroupResp struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteGroupResp) Reset() { *m = DeleteGroupResp{} } -func (m *DeleteGroupResp) String() string { return proto.CompactTextString(m) } -func (*DeleteGroupResp) ProtoMessage() {} -func (*DeleteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{44} -} -func (m *DeleteGroupResp) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteGroupResp.Unmarshal(m, b) -} -func (m *DeleteGroupResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteGroupResp.Marshal(b, m, deterministic) -} -func (dst *DeleteGroupResp) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteGroupResp.Merge(dst, src) -} -func (m *DeleteGroupResp) XXX_Size() int { - return xxx_messageInfo_DeleteGroupResp.Size(m) -} -func (m *DeleteGroupResp) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteGroupResp.DiscardUnknown(m) -} - -var xxx_messageInfo_DeleteGroupResp proto.InternalMessageInfo - -type GetGroupByIdReq struct { - GroupID string `protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` - OperationID string `protobuf:"bytes,2,opt,name=OperationID" json:"OperationID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetGroupByIdReq) Reset() { *m = GetGroupByIdReq{} } -func (m *GetGroupByIdReq) String() string { return proto.CompactTextString(m) } -func (*GetGroupByIdReq) ProtoMessage() {} -func (*GetGroupByIdReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{45} -} -func (m *GetGroupByIdReq) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetGroupByIdReq.Unmarshal(m, b) -} -func (m *GetGroupByIdReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetGroupByIdReq.Marshal(b, m, deterministic) -} -func (dst *GetGroupByIdReq) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGroupByIdReq.Merge(dst, src) -} -func (m *GetGroupByIdReq) XXX_Size() int { - return xxx_messageInfo_GetGroupByIdReq.Size(m) -} -func (m *GetGroupByIdReq) XXX_DiscardUnknown() { - xxx_messageInfo_GetGroupByIdReq.DiscardUnknown(m) -} - -var xxx_messageInfo_GetGroupByIdReq proto.InternalMessageInfo - -func (m *GetGroupByIdReq) GetGroupID() string { - if m != nil { - return m.GroupID - } - return "" -} - -func (m *GetGroupByIdReq) GetOperationID() string { - if m != nil { - return m.OperationID - } - return "" -} - -type GetGroupByIdResp struct { +type GetGroupByIDResp struct { CMSGroup *CMSGroup `protobuf:"bytes,1,opt,name=CMSGroup" json:"CMSGroup,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *GetGroupByIdResp) Reset() { *m = GetGroupByIdResp{} } -func (m *GetGroupByIdResp) String() string { return proto.CompactTextString(m) } -func (*GetGroupByIdResp) ProtoMessage() {} -func (*GetGroupByIdResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{46} +func (m *GetGroupByIDResp) Reset() { *m = GetGroupByIDResp{} } +func (m *GetGroupByIDResp) String() string { return proto.CompactTextString(m) } +func (*GetGroupByIDResp) ProtoMessage() {} +func (*GetGroupByIDResp) Descriptor() ([]byte, []int) { + return fileDescriptor_group_077aa2a789cf93ed, []int{42} } -func (m *GetGroupByIdResp) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetGroupByIdResp.Unmarshal(m, b) +func (m *GetGroupByIDResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetGroupByIDResp.Unmarshal(m, b) } -func (m *GetGroupByIdResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetGroupByIdResp.Marshal(b, m, deterministic) +func (m *GetGroupByIDResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetGroupByIDResp.Marshal(b, m, deterministic) } -func (dst *GetGroupByIdResp) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetGroupByIdResp.Merge(dst, src) +func (dst *GetGroupByIDResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetGroupByIDResp.Merge(dst, src) } -func (m *GetGroupByIdResp) XXX_Size() int { - return xxx_messageInfo_GetGroupByIdResp.Size(m) +func (m *GetGroupByIDResp) XXX_Size() int { + return xxx_messageInfo_GetGroupByIDResp.Size(m) } -func (m *GetGroupByIdResp) XXX_DiscardUnknown() { - xxx_messageInfo_GetGroupByIdResp.DiscardUnknown(m) +func (m *GetGroupByIDResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetGroupByIDResp.DiscardUnknown(m) } -var xxx_messageInfo_GetGroupByIdResp proto.InternalMessageInfo +var xxx_messageInfo_GetGroupByIDResp proto.InternalMessageInfo -func (m *GetGroupByIdResp) GetCMSGroup() *CMSGroup { +func (m *GetGroupByIDResp) GetCMSGroup() *CMSGroup { if m != nil { return m.CMSGroup } @@ -2513,7 +2353,7 @@ func (m *GetGroupMembersCMSReq) Reset() { *m = GetGroupMembersCMSReq{} } func (m *GetGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSReq) ProtoMessage() {} func (*GetGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{47} + return fileDescriptor_group_077aa2a789cf93ed, []int{43} } func (m *GetGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSReq.Unmarshal(m, b) @@ -2574,7 +2414,7 @@ func (m *GetGroupMembersCMSResp) Reset() { *m = GetGroupMembersCMSResp{} func (m *GetGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSResp) ProtoMessage() {} func (*GetGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{48} + return fileDescriptor_group_077aa2a789cf93ed, []int{44} } func (m *GetGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSResp.Unmarshal(m, b) @@ -2629,7 +2469,7 @@ func (m *RemoveGroupMembersCMSReq) Reset() { *m = RemoveGroupMembersCMSR func (m *RemoveGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSReq) ProtoMessage() {} func (*RemoveGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{49} + return fileDescriptor_group_077aa2a789cf93ed, []int{45} } func (m *RemoveGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSReq.Unmarshal(m, b) @@ -2689,7 +2529,7 @@ func (m *RemoveGroupMembersCMSResp) Reset() { *m = RemoveGroupMembersCMS func (m *RemoveGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSResp) ProtoMessage() {} func (*RemoveGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{50} + return fileDescriptor_group_077aa2a789cf93ed, []int{46} } func (m *RemoveGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSResp.Unmarshal(m, b) @@ -2737,7 +2577,7 @@ func (m *AddGroupMembersCMSReq) Reset() { *m = AddGroupMembersCMSReq{} } func (m *AddGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSReq) ProtoMessage() {} func (*AddGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{51} + return fileDescriptor_group_077aa2a789cf93ed, []int{47} } func (m *AddGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSReq.Unmarshal(m, b) @@ -2797,7 +2637,7 @@ func (m *AddGroupMembersCMSResp) Reset() { *m = AddGroupMembersCMSResp{} func (m *AddGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSResp) ProtoMessage() {} func (*AddGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{52} + return fileDescriptor_group_077aa2a789cf93ed, []int{48} } func (m *AddGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSResp.Unmarshal(m, b) @@ -2844,7 +2684,7 @@ func (m *DismissGroupReq) Reset() { *m = DismissGroupReq{} } func (m *DismissGroupReq) String() string { return proto.CompactTextString(m) } func (*DismissGroupReq) ProtoMessage() {} func (*DismissGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{53} + return fileDescriptor_group_077aa2a789cf93ed, []int{49} } func (m *DismissGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupReq.Unmarshal(m, b) @@ -2896,7 +2736,7 @@ func (m *DismissGroupResp) Reset() { *m = DismissGroupResp{} } func (m *DismissGroupResp) String() string { return proto.CompactTextString(m) } func (*DismissGroupResp) ProtoMessage() {} func (*DismissGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{54} + return fileDescriptor_group_077aa2a789cf93ed, []int{50} } func (m *DismissGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupResp.Unmarshal(m, b) @@ -2938,7 +2778,7 @@ func (m *MuteGroupMemberReq) Reset() { *m = MuteGroupMemberReq{} } func (m *MuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberReq) ProtoMessage() {} func (*MuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{55} + return fileDescriptor_group_077aa2a789cf93ed, []int{51} } func (m *MuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberReq.Unmarshal(m, b) @@ -3004,7 +2844,7 @@ func (m *MuteGroupMemberResp) Reset() { *m = MuteGroupMemberResp{} } func (m *MuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberResp) ProtoMessage() {} func (*MuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{56} + return fileDescriptor_group_077aa2a789cf93ed, []int{52} } func (m *MuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberResp.Unmarshal(m, b) @@ -3045,7 +2885,7 @@ func (m *CancelMuteGroupMemberReq) Reset() { *m = CancelMuteGroupMemberR func (m *CancelMuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberReq) ProtoMessage() {} func (*CancelMuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{57} + return fileDescriptor_group_077aa2a789cf93ed, []int{53} } func (m *CancelMuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberReq.Unmarshal(m, b) @@ -3104,7 +2944,7 @@ func (m *CancelMuteGroupMemberResp) Reset() { *m = CancelMuteGroupMember func (m *CancelMuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberResp) ProtoMessage() {} func (*CancelMuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{58} + return fileDescriptor_group_077aa2a789cf93ed, []int{54} } func (m *CancelMuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberResp.Unmarshal(m, b) @@ -3144,7 +2984,7 @@ func (m *MuteGroupReq) Reset() { *m = MuteGroupReq{} } func (m *MuteGroupReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupReq) ProtoMessage() {} func (*MuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{59} + return fileDescriptor_group_077aa2a789cf93ed, []int{55} } func (m *MuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupReq.Unmarshal(m, b) @@ -3196,7 +3036,7 @@ func (m *MuteGroupResp) Reset() { *m = MuteGroupResp{} } func (m *MuteGroupResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupResp) ProtoMessage() {} func (*MuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{60} + return fileDescriptor_group_077aa2a789cf93ed, []int{56} } func (m *MuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupResp.Unmarshal(m, b) @@ -3236,7 +3076,7 @@ func (m *CancelMuteGroupReq) Reset() { *m = CancelMuteGroupReq{} } func (m *CancelMuteGroupReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupReq) ProtoMessage() {} func (*CancelMuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{61} + return fileDescriptor_group_077aa2a789cf93ed, []int{57} } func (m *CancelMuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupReq.Unmarshal(m, b) @@ -3288,7 +3128,7 @@ func (m *CancelMuteGroupResp) Reset() { *m = CancelMuteGroupResp{} } func (m *CancelMuteGroupResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupResp) ProtoMessage() {} func (*CancelMuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{62} + return fileDescriptor_group_077aa2a789cf93ed, []int{58} } func (m *CancelMuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupResp.Unmarshal(m, b) @@ -3330,7 +3170,7 @@ func (m *SetGroupMemberNicknameReq) Reset() { *m = SetGroupMemberNicknam func (m *SetGroupMemberNicknameReq) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameReq) ProtoMessage() {} func (*SetGroupMemberNicknameReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{63} + return fileDescriptor_group_077aa2a789cf93ed, []int{59} } func (m *SetGroupMemberNicknameReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameReq.Unmarshal(m, b) @@ -3396,7 +3236,7 @@ func (m *SetGroupMemberNicknameResp) Reset() { *m = SetGroupMemberNickna func (m *SetGroupMemberNicknameResp) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberNicknameResp) ProtoMessage() {} func (*SetGroupMemberNicknameResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{64} + return fileDescriptor_group_077aa2a789cf93ed, []int{60} } func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) @@ -3436,7 +3276,7 @@ func (m *GetJoinedSuperGroupListReq) Reset() { *m = GetJoinedSuperGroupL func (m *GetJoinedSuperGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListReq) ProtoMessage() {} func (*GetJoinedSuperGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{65} + return fileDescriptor_group_077aa2a789cf93ed, []int{61} } func (m *GetJoinedSuperGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListReq.Unmarshal(m, b) @@ -3489,7 +3329,7 @@ func (m *GetJoinedSuperGroupListResp) Reset() { *m = GetJoinedSuperGroup func (m *GetJoinedSuperGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedSuperGroupListResp) ProtoMessage() {} func (*GetJoinedSuperGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{66} + return fileDescriptor_group_077aa2a789cf93ed, []int{62} } func (m *GetJoinedSuperGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedSuperGroupListResp.Unmarshal(m, b) @@ -3536,7 +3376,7 @@ func (m *GetSuperGroupsInfoReq) Reset() { *m = GetSuperGroupsInfoReq{} } func (m *GetSuperGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoReq) ProtoMessage() {} func (*GetSuperGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{67} + return fileDescriptor_group_077aa2a789cf93ed, []int{63} } func (m *GetSuperGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoReq.Unmarshal(m, b) @@ -3589,7 +3429,7 @@ func (m *GetSuperGroupsInfoResp) Reset() { *m = GetSuperGroupsInfoResp{} func (m *GetSuperGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetSuperGroupsInfoResp) ProtoMessage() {} func (*GetSuperGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{68} + return fileDescriptor_group_077aa2a789cf93ed, []int{64} } func (m *GetSuperGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSuperGroupsInfoResp.Unmarshal(m, b) @@ -3641,7 +3481,7 @@ func (m *SetGroupMemberInfoReq) Reset() { *m = SetGroupMemberInfoReq{} } func (m *SetGroupMemberInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberInfoReq) ProtoMessage() {} func (*SetGroupMemberInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{69} + return fileDescriptor_group_077aa2a789cf93ed, []int{65} } func (m *SetGroupMemberInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoReq.Unmarshal(m, b) @@ -3728,7 +3568,7 @@ func (m *SetGroupMemberInfoResp) Reset() { *m = SetGroupMemberInfoResp{} func (m *SetGroupMemberInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupMemberInfoResp) ProtoMessage() {} func (*SetGroupMemberInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{70} + return fileDescriptor_group_077aa2a789cf93ed, []int{66} } func (m *SetGroupMemberInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupMemberInfoResp.Unmarshal(m, b) @@ -3768,7 +3608,7 @@ func (m *GetGroupAbstractInfoReq) Reset() { *m = GetGroupAbstractInfoReq func (m *GetGroupAbstractInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAbstractInfoReq) ProtoMessage() {} func (*GetGroupAbstractInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{71} + return fileDescriptor_group_077aa2a789cf93ed, []int{67} } func (m *GetGroupAbstractInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAbstractInfoReq.Unmarshal(m, b) @@ -3822,7 +3662,7 @@ func (m *GetGroupAbstractInfoResp) Reset() { *m = GetGroupAbstractInfoRe func (m *GetGroupAbstractInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAbstractInfoResp) ProtoMessage() {} func (*GetGroupAbstractInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_264c9a69dcb70bac, []int{72} + return fileDescriptor_group_077aa2a789cf93ed, []int{68} } func (m *GetGroupAbstractInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAbstractInfoResp.Unmarshal(m, b) @@ -3903,14 +3743,10 @@ func init() { proto.RegisterType((*GetGroupsReq)(nil), "group.GetGroupsReq") proto.RegisterType((*GetGroupsResp)(nil), "group.GetGroupsResp") proto.RegisterType((*GetGroupMemberReq)(nil), "group.GetGroupMemberReq") - proto.RegisterType((*OperateGroupStatusReq)(nil), "group.OperateGroupStatusReq") - proto.RegisterType((*OperateGroupStatusResp)(nil), "group.OperateGroupStatusResp") proto.RegisterType((*OperateUserRoleReq)(nil), "group.OperateUserRoleReq") proto.RegisterType((*OperateUserRoleResp)(nil), "group.OperateUserRoleResp") - proto.RegisterType((*DeleteGroupReq)(nil), "group.DeleteGroupReq") - proto.RegisterType((*DeleteGroupResp)(nil), "group.DeleteGroupResp") - proto.RegisterType((*GetGroupByIdReq)(nil), "group.GetGroupByIdReq") - proto.RegisterType((*GetGroupByIdResp)(nil), "group.GetGroupByIdResp") + proto.RegisterType((*GetGroupByIDReq)(nil), "group.GetGroupByIDReq") + proto.RegisterType((*GetGroupByIDResp)(nil), "group.GetGroupByIDResp") proto.RegisterType((*GetGroupMembersCMSReq)(nil), "group.GetGroupMembersCMSReq") proto.RegisterType((*GetGroupMembersCMSResp)(nil), "group.GetGroupMembersCMSResp") proto.RegisterType((*RemoveGroupMembersCMSReq)(nil), "group.RemoveGroupMembersCMSReq") @@ -3965,12 +3801,10 @@ type GroupClient interface { GetJoinedGroupList(ctx context.Context, in *GetJoinedGroupListReq, opts ...grpc.CallOption) (*GetJoinedGroupListResp, error) InviteUserToGroup(ctx context.Context, in *InviteUserToGroupReq, opts ...grpc.CallOption) (*InviteUserToGroupResp, error) GetGroupAllMember(ctx context.Context, in *GetGroupAllMemberReq, opts ...grpc.CallOption) (*GetGroupAllMemberResp, error) - GetGroupById(ctx context.Context, in *GetGroupByIdReq, opts ...grpc.CallOption) (*GetGroupByIdResp, error) + GetGroupByID(ctx context.Context, in *GetGroupByIDReq, opts ...grpc.CallOption) (*GetGroupByIDResp, error) GetGroup(ctx context.Context, in *GetGroupReq, opts ...grpc.CallOption) (*GetGroupResp, error) GetGroups(ctx context.Context, in *GetGroupsReq, opts ...grpc.CallOption) (*GetGroupsResp, error) - OperateGroupStatus(ctx context.Context, in *OperateGroupStatusReq, opts ...grpc.CallOption) (*OperateGroupStatusResp, error) OperateUserRole(ctx context.Context, in *OperateUserRoleReq, opts ...grpc.CallOption) (*OperateUserRoleResp, error) - DeleteGroup(ctx context.Context, in *DeleteGroupReq, opts ...grpc.CallOption) (*DeleteGroupResp, error) GetGroupMembersCMS(ctx context.Context, in *GetGroupMembersCMSReq, opts ...grpc.CallOption) (*GetGroupMembersCMSResp, error) RemoveGroupMembersCMS(ctx context.Context, in *RemoveGroupMembersCMSReq, opts ...grpc.CallOption) (*RemoveGroupMembersCMSResp, error) AddGroupMembersCMS(ctx context.Context, in *AddGroupMembersCMSReq, opts ...grpc.CallOption) (*AddGroupMembersCMSResp, error) @@ -4129,9 +3963,9 @@ func (c *groupClient) GetGroupAllMember(ctx context.Context, in *GetGroupAllMemb return out, nil } -func (c *groupClient) GetGroupById(ctx context.Context, in *GetGroupByIdReq, opts ...grpc.CallOption) (*GetGroupByIdResp, error) { - out := new(GetGroupByIdResp) - err := grpc.Invoke(ctx, "/group.group/GetGroupById", in, out, c.cc, opts...) +func (c *groupClient) GetGroupByID(ctx context.Context, in *GetGroupByIDReq, opts ...grpc.CallOption) (*GetGroupByIDResp, error) { + out := new(GetGroupByIDResp) + err := grpc.Invoke(ctx, "/group.group/GetGroupByID", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -4156,15 +3990,6 @@ func (c *groupClient) GetGroups(ctx context.Context, in *GetGroupsReq, opts ...g return out, nil } -func (c *groupClient) OperateGroupStatus(ctx context.Context, in *OperateGroupStatusReq, opts ...grpc.CallOption) (*OperateGroupStatusResp, error) { - out := new(OperateGroupStatusResp) - err := grpc.Invoke(ctx, "/group.group/OperateGroupStatus", in, out, c.cc, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *groupClient) OperateUserRole(ctx context.Context, in *OperateUserRoleReq, opts ...grpc.CallOption) (*OperateUserRoleResp, error) { out := new(OperateUserRoleResp) err := grpc.Invoke(ctx, "/group.group/OperateUserRole", in, out, c.cc, opts...) @@ -4174,15 +3999,6 @@ func (c *groupClient) OperateUserRole(ctx context.Context, in *OperateUserRoleRe return out, nil } -func (c *groupClient) DeleteGroup(ctx context.Context, in *DeleteGroupReq, opts ...grpc.CallOption) (*DeleteGroupResp, error) { - out := new(DeleteGroupResp) - err := grpc.Invoke(ctx, "/group.group/DeleteGroup", in, out, c.cc, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *groupClient) GetGroupMembersCMS(ctx context.Context, in *GetGroupMembersCMSReq, opts ...grpc.CallOption) (*GetGroupMembersCMSResp, error) { out := new(GetGroupMembersCMSResp) err := grpc.Invoke(ctx, "/group.group/GetGroupMembersCMS", in, out, c.cc, opts...) @@ -4318,12 +4134,10 @@ type GroupServer interface { GetJoinedGroupList(context.Context, *GetJoinedGroupListReq) (*GetJoinedGroupListResp, error) InviteUserToGroup(context.Context, *InviteUserToGroupReq) (*InviteUserToGroupResp, error) GetGroupAllMember(context.Context, *GetGroupAllMemberReq) (*GetGroupAllMemberResp, error) - GetGroupById(context.Context, *GetGroupByIdReq) (*GetGroupByIdResp, error) + GetGroupByID(context.Context, *GetGroupByIDReq) (*GetGroupByIDResp, error) GetGroup(context.Context, *GetGroupReq) (*GetGroupResp, error) GetGroups(context.Context, *GetGroupsReq) (*GetGroupsResp, error) - OperateGroupStatus(context.Context, *OperateGroupStatusReq) (*OperateGroupStatusResp, error) OperateUserRole(context.Context, *OperateUserRoleReq) (*OperateUserRoleResp, error) - DeleteGroup(context.Context, *DeleteGroupReq) (*DeleteGroupResp, error) GetGroupMembersCMS(context.Context, *GetGroupMembersCMSReq) (*GetGroupMembersCMSResp, error) RemoveGroupMembersCMS(context.Context, *RemoveGroupMembersCMSReq) (*RemoveGroupMembersCMSResp, error) AddGroupMembersCMS(context.Context, *AddGroupMembersCMSReq) (*AddGroupMembersCMSResp, error) @@ -4613,20 +4427,20 @@ func _Group_GetGroupAllMember_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Group_GetGroupById_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetGroupByIdReq) +func _Group_GetGroupByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetGroupByIDReq) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(GroupServer).GetGroupById(ctx, in) + return srv.(GroupServer).GetGroupByID(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/group.group/GetGroupById", + FullMethod: "/group.group/GetGroupByID", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(GroupServer).GetGroupById(ctx, req.(*GetGroupByIdReq)) + return srv.(GroupServer).GetGroupByID(ctx, req.(*GetGroupByIDReq)) } return interceptor(ctx, in, info, handler) } @@ -4667,24 +4481,6 @@ func _Group_GetGroups_Handler(srv interface{}, ctx context.Context, dec func(int return interceptor(ctx, in, info, handler) } -func _Group_OperateGroupStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OperateGroupStatusReq) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(GroupServer).OperateGroupStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/group.group/OperateGroupStatus", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(GroupServer).OperateGroupStatus(ctx, req.(*OperateGroupStatusReq)) - } - return interceptor(ctx, in, info, handler) -} - func _Group_OperateUserRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(OperateUserRoleReq) if err := dec(in); err != nil { @@ -4703,24 +4499,6 @@ func _Group_OperateUserRole_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -func _Group_DeleteGroup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteGroupReq) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(GroupServer).DeleteGroup(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/group.group/DeleteGroup", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(GroupServer).DeleteGroup(ctx, req.(*DeleteGroupReq)) - } - return interceptor(ctx, in, info, handler) -} - func _Group_GetGroupMembersCMS_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetGroupMembersCMSReq) if err := dec(in); err != nil { @@ -5020,8 +4798,8 @@ var _Group_serviceDesc = grpc.ServiceDesc{ Handler: _Group_GetGroupAllMember_Handler, }, { - MethodName: "GetGroupById", - Handler: _Group_GetGroupById_Handler, + MethodName: "GetGroupByID", + Handler: _Group_GetGroupByID_Handler, }, { MethodName: "GetGroup", @@ -5031,18 +4809,10 @@ var _Group_serviceDesc = grpc.ServiceDesc{ MethodName: "GetGroups", Handler: _Group_GetGroups_Handler, }, - { - MethodName: "OperateGroupStatus", - Handler: _Group_OperateGroupStatus_Handler, - }, { MethodName: "OperateUserRole", Handler: _Group_OperateUserRole_Handler, }, - { - MethodName: "DeleteGroup", - Handler: _Group_DeleteGroup_Handler, - }, { MethodName: "GetGroupMembersCMS", Handler: _Group_GetGroupMembersCMS_Handler, @@ -5100,164 +4870,159 @@ var _Group_serviceDesc = grpc.ServiceDesc{ Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_264c9a69dcb70bac) } +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_077aa2a789cf93ed) } -var fileDescriptor_group_264c9a69dcb70bac = []byte{ - // 2481 bytes of a gzipped FileDescriptorProto +var fileDescriptor_group_077aa2a789cf93ed = []byte{ + // 2401 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0x4d, 0x6f, 0x1c, 0x49, - 0x55, 0x6d, 0x7b, 0x62, 0xfb, 0xd9, 0xce, 0xd8, 0xe5, 0xd8, 0x99, 0x74, 0xbc, 0x8e, 0x53, 0x1b, - 0x96, 0x08, 0x82, 0x03, 0x8e, 0x14, 0x01, 0x8b, 0x08, 0xb1, 0x9d, 0xc4, 0x4e, 0x62, 0x9b, 0xf4, - 0x64, 0x41, 0x8a, 0x84, 0x42, 0x67, 0xa6, 0xdc, 0x0c, 0x9e, 0xe9, 0x6e, 0x77, 0xf5, 0x24, 0x81, - 0xcb, 0x8a, 0x0b, 0x12, 0x08, 0x69, 0xf9, 0xb8, 0x2e, 0x82, 0xe5, 0x02, 0x07, 0x90, 0x38, 0xc0, - 0x19, 0x71, 0xe7, 0x8c, 0xc4, 0x95, 0x3f, 0xc0, 0x5f, 0x40, 0x5d, 0x55, 0x5d, 0x5d, 0xdd, 0x55, - 0xdd, 0x9e, 0xb4, 0x93, 0xcd, 0x5e, 0x5a, 0xaa, 0x57, 0xaf, 0xaa, 0xde, 0x7b, 0xf5, 0x3e, 0xea, - 0xbd, 0xd7, 0xb0, 0xe0, 0x45, 0xc1, 0x30, 0xbc, 0xce, 0xbe, 0xeb, 0x61, 0x14, 0xc4, 0x01, 0x6a, - 0xb0, 0x81, 0x7d, 0xf9, 0x20, 0x24, 0xfe, 0xd3, 0xdd, 0xbd, 0xeb, 0xe1, 0x91, 0x77, 0x9d, 0xcd, - 0x5c, 0xa7, 0xdd, 0xa3, 0xa7, 0x2f, 0xe8, 0xf5, 0x17, 0x94, 0x63, 0xda, 0x9f, 0x2f, 0x47, 0x89, - 0xdc, 0x30, 0x24, 0x91, 0x40, 0xc4, 0xdf, 0x04, 0xd8, 0x0a, 0x06, 0x83, 0xc0, 0x77, 0x08, 0x0d, - 0x51, 0x0b, 0x26, 0xef, 0x44, 0xd1, 0x56, 0xd0, 0x25, 0x2d, 0x6b, 0xcd, 0xba, 0xda, 0x70, 0xd2, - 0x21, 0x5a, 0x86, 0x33, 0x77, 0xa2, 0x68, 0x8f, 0x7a, 0xad, 0xb1, 0x35, 0xeb, 0xea, 0xb4, 0x23, - 0x46, 0xf8, 0x3e, 0xa0, 0x7b, 0x09, 0x51, 0xb7, 0xbb, 0xdd, 0x3d, 0x32, 0x78, 0x46, 0xa2, 0x5d, - 0xff, 0x30, 0x48, 0xb0, 0x3f, 0xa0, 0x24, 0xda, 0xdd, 0x66, 0xdb, 0x4c, 0x3b, 0x62, 0x84, 0x56, - 0x60, 0xda, 0x09, 0xfa, 0xe4, 0x21, 0x79, 0x4e, 0xfa, 0x6c, 0xa3, 0x86, 0x93, 0x01, 0xf0, 0xff, - 0x2c, 0x38, 0xbb, 0x15, 0x11, 0x37, 0x26, 0x6c, 0x4b, 0x87, 0x1c, 0xa3, 0xdb, 0x70, 0x76, 0xd7, - 0xef, 0xc5, 0x7c, 0xeb, 0x87, 0x3d, 0x1a, 0xb7, 0xac, 0xb5, 0xf1, 0xab, 0x33, 0x1b, 0x17, 0xd6, - 0xb9, 0x5c, 0xf4, 0xb3, 0x9d, 0xc2, 0x02, 0xf4, 0x75, 0x98, 0x66, 0x58, 0xc9, 0x24, 0x3b, 0x73, - 0x66, 0x63, 0x65, 0x9d, 0x92, 0xe8, 0x39, 0x89, 0x9e, 0xba, 0x61, 0xef, 0x69, 0xe8, 0x46, 0xee, - 0x80, 0xae, 0x4b, 0x1c, 0x27, 0x43, 0x47, 0x6b, 0x30, 0x73, 0x10, 0x92, 0xc8, 0x8d, 0x7b, 0x81, - 0xbf, 0xbb, 0xdd, 0x1a, 0x67, 0xcc, 0xa8, 0x20, 0x64, 0xc3, 0xd4, 0x41, 0x28, 0x78, 0x9d, 0x60, - 0xd3, 0x72, 0xcc, 0x56, 0xbf, 0xf0, 0x49, 0x24, 0xa6, 0x1b, 0x62, 0x75, 0x06, 0xc2, 0x1f, 0x42, - 0x33, 0xc7, 0x70, 0x9d, 0x2b, 0xc8, 0x33, 0x38, 0xfe, 0x4a, 0x0c, 0xe2, 0x08, 0xe6, 0xef, 0x91, - 0x98, 0x8d, 0x29, 0x9b, 0x23, 0xc7, 0x09, 0xd9, 0x1c, 0x61, 0x5b, 0x0a, 0x7c, 0xda, 0x51, 0x41, - 0x45, 0xb1, 0x8c, 0x55, 0x8b, 0x65, 0x3c, 0x2f, 0x16, 0xfc, 0x33, 0x0b, 0x16, 0x0a, 0x87, 0xd6, - 0xe2, 0x7b, 0x13, 0xe6, 0x24, 0x23, 0x8c, 0xd2, 0x71, 0xa6, 0x1a, 0xd5, 0xbc, 0xe7, 0x97, 0xe0, - 0xdf, 0x5a, 0xd0, 0x6c, 0x0b, 0x5a, 0x52, 0xfe, 0x1f, 0x42, 0xd3, 0x4b, 0xc7, 0x77, 0x83, 0xa8, - 0x4d, 0x62, 0x46, 0xd1, 0xcc, 0x06, 0xae, 0xda, 0x99, 0x63, 0x3a, 0xc5, 0xa5, 0x39, 0x49, 0x8c, - 0x19, 0x14, 0xa4, 0x52, 0xbd, 0xf0, 0x1d, 0x98, 0xcf, 0x93, 0x47, 0x43, 0xf4, 0x15, 0xd5, 0x64, - 0x05, 0x69, 0x0b, 0xc2, 0x1e, 0xb2, 0x09, 0x47, 0x41, 0xc2, 0x3f, 0x06, 0x3b, 0x95, 0xf8, 0xed, - 0x30, 0xec, 0xf7, 0x3a, 0x6c, 0xff, 0x44, 0x02, 0x09, 0xc3, 0x2a, 0x89, 0x56, 0x35, 0x89, 0x86, - 0xab, 0x5e, 0x05, 0xb8, 0x1b, 0x05, 0x83, 0xdc, 0x65, 0x2b, 0x10, 0xfc, 0xb1, 0x05, 0x17, 0x4b, - 0x0f, 0xaf, 0x75, 0xf1, 0x0f, 0x60, 0x3e, 0x75, 0x10, 0x43, 0x42, 0x63, 0xe5, 0xee, 0x2f, 0x95, - 0xdd, 0x90, 0x40, 0x75, 0xb4, 0x85, 0x38, 0x86, 0x95, 0x7b, 0x24, 0x4e, 0x68, 0x75, 0xc8, 0xb1, - 0x41, 0x38, 0x65, 0xae, 0xec, 0x74, 0xf7, 0xfa, 0x3b, 0x0b, 0xde, 0xa9, 0x38, 0xb6, 0xd6, 0x2d, - 0x1b, 0xe5, 0x32, 0x56, 0x57, 0x2e, 0xff, 0xb0, 0x60, 0xe9, 0x71, 0xe4, 0xfa, 0xf4, 0x90, 0x44, - 0x6c, 0x92, 0xf9, 0xad, 0x44, 0x22, 0x2d, 0x98, 0x14, 0xce, 0x40, 0x88, 0x24, 0x1d, 0xa2, 0xf7, - 0xe0, 0xec, 0x41, 0xbf, 0xab, 0xfa, 0x3c, 0x2e, 0x99, 0x02, 0x34, 0xc1, 0xdb, 0x27, 0x2f, 0x54, - 0x3c, 0x2e, 0xa2, 0x02, 0xb4, 0x28, 0xc7, 0x89, 0x6a, 0x3f, 0xd3, 0x28, 0xf8, 0x99, 0x07, 0xb0, - 0x6c, 0x62, 0xa0, 0x9e, 0x05, 0xfd, 0xcb, 0x82, 0xd9, 0xfb, 0x41, 0xcf, 0x97, 0x91, 0xa9, 0x5c, - 0x0a, 0xab, 0x00, 0x0e, 0x39, 0xde, 0x23, 0x94, 0xba, 0x1e, 0x11, 0x12, 0x50, 0x20, 0x55, 0xbe, - 0x71, 0x04, 0x8e, 0x57, 0x01, 0x12, 0x3a, 0xda, 0xc1, 0x30, 0xea, 0x10, 0xc6, 0x73, 0xc3, 0x51, - 0x20, 0xe8, 0x0a, 0xcc, 0xed, 0xfa, 0xcf, 0x7b, 0xb1, 0x14, 0xed, 0x19, 0xb6, 0x47, 0x1e, 0x88, - 0x37, 0x61, 0x4e, 0xe1, 0xa6, 0x9e, 0x48, 0xfe, 0x93, 0x18, 0x76, 0xc1, 0xaa, 0x93, 0x89, 0xc0, - 0xa7, 0x44, 0xc4, 0x11, 0x95, 0x17, 0xab, 0xfa, 0xf6, 0x8a, 0x36, 0xa4, 0xc8, 0x77, 0x5c, 0x93, - 0xaf, 0xe2, 0x70, 0x26, 0x8a, 0x0e, 0x27, 0x99, 0xdf, 0x71, 0xfd, 0x6e, 0x9f, 0x74, 0x13, 0xd7, - 0xc1, 0xb5, 0x42, 0x81, 0x20, 0x0c, 0xb3, 0x7c, 0xe4, 0x10, 0x3a, 0xec, 0xc7, 0x4c, 0x40, 0x0d, - 0x27, 0x07, 0xc3, 0x8f, 0x60, 0xa5, 0x9c, 0xb5, 0x7a, 0xe2, 0x3a, 0x84, 0xd9, 0x47, 0xc3, 0x5e, - 0x3c, 0x82, 0x02, 0x9d, 0x2e, 0xbc, 0x6e, 0xc2, 0x9c, 0x72, 0x4e, 0x3d, 0x5a, 0x3f, 0xb1, 0x60, - 0x29, 0xf5, 0xd9, 0xd9, 0x53, 0xaa, 0x9a, 0xea, 0x53, 0x39, 0xc4, 0xc4, 0xcd, 0xde, 0xed, 0xf5, - 0x63, 0x12, 0xb1, 0x0b, 0x6d, 0x38, 0x62, 0x94, 0x9c, 0xb7, 0x4f, 0x5e, 0xc6, 0x6d, 0x72, 0x2c, - 0x74, 0x3d, 0x1d, 0xe2, 0x3f, 0x5b, 0xb0, 0x6c, 0xa2, 0xb1, 0x56, 0x48, 0xb9, 0x0b, 0x30, 0xc8, - 0xde, 0x98, 0x3c, 0x98, 0xbc, 0x57, 0xe6, 0x34, 0xf9, 0x69, 0x77, 0x87, 0xfd, 0x3e, 0x8b, 0xc9, - 0xca, 0xca, 0xe4, 0x64, 0x5f, 0x90, 0xcb, 0xf9, 0x48, 0x87, 0xf8, 0x97, 0x1a, 0xb9, 0xf2, 0xc1, - 0x55, 0xe9, 0x4a, 0x14, 0xb2, 0xc6, 0xd8, 0x4b, 0x4c, 0x3d, 0xee, 0x54, 0xae, 0x04, 0xff, 0xc6, - 0x82, 0xf3, 0x46, 0x92, 0xde, 0xa6, 0x08, 0xf1, 0x5f, 0x2d, 0x40, 0x0f, 0x7a, 0x9d, 0x23, 0x05, - 0xaf, 0x5a, 0x48, 0x5f, 0x80, 0xf9, 0x04, 0x9f, 0x74, 0x39, 0xe3, 0x8a, 0xa8, 0x34, 0x78, 0x42, - 0xbc, 0x43, 0x5c, 0x1a, 0xf8, 0x42, 0x5c, 0x62, 0x54, 0x14, 0x56, 0xa3, 0xda, 0xe4, 0xce, 0x14, - 0x4c, 0xee, 0x7d, 0x98, 0xde, 0xed, 0x6e, 0x70, 0xd7, 0x51, 0xfa, 0x60, 0x60, 0x47, 0x33, 0x87, - 0xc3, 0x13, 0x1f, 0x31, 0xc2, 0x1f, 0xc2, 0xa2, 0xc6, 0x6e, 0xad, 0x0b, 0xb8, 0x09, 0x73, 0x92, - 0x0a, 0xe5, 0x0e, 0xe6, 0x85, 0xa9, 0xcb, 0x39, 0x27, 0x8f, 0x86, 0x87, 0xcc, 0xd6, 0x93, 0x70, - 0x40, 0xba, 0x8c, 0x8a, 0xd4, 0xd6, 0xf3, 0x8e, 0xd6, 0xd2, 0x1c, 0xed, 0x1a, 0xcc, 0x04, 0xba, - 0x9f, 0x0a, 0x46, 0xf4, 0x53, 0x3f, 0xe5, 0x06, 0xa1, 0x9d, 0x7b, 0xaa, 0x1c, 0x68, 0xe4, 0x3c, - 0x20, 0x43, 0xc7, 0x7f, 0xb3, 0xe0, 0x1c, 0x8f, 0x8e, 0x09, 0x65, 0x8f, 0x03, 0xe9, 0xa1, 0x4f, - 0xf6, 0xc3, 0xe5, 0x41, 0x2a, 0x53, 0xb4, 0x89, 0x9c, 0xa2, 0x5d, 0x83, 0x05, 0x7e, 0x96, 0xaa, - 0xad, 0x0d, 0xa6, 0xad, 0xfa, 0x44, 0xa5, 0xd2, 0xfd, 0xc4, 0x82, 0x25, 0x03, 0xd9, 0x9f, 0xaa, - 0xea, 0x7c, 0x6c, 0xc1, 0x39, 0xf9, 0xb6, 0xef, 0xf7, 0x47, 0xb1, 0xd6, 0x53, 0x87, 0x89, 0x83, - 0xc3, 0x43, 0x4a, 0xe2, 0x34, 0x4c, 0xf0, 0x11, 0x3a, 0x07, 0x8d, 0xad, 0x60, 0xe8, 0xc7, 0x22, - 0x48, 0xf0, 0x01, 0xfe, 0x95, 0x12, 0xc6, 0x14, 0xf2, 0xde, 0xaa, 0x7b, 0xfb, 0x83, 0x05, 0x53, - 0x5b, 0x7b, 0x6d, 0x86, 0x96, 0x4f, 0xdd, 0xad, 0x57, 0xab, 0x4d, 0xac, 0x8b, 0xca, 0x8b, 0x7c, - 0x30, 0xef, 0xbb, 0x83, 0xf4, 0xb9, 0x69, 0x98, 0x49, 0xdc, 0x64, 0x1e, 0x2a, 0x25, 0xac, 0xc1, - 0x93, 0xc8, 0x30, 0x93, 0x0a, 0x2e, 0xb9, 0xce, 0x15, 0x41, 0x27, 0x3b, 0x82, 0x5f, 0x68, 0x06, - 0x40, 0xdb, 0x00, 0xdf, 0x76, 0xbd, 0x9e, 0xcf, 0x2e, 0x49, 0x94, 0x58, 0xae, 0x18, 0xd8, 0x10, - 0xe9, 0x45, 0x86, 0xeb, 0x28, 0xeb, 0x46, 0x48, 0x9a, 0x3e, 0xb1, 0x60, 0x36, 0xa3, 0x8a, 0x86, - 0xe8, 0x4b, 0x30, 0x9d, 0x8a, 0x92, 0x8a, 0xc2, 0x50, 0x33, 0x7d, 0xd8, 0x08, 0xb8, 0x93, 0x61, - 0xbc, 0x26, 0x3a, 0xa5, 0x2c, 0x86, 0x03, 0xca, 0xa8, 0x6c, 0x38, 0x19, 0x00, 0x3f, 0xcf, 0x48, - 0xa4, 0x89, 0xe4, 0xf2, 0x67, 0x5a, 0xaf, 0x47, 0x36, 0xba, 0x27, 0xc2, 0xbf, 0xb7, 0x60, 0x4e, - 0x39, 0xf8, 0x6d, 0x09, 0xc7, 0x86, 0xa9, 0x54, 0x16, 0x42, 0x36, 0x72, 0x8c, 0x0f, 0xb2, 0xb2, - 0xcf, 0x28, 0x8e, 0xe2, 0x64, 0x9e, 0x8f, 0x60, 0x89, 0x0f, 0x79, 0xf9, 0xac, 0x1d, 0xbb, 0xf1, - 0x90, 0x56, 0x6f, 0xba, 0x0c, 0x67, 0x38, 0x5a, 0x1a, 0x84, 0xf9, 0x68, 0x04, 0xe5, 0x6b, 0xc1, - 0xb2, 0xe9, 0x30, 0x1a, 0x26, 0x81, 0x0c, 0x89, 0x29, 0x96, 0xcf, 0x07, 0x7d, 0x72, 0x22, 0x11, - 0x39, 0x07, 0x68, 0xac, 0x8e, 0x8e, 0x17, 0xaa, 0xa3, 0x23, 0xbc, 0xe7, 0x96, 0x60, 0x51, 0xa3, - 0x83, 0x86, 0xf8, 0x21, 0x9c, 0xdd, 0x26, 0x7d, 0xa2, 0x54, 0x55, 0x4f, 0x23, 0xf4, 0x05, 0x68, - 0xe6, 0x76, 0xa3, 0x21, 0xde, 0x83, 0x66, 0x7a, 0xb1, 0x9b, 0x3f, 0xda, 0xed, 0x9e, 0xf6, 0x84, - 0x5b, 0x59, 0x4d, 0x92, 0x6f, 0x47, 0x43, 0xf4, 0xc5, 0xcc, 0x69, 0x0a, 0x23, 0xd2, 0x74, 0x59, - 0x22, 0xe0, 0xbf, 0x6b, 0xd9, 0x0b, 0xdd, 0xda, 0x6b, 0x9f, 0x18, 0x96, 0x0a, 0x3e, 0x54, 0x8e, - 0x0b, 0xa6, 0x31, 0xfe, 0x7a, 0x6c, 0xd8, 0x70, 0x7f, 0xff, 0xd4, 0x53, 0x04, 0x46, 0x37, 0x0d, - 0xd1, 0xb7, 0x60, 0x92, 0xc7, 0x90, 0xd4, 0x94, 0x47, 0x0d, 0x3d, 0xe9, 0x32, 0x74, 0xc7, 0x60, - 0xdf, 0x9f, 0x33, 0x32, 0xc1, 0xd3, 0xdc, 0x12, 0x2e, 0x56, 0x01, 0xf8, 0x09, 0x8a, 0xfb, 0x53, - 0x20, 0xf8, 0xd7, 0x16, 0xb4, 0x1c, 0x32, 0x08, 0x9e, 0x93, 0x57, 0x12, 0xff, 0x2a, 0x80, 0xf6, - 0x7a, 0x57, 0x20, 0xa7, 0x2b, 0xc4, 0xe3, 0x3d, 0xb8, 0x50, 0x42, 0x13, 0x7f, 0x0a, 0xd0, 0x61, - 0xa7, 0x43, 0x28, 0x15, 0xa5, 0xee, 0x74, 0x98, 0xd8, 0xe9, 0xa1, 0xdb, 0xeb, 0x93, 0xae, 0x20, - 0x48, 0x8c, 0xf0, 0x47, 0x16, 0x2c, 0xdd, 0xee, 0x76, 0x3f, 0x43, 0x0c, 0xde, 0x87, 0x65, 0x13, - 0x41, 0xb5, 0xb8, 0xeb, 0x41, 0x73, 0xbb, 0x47, 0x07, 0x3d, 0x4a, 0xa5, 0xbf, 0xb0, 0x61, 0x2a, - 0x28, 0x14, 0x88, 0x83, 0x70, 0xe4, 0x24, 0xa0, 0x05, 0x93, 0x5e, 0xfe, 0x91, 0x2c, 0x86, 0xf8, - 0x0e, 0xcc, 0xe7, 0x8f, 0xe2, 0xd5, 0x8a, 0xce, 0x28, 0xd5, 0x8a, 0x0c, 0x09, 0xff, 0xc9, 0x02, - 0xb4, 0x37, 0x8c, 0x49, 0x21, 0xb4, 0xbc, 0x21, 0xaa, 0x13, 0xc1, 0x0d, 0xd5, 0x6b, 0x10, 0x23, - 0x84, 0x61, 0x76, 0x30, 0x8c, 0x49, 0xb7, 0x4d, 0x3a, 0x81, 0xdf, 0xa5, 0xec, 0x29, 0x3a, 0xe7, - 0xe4, 0x60, 0x78, 0x07, 0x16, 0x35, 0x4a, 0xeb, 0x31, 0xfd, 0x73, 0x0b, 0x5a, 0x5b, 0xae, 0xdf, - 0x21, 0xfd, 0xb7, 0xcf, 0x3a, 0xde, 0x87, 0x0b, 0x25, 0xb4, 0xd4, 0x63, 0xee, 0x10, 0x66, 0xe5, - 0x4e, 0x6f, 0x52, 0x01, 0x37, 0x61, 0x4e, 0x39, 0xa7, 0x1e, 0xad, 0x7d, 0x40, 0x05, 0xde, 0xdf, - 0x24, 0xc5, 0x3b, 0xb0, 0xa8, 0x9d, 0x56, 0x8f, 0xee, 0x3f, 0x5a, 0x70, 0xa1, 0x9d, 0x8b, 0x36, - 0xfb, 0xbd, 0xce, 0x91, 0xef, 0x0e, 0xd2, 0xd7, 0x8b, 0x97, 0xf7, 0x64, 0x5e, 0x16, 0x29, 0x7d, - 0x81, 0x98, 0x46, 0xca, 0x74, 0x9c, 0xe3, 0x7a, 0xbc, 0x9a, 0xeb, 0x09, 0x9d, 0xeb, 0x4c, 0xbb, - 0x1a, 0x39, 0xed, 0x3a, 0x00, 0xbb, 0x8c, 0xd0, 0x7a, 0xe5, 0xcd, 0x88, 0xb5, 0xc3, 0x78, 0xe5, - 0xa1, 0x3d, 0x0c, 0x45, 0x7f, 0x20, 0x2d, 0x7b, 0x14, 0x08, 0xb5, 0xaa, 0x08, 0x1d, 0xcb, 0x79, - 0x80, 0x0a, 0xf6, 0xf1, 0x2f, 0x78, 0x1b, 0xcc, 0x7c, 0x68, 0xad, 0x1b, 0x3c, 0x55, 0xd1, 0xe3, - 0x05, 0x7b, 0x22, 0x65, 0x74, 0x7c, 0x6a, 0xdd, 0xdf, 0x8f, 0xf8, 0x23, 0x47, 0x3b, 0xb9, 0x9e, - 0x08, 0x5e, 0x47, 0x0f, 0xf8, 0xbf, 0x63, 0xb0, 0x94, 0xd7, 0x2f, 0xa5, 0x30, 0x5b, 0x62, 0x04, - 0x35, 0x34, 0x60, 0x04, 0x03, 0xf8, 0xaa, 0x62, 0x5a, 0x0d, 0x51, 0x0d, 0xf0, 0x82, 0xc0, 0xeb, - 0x13, 0xfe, 0xb7, 0xc6, 0xb3, 0xe1, 0xe1, 0x7a, 0x3b, 0x8e, 0x7a, 0xbe, 0xf7, 0x1d, 0xb7, 0x3f, - 0x24, 0x8a, 0xe1, 0xdd, 0x84, 0xc9, 0x43, 0xb7, 0x43, 0x3e, 0x70, 0x1e, 0xb2, 0x3a, 0xd1, 0x49, - 0x0b, 0x53, 0x64, 0xf4, 0x35, 0x98, 0x8e, 0x64, 0xca, 0x31, 0xc9, 0x56, 0x5e, 0xd4, 0x56, 0xee, - 0xfa, 0xf1, 0x8d, 0x0d, 0xbe, 0x30, 0xc3, 0x46, 0xd7, 0x60, 0x8c, 0xbc, 0x6c, 0x4d, 0x8d, 0x70, - 0xda, 0x18, 0x79, 0x89, 0x1f, 0xc0, 0xb2, 0x49, 0xc6, 0xf5, 0xec, 0xf7, 0x38, 0xab, 0x5b, 0xdf, - 0x7e, 0x46, 0xe3, 0xc8, 0xed, 0xc4, 0x27, 0x5f, 0x99, 0x7a, 0x35, 0x63, 0xd5, 0x57, 0x33, 0xae, - 0x5d, 0x0d, 0xfe, 0x8b, 0x05, 0x2d, 0xf3, 0x99, 0xf5, 0x7a, 0xb5, 0xd7, 0xc4, 0xff, 0x3d, 0xf2, - 0xe9, 0xfc, 0x8c, 0x44, 0x22, 0x27, 0xd5, 0x27, 0xd0, 0x97, 0x61, 0xd1, 0xcb, 0xf7, 0x39, 0x76, - 0x5c, 0xfa, 0x03, 0x46, 0xe7, 0x84, 0x63, 0x9a, 0xda, 0xf8, 0xf7, 0x39, 0xe0, 0x7f, 0x0b, 0xa1, - 0x6f, 0xc0, 0x4c, 0x27, 0xfb, 0xc7, 0x04, 0x2d, 0xa5, 0x74, 0xe5, 0x7e, 0xb4, 0xb1, 0x97, 0x4d, - 0x60, 0x1a, 0xa2, 0x9b, 0x30, 0xfd, 0xc3, 0xb4, 0x51, 0x88, 0x16, 0x05, 0x92, 0xda, 0x08, 0xb5, - 0xcf, 0xe9, 0x40, 0xbe, 0xee, 0x38, 0xed, 0x42, 0xc9, 0x75, 0x6a, 0xff, 0x4b, 0xae, 0xcb, 0x37, - 0xab, 0x36, 0x61, 0xce, 0x53, 0xff, 0x0d, 0x41, 0xe7, 0xd3, 0x3f, 0x7d, 0x0a, 0xbf, 0xa9, 0xd8, - 0x2d, 0xf3, 0x04, 0x0d, 0xd1, 0x2d, 0x98, 0xa5, 0xca, 0x4f, 0x13, 0x28, 0xe5, 0xad, 0xf0, 0xa3, - 0x87, 0x7d, 0xde, 0x08, 0xa7, 0x21, 0xfa, 0x3e, 0x9c, 0xf7, 0xcc, 0x7f, 0x2c, 0xa0, 0xcb, 0x85, - 0x53, 0xf5, 0x3f, 0x06, 0x6c, 0x7c, 0x12, 0x0a, 0x0d, 0xd1, 0x21, 0x5c, 0xf0, 0xca, 0xda, 0xff, - 0xe8, 0xdd, 0x6c, 0x83, 0xd2, 0xff, 0x12, 0xec, 0x2b, 0x27, 0x23, 0xd1, 0x10, 0x3d, 0x02, 0x14, - 0x6b, 0x3d, 0x70, 0xb4, 0x22, 0xd6, 0x1a, 0xfb, 0xfb, 0xf6, 0x3b, 0x15, 0xb3, 0x34, 0x44, 0x1d, - 0x68, 0x79, 0x25, 0xad, 0x51, 0x84, 0x73, 0xbf, 0x65, 0x19, 0xdb, 0xc2, 0xf6, 0xbb, 0x27, 0xe2, - 0x70, 0xba, 0x3d, 0xad, 0xb7, 0x27, 0xe9, 0x36, 0xb6, 0x26, 0x25, 0xdd, 0x25, 0x4d, 0xc1, 0xc7, - 0xb0, 0xe8, 0xe9, 0xcd, 0x2e, 0x64, 0x5e, 0x25, 0xb5, 0x6c, 0xb5, 0x6a, 0x9a, 0x86, 0x68, 0x07, - 0x9a, 0x47, 0xf9, 0xee, 0x0d, 0x4a, 0xff, 0x4d, 0xd3, 0x9b, 0x58, 0xb6, 0x5d, 0x36, 0x25, 0x59, - 0x2e, 0xb4, 0x43, 0x54, 0x96, 0xf5, 0x0e, 0x8d, 0xca, 0xb2, 0xa9, 0x8f, 0xb2, 0x0f, 0x0b, 0xbd, - 0x62, 0x87, 0x00, 0x5d, 0x4c, 0x8b, 0xfa, 0x86, 0x96, 0x87, 0xbd, 0x52, 0x3e, 0xc9, 0xf7, 0xf3, - 0x8a, 0xe5, 0x74, 0xb9, 0x9f, 0xa9, 0x0f, 0x60, 0xaf, 0x94, 0x4f, 0x72, 0x43, 0x55, 0x2b, 0x3d, - 0xd2, 0x50, 0x0b, 0xd5, 0x24, 0xfb, 0xbc, 0x11, 0x4e, 0x43, 0x74, 0x03, 0xa6, 0x52, 0x18, 0x42, - 0x05, 0xa4, 0x64, 0xe1, 0xa2, 0x06, 0xe3, 0xae, 0x49, 0xfa, 0x0c, 0x54, 0xc4, 0xa0, 0xaa, 0x6b, - 0xca, 0x17, 0x54, 0x1f, 0xc9, 0x32, 0x9f, 0x52, 0x01, 0x94, 0x17, 0x64, 0xac, 0x44, 0xca, 0x0b, - 0x32, 0x97, 0x0e, 0x13, 0xed, 0x29, 0x54, 0xec, 0xa4, 0xf6, 0xe8, 0x15, 0x45, 0xa9, 0x3d, 0x86, - 0x22, 0x5f, 0xe2, 0xe5, 0x95, 0xb2, 0x9c, 0xf4, 0xf2, 0xf9, 0xc2, 0x9f, 0xf4, 0xf2, 0x85, 0x0a, - 0x5e, 0xc2, 0x9a, 0x5e, 0x78, 0x2a, 0x31, 0x37, 0x51, 0xeb, 0x28, 0x31, 0x37, 0x59, 0x78, 0x78, - 0x02, 0x4b, 0xc6, 0x9a, 0x0b, 0xba, 0x24, 0xd6, 0x95, 0x55, 0x89, 0xec, 0xb5, 0x6a, 0x04, 0x4e, - 0xae, 0x5e, 0xee, 0x90, 0xe4, 0x1a, 0x4b, 0x33, 0x92, 0xdc, 0x92, 0x3a, 0xc9, 0x2d, 0x98, 0x55, - 0x4b, 0x11, 0x52, 0x15, 0x0b, 0xa5, 0x10, 0xa9, 0x8a, 0x5a, 0xdd, 0x62, 0x07, 0x9a, 0x85, 0xe4, - 0x57, 0x5e, 0xa5, 0x9e, 0xa0, 0xcb, 0xab, 0x34, 0xe5, 0xcb, 0x4f, 0x60, 0xc9, 0x98, 0x4c, 0x4b, - 0xc9, 0x95, 0xa5, 0xfd, 0x52, 0x72, 0xe5, 0xb9, 0xf8, 0x4d, 0x98, 0x96, 0x60, 0xa9, 0xfb, 0x6a, - 0xe2, 0x2a, 0x75, 0x3f, 0x9f, 0x5f, 0xee, 0x40, 0xb3, 0xb0, 0xa9, 0xe4, 0x4e, 0x4f, 0x7e, 0x25, - 0x77, 0xa6, 0x4c, 0xf5, 0x7b, 0xc5, 0x87, 0x60, 0x9a, 0xcc, 0xa1, 0xb5, 0x42, 0x38, 0xd6, 0x92, - 0x52, 0xfb, 0xf2, 0x09, 0x18, 0x3c, 0x74, 0x97, 0x64, 0x59, 0x6a, 0xe8, 0x2e, 0x49, 0xfd, 0xd4, - 0xd0, 0x5d, 0x9a, 0xa8, 0x71, 0x5b, 0x29, 0xe4, 0x2f, 0xaa, 0xad, 0xe8, 0x49, 0x95, 0x6a, 0x2b, - 0xa6, 0xc4, 0xe7, 0x11, 0x20, 0xfd, 0x71, 0x2c, 0xb7, 0x34, 0xe6, 0x26, 0x72, 0xcb, 0x92, 0x57, - 0xf5, 0x77, 0x95, 0xc6, 0xac, 0xf2, 0x5c, 0x45, 0xc5, 0x78, 0x56, 0x78, 0x3f, 0xdb, 0x97, 0x2a, - 0xe7, 0x69, 0xb8, 0xd9, 0x7c, 0x32, 0xb7, 0xce, 0x7f, 0x4a, 0x7f, 0x9f, 0x7d, 0x9f, 0x9d, 0x61, - 0x6f, 0xfe, 0x1b, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x1a, 0xe8, 0x0c, 0xb0, 0x2e, 0x00, + 0x55, 0x3d, 0xe3, 0x89, 0x3d, 0xcf, 0x9e, 0x8c, 0x53, 0x8e, 0x9d, 0x49, 0xc7, 0xeb, 0x38, 0xb5, + 0x61, 0x89, 0x20, 0x38, 0xe0, 0x48, 0x11, 0xb0, 0x88, 0x10, 0xdb, 0x49, 0xec, 0x24, 0xb6, 0x49, + 0x4f, 0x16, 0xa4, 0x48, 0x28, 0x8c, 0x67, 0x6a, 0x9a, 0xc1, 0x33, 0xdd, 0xed, 0xae, 0x1e, 0x3b, + 0x70, 0x59, 0x71, 0x59, 0x09, 0x84, 0xb4, 0x7c, 0x5c, 0x17, 0xc1, 0x72, 0x81, 0x03, 0x48, 0x1c, + 0xe0, 0x8c, 0x38, 0x70, 0xe3, 0x0f, 0x70, 0xe5, 0x0f, 0xf0, 0x17, 0x50, 0x57, 0x55, 0x57, 0x57, + 0x77, 0x75, 0xb7, 0x27, 0xed, 0x64, 0xc3, 0xa5, 0xa5, 0x7a, 0xf5, 0xaa, 0xea, 0x7d, 0xd5, 0xab, + 0xf7, 0xd1, 0x70, 0xc1, 0xf6, 0xdd, 0xb1, 0x77, 0x8b, 0x7d, 0xd7, 0x3c, 0xdf, 0x0d, 0x5c, 0x54, + 0x63, 0x03, 0xf3, 0xda, 0xbe, 0x47, 0x9c, 0x17, 0x3b, 0xbb, 0xb7, 0xbc, 0x43, 0xfb, 0x16, 0x9b, + 0xb9, 0x45, 0x7b, 0x87, 0x2f, 0x4e, 0xe8, 0xad, 0x13, 0xca, 0x31, 0xcd, 0xcf, 0xe7, 0xa3, 0xf8, + 0x1d, 0xcf, 0x23, 0xbe, 0x40, 0xc4, 0xdf, 0x04, 0xd8, 0x74, 0x47, 0x23, 0xd7, 0xb1, 0x08, 0xf5, + 0x50, 0x0b, 0xa6, 0xef, 0xfb, 0xfe, 0xa6, 0xdb, 0x23, 0x2d, 0x63, 0xd5, 0xb8, 0x51, 0xb3, 0xa2, + 0x21, 0x5a, 0x82, 0x73, 0xf7, 0x7d, 0x7f, 0x97, 0xda, 0xad, 0xca, 0xaa, 0x71, 0xa3, 0x6e, 0x89, + 0x11, 0x7e, 0x04, 0xe8, 0x61, 0x48, 0xd4, 0xbd, 0x5e, 0x6f, 0x97, 0x8c, 0x0e, 0x88, 0xbf, 0xe3, + 0xf4, 0xdd, 0x10, 0xfb, 0x03, 0x4a, 0xfc, 0x9d, 0x2d, 0xb6, 0x4d, 0xdd, 0x12, 0x23, 0xb4, 0x0c, + 0x75, 0xcb, 0x1d, 0x92, 0x27, 0xe4, 0x98, 0x0c, 0xd9, 0x46, 0x35, 0x2b, 0x06, 0xe0, 0xff, 0x1a, + 0x70, 0x7e, 0xd3, 0x27, 0x9d, 0x80, 0xb0, 0x2d, 0x2d, 0x72, 0x84, 0xee, 0xc1, 0xf9, 0x1d, 0x67, + 0x10, 0xf0, 0xad, 0x9f, 0x0c, 0x68, 0xd0, 0x32, 0x56, 0xab, 0x37, 0x66, 0xd7, 0x2f, 0xaf, 0x71, + 0xb9, 0xe8, 0x67, 0x5b, 0xa9, 0x05, 0xe8, 0xeb, 0x50, 0x67, 0x58, 0xe1, 0x24, 0x3b, 0x73, 0x76, + 0x7d, 0x79, 0x8d, 0x12, 0xff, 0x98, 0xf8, 0x2f, 0x3a, 0xde, 0xe0, 0x85, 0xd7, 0xf1, 0x3b, 0x23, + 0xba, 0x26, 0x71, 0xac, 0x18, 0x1d, 0xad, 0xc2, 0xec, 0xbe, 0x47, 0xfc, 0x4e, 0x30, 0x70, 0x9d, + 0x9d, 0xad, 0x56, 0x95, 0x31, 0xa3, 0x82, 0x90, 0x09, 0x33, 0xfb, 0x9e, 0xe0, 0x75, 0x8a, 0x4d, + 0xcb, 0x31, 0x5b, 0x7d, 0xe2, 0x10, 0x5f, 0x4c, 0xd7, 0xc4, 0xea, 0x18, 0x84, 0x3f, 0x84, 0x66, + 0x82, 0xe1, 0x32, 0x2a, 0x48, 0x32, 0x58, 0x7d, 0x25, 0x06, 0xb1, 0x0f, 0xf3, 0x0f, 0x49, 0xc0, + 0xc6, 0x94, 0xcd, 0x91, 0xa3, 0x90, 0x6c, 0x8e, 0xb0, 0x25, 0x05, 0x5e, 0xb7, 0x54, 0x50, 0x5a, + 0x2c, 0x95, 0x62, 0xb1, 0x54, 0x93, 0x62, 0xc1, 0x3f, 0x35, 0xe0, 0x42, 0xea, 0xd0, 0x52, 0x7c, + 0x6f, 0x40, 0x43, 0x32, 0xc2, 0x28, 0xad, 0x32, 0xd3, 0x28, 0xe6, 0x3d, 0xb9, 0x04, 0xff, 0xc6, + 0x80, 0x66, 0x5b, 0xd0, 0x12, 0xf1, 0xff, 0x04, 0x9a, 0x76, 0x34, 0x7e, 0xe0, 0xfa, 0x6d, 0x12, + 0x30, 0x8a, 0x66, 0xd7, 0x71, 0xd1, 0xce, 0x1c, 0xd3, 0x4a, 0x2f, 0x4d, 0x48, 0xa2, 0x92, 0x61, + 0x20, 0x85, 0xe6, 0x85, 0xef, 0xc3, 0x7c, 0x92, 0x3c, 0xea, 0xa1, 0xaf, 0xa8, 0x57, 0x56, 0x90, + 0x76, 0x41, 0xdc, 0x87, 0x78, 0xc2, 0x52, 0x90, 0xf0, 0x8f, 0xc1, 0x8c, 0x24, 0x7e, 0xcf, 0xf3, + 0x86, 0x83, 0x2e, 0xdb, 0x3f, 0x94, 0x40, 0xc8, 0xb0, 0x4a, 0xa2, 0x51, 0x4c, 0x62, 0x86, 0xaa, + 0x57, 0x00, 0x1e, 0xf8, 0xee, 0x28, 0xa1, 0x6c, 0x05, 0x82, 0x3f, 0x31, 0xe0, 0x4a, 0xee, 0xe1, + 0xa5, 0x14, 0xff, 0x18, 0xe6, 0x23, 0x07, 0x31, 0x26, 0x34, 0x50, 0x74, 0x7f, 0x35, 0x4f, 0x43, + 0x02, 0xd5, 0xd2, 0x16, 0xe2, 0x00, 0x96, 0x1f, 0x92, 0x20, 0xa4, 0xd5, 0x22, 0x47, 0x19, 0xc2, + 0xc9, 0x73, 0x65, 0x67, 0xd3, 0xeb, 0x6f, 0x0d, 0x78, 0xa7, 0xe0, 0xd8, 0x52, 0x5a, 0xce, 0x94, + 0x4b, 0xa5, 0xac, 0x5c, 0xfe, 0x6e, 0xc0, 0xe2, 0x33, 0xbf, 0xe3, 0xd0, 0x3e, 0xf1, 0xd9, 0x24, + 0xf3, 0x5b, 0xa1, 0x44, 0x5a, 0x30, 0x2d, 0x9c, 0x81, 0x10, 0x49, 0x34, 0x44, 0xef, 0xc1, 0xf9, + 0xfd, 0x61, 0x4f, 0xf5, 0x79, 0x5c, 0x32, 0x29, 0x68, 0x88, 0xb7, 0x47, 0x4e, 0x54, 0x3c, 0x2e, + 0xa2, 0x14, 0x34, 0x2d, 0xc7, 0xa9, 0x62, 0x3f, 0x53, 0x4b, 0xf9, 0x99, 0xc7, 0xb0, 0x94, 0xc5, + 0x40, 0xb9, 0x1b, 0xf4, 0x2f, 0x03, 0xe6, 0x1e, 0xb9, 0x03, 0x47, 0xbe, 0x4c, 0xf9, 0x52, 0x58, + 0x01, 0xb0, 0xc8, 0xd1, 0x2e, 0xa1, 0xb4, 0x63, 0x13, 0x21, 0x01, 0x05, 0x52, 0xe4, 0x1b, 0x27, + 0xe0, 0x78, 0x05, 0x20, 0xa4, 0xa3, 0xed, 0x8e, 0xfd, 0x2e, 0x61, 0x3c, 0xd7, 0x2c, 0x05, 0x82, + 0xae, 0x43, 0x63, 0xc7, 0x39, 0x1e, 0x04, 0x52, 0xb4, 0xe7, 0xd8, 0x1e, 0x49, 0x20, 0xde, 0x80, + 0x86, 0xc2, 0x4d, 0x39, 0x91, 0xfc, 0x3b, 0xbc, 0xd8, 0xa9, 0x5b, 0x1d, 0x4e, 0xb8, 0x0e, 0x25, + 0xe2, 0x1d, 0x51, 0x79, 0x31, 0x8a, 0xb5, 0x97, 0xbe, 0x43, 0x8a, 0x7c, 0xab, 0x9a, 0x7c, 0x15, + 0x87, 0x33, 0x95, 0x76, 0x38, 0xe1, 0xfc, 0x76, 0xc7, 0xe9, 0x0d, 0x49, 0x2f, 0x74, 0x1d, 0xdc, + 0x2a, 0x14, 0x08, 0xc2, 0x30, 0xc7, 0x47, 0x16, 0xa1, 0xe3, 0x61, 0xc0, 0x04, 0x54, 0xb3, 0x12, + 0x30, 0xfc, 0x14, 0x96, 0xf3, 0x59, 0x2b, 0x27, 0xae, 0x3e, 0xcc, 0x3d, 0x1d, 0x0f, 0x82, 0x09, + 0x0c, 0xe8, 0x6c, 0xcf, 0xeb, 0x06, 0x34, 0x94, 0x73, 0xca, 0xd1, 0xfa, 0xa9, 0x01, 0x8b, 0x91, + 0xcf, 0x8e, 0x43, 0xa9, 0x62, 0xaa, 0xcf, 0xe4, 0x10, 0x43, 0x37, 0xfb, 0x60, 0x30, 0x0c, 0x88, + 0xcf, 0x14, 0x5a, 0xb3, 0xc4, 0x28, 0x3c, 0x6f, 0x8f, 0xbc, 0x0c, 0xda, 0xe4, 0x48, 0xd8, 0x7a, + 0x34, 0xc4, 0x7f, 0x32, 0x60, 0x29, 0x8b, 0xc6, 0x52, 0x4f, 0xca, 0x03, 0x80, 0x51, 0x1c, 0x63, + 0xf2, 0xc7, 0xe4, 0xbd, 0x3c, 0xa7, 0xc9, 0x4f, 0x7b, 0x30, 0x1e, 0x0e, 0xd9, 0x9b, 0xac, 0xac, + 0x0c, 0x4f, 0x76, 0x04, 0xb9, 0x9c, 0x8f, 0x68, 0x88, 0x7f, 0xa1, 0x91, 0x2b, 0x03, 0xae, 0x42, + 0x57, 0xa2, 0x90, 0x55, 0x61, 0x91, 0x98, 0x7a, 0xdc, 0x99, 0x5c, 0x09, 0xfe, 0xb5, 0x01, 0x97, + 0x32, 0x49, 0x7a, 0x9b, 0x22, 0xc4, 0x7f, 0x31, 0x00, 0x3d, 0x1e, 0x74, 0x0f, 0x15, 0xbc, 0x62, + 0x21, 0x7d, 0x01, 0xe6, 0x43, 0x7c, 0xd2, 0xe3, 0x8c, 0x2b, 0xa2, 0xd2, 0xe0, 0x21, 0xf1, 0x16, + 0xe9, 0x50, 0xd7, 0x11, 0xe2, 0x12, 0xa3, 0xb4, 0xb0, 0x6a, 0xc5, 0x57, 0xee, 0x5c, 0xea, 0xca, + 0xbd, 0x0f, 0xf5, 0x9d, 0xde, 0x3a, 0x77, 0x1d, 0xb9, 0x01, 0x03, 0x3b, 0x9a, 0x39, 0x1c, 0x9e, + 0xf8, 0x88, 0x11, 0xfe, 0x10, 0x16, 0x34, 0x76, 0x4b, 0x29, 0xe0, 0x0e, 0x34, 0x24, 0x15, 0x8a, + 0x0e, 0xe6, 0xc5, 0x55, 0x97, 0x73, 0x56, 0x12, 0x0d, 0x8f, 0xd9, 0x5d, 0x0f, 0x9f, 0x03, 0xd2, + 0x63, 0x54, 0x44, 0x77, 0x3d, 0xe9, 0x68, 0x0d, 0xcd, 0xd1, 0xae, 0xc2, 0xac, 0xab, 0xfb, 0x29, + 0x77, 0x42, 0x3f, 0xf5, 0x11, 0xbf, 0x10, 0xda, 0xb9, 0x67, 0xca, 0x81, 0x26, 0xce, 0x03, 0x62, + 0x74, 0xfc, 0x57, 0x03, 0x2e, 0xf2, 0xd7, 0x31, 0xa4, 0xec, 0x99, 0x2b, 0x3d, 0xf4, 0xe9, 0x7e, + 0x38, 0xff, 0x91, 0x8a, 0x0d, 0x6d, 0x2a, 0x61, 0x68, 0x37, 0xe1, 0x02, 0x3f, 0x4b, 0xb5, 0xd6, + 0x1a, 0xb3, 0x56, 0x7d, 0xa2, 0xd0, 0xe8, 0x7e, 0x62, 0xc0, 0x62, 0x06, 0xd9, 0x9f, 0xa9, 0xe9, + 0x7c, 0x62, 0xc0, 0x45, 0x19, 0xdb, 0x0f, 0x87, 0x93, 0xdc, 0xd6, 0x33, 0x3f, 0x13, 0xfb, 0xfd, + 0x3e, 0x25, 0x41, 0xf4, 0x4c, 0xf0, 0x11, 0xba, 0x08, 0xb5, 0x4d, 0x77, 0xec, 0x04, 0xe2, 0x91, + 0xe0, 0x03, 0xfc, 0x4b, 0xe5, 0x19, 0x53, 0xc8, 0x7b, 0xab, 0xee, 0xed, 0xf7, 0x06, 0xcc, 0x6c, + 0xee, 0xb6, 0x19, 0x5a, 0x32, 0x75, 0x37, 0x5e, 0xad, 0x36, 0xb1, 0x26, 0x2a, 0x2f, 0x32, 0x60, + 0xde, 0xeb, 0x8c, 0xa2, 0x70, 0x33, 0x63, 0x26, 0x74, 0x93, 0x49, 0xa8, 0x94, 0xb0, 0x06, 0x0f, + 0x5f, 0x86, 0xd9, 0x48, 0x70, 0xa1, 0x3a, 0x97, 0x05, 0x9d, 0xec, 0x08, 0xae, 0xd0, 0x18, 0x80, + 0xb6, 0x00, 0xbe, 0xdd, 0xb1, 0x07, 0x0e, 0x53, 0x92, 0x28, 0xb1, 0x5c, 0xcf, 0x60, 0x43, 0xa4, + 0x17, 0x31, 0xae, 0xa5, 0xac, 0x9b, 0x20, 0x69, 0xfa, 0xd4, 0x80, 0xb9, 0x98, 0x2a, 0xea, 0xa1, + 0x2f, 0x41, 0x3d, 0x12, 0x25, 0x15, 0x85, 0xa1, 0x66, 0x14, 0xd8, 0x08, 0xb8, 0x15, 0x63, 0xbc, + 0x26, 0x3a, 0xa5, 0x2c, 0xc6, 0x23, 0xca, 0xa8, 0xac, 0x59, 0x31, 0x00, 0x1f, 0xc7, 0x24, 0xd2, + 0x50, 0x72, 0xc9, 0x33, 0x8d, 0xd7, 0x23, 0x1b, 0xdd, 0x13, 0xe1, 0xdf, 0x19, 0xd0, 0x50, 0x0e, + 0x7e, 0x5b, 0xc2, 0x31, 0x61, 0x26, 0x92, 0x85, 0x90, 0x8d, 0x1c, 0xe3, 0xfd, 0xb8, 0xec, 0x33, + 0x89, 0xa3, 0x38, 0x9d, 0xe7, 0x8f, 0x0c, 0x40, 0x7c, 0xcc, 0x5c, 0xa0, 0xe5, 0x0e, 0x49, 0xf1, + 0x96, 0xf1, 0xd3, 0x5c, 0xc9, 0x2f, 0x4b, 0x56, 0x53, 0x65, 0xc9, 0x09, 0x02, 0xa9, 0x45, 0x58, + 0xd0, 0xe8, 0xa0, 0x1e, 0xde, 0x85, 0x66, 0xc4, 0xf0, 0xc6, 0x8f, 0x76, 0xb6, 0xce, 0xca, 0xee, + 0xdd, 0xb8, 0x56, 0xc7, 0xb7, 0xa3, 0x1e, 0xfa, 0x62, 0xec, 0x4c, 0x84, 0x71, 0x69, 0x3a, 0x96, + 0x08, 0xf8, 0x6f, 0x5a, 0x54, 0x4f, 0x37, 0x77, 0xdb, 0xa7, 0xba, 0xeb, 0x94, 0x6f, 0x91, 0xe3, + 0x94, 0xc9, 0x54, 0x5f, 0x8f, 0x6d, 0x67, 0x88, 0xf7, 0x1f, 0x7a, 0xe8, 0xcc, 0xe8, 0xa6, 0x1e, + 0xfa, 0x16, 0x4c, 0x73, 0xdf, 0x1a, 0x99, 0xf8, 0xa4, 0x2e, 0x39, 0x5a, 0x86, 0xee, 0x67, 0xd8, + 0xfd, 0xe7, 0x32, 0x99, 0xe0, 0xe9, 0x5f, 0x0e, 0x17, 0x2b, 0x00, 0xfc, 0x04, 0xc5, 0x2d, 0x28, + 0x10, 0xfc, 0x2b, 0x03, 0x5a, 0x16, 0x19, 0xb9, 0xc7, 0xe4, 0x95, 0xc4, 0xbf, 0x02, 0xa0, 0x45, + 0xb5, 0x0a, 0xe4, 0x6c, 0x05, 0x6a, 0xbc, 0x0b, 0x97, 0x73, 0x68, 0xe2, 0x4f, 0x24, 0x1d, 0x77, + 0xbb, 0x84, 0x52, 0x51, 0x02, 0x8e, 0x86, 0xe1, 0x35, 0xea, 0x77, 0x06, 0x43, 0xd2, 0x13, 0x04, + 0x89, 0x11, 0xfe, 0xd8, 0x80, 0xc5, 0x7b, 0xbd, 0xde, 0xff, 0x11, 0x83, 0x8f, 0x60, 0x29, 0x8b, + 0xa0, 0x52, 0xdc, 0x0d, 0xa0, 0xb9, 0x35, 0xa0, 0xa3, 0x01, 0xa5, 0xf2, 0x59, 0x34, 0x61, 0xc6, + 0x4d, 0x15, 0x4e, 0x5d, 0x6f, 0xe2, 0xe0, 0xb8, 0x05, 0xd3, 0x76, 0x32, 0x78, 0x14, 0x43, 0x7c, + 0x1f, 0xe6, 0x93, 0x47, 0xf1, 0x2c, 0xbe, 0x3b, 0x49, 0x16, 0x1f, 0x23, 0xe1, 0x3f, 0x1a, 0x80, + 0x76, 0xc7, 0x01, 0x49, 0xb9, 0xdc, 0x37, 0x44, 0x75, 0x28, 0xb8, 0xb1, 0xaa, 0x06, 0x31, 0x42, + 0x18, 0xe6, 0x46, 0xe3, 0x80, 0xf4, 0xda, 0xa4, 0xeb, 0x3a, 0x3d, 0xca, 0x42, 0xb4, 0x86, 0x95, + 0x80, 0xe1, 0x6d, 0x58, 0xd0, 0x28, 0x2d, 0xc7, 0xf4, 0xcf, 0x0c, 0x68, 0x6d, 0x76, 0x9c, 0x2e, + 0x19, 0xbe, 0x7d, 0xd6, 0xf1, 0x1e, 0x5c, 0xce, 0xa1, 0xa5, 0x1c, 0x73, 0x7d, 0x98, 0x93, 0x3b, + 0xbd, 0x49, 0x03, 0xdc, 0x80, 0x86, 0x72, 0x4e, 0x39, 0x5a, 0x87, 0x80, 0x52, 0xbc, 0xbf, 0x49, + 0x8a, 0xb7, 0x61, 0x41, 0x3b, 0xad, 0x1c, 0xdd, 0x7f, 0x30, 0xe0, 0x72, 0x3b, 0xf1, 0xda, 0xec, + 0x0d, 0xba, 0x87, 0x4e, 0x67, 0x14, 0x05, 0x17, 0x76, 0xd2, 0x93, 0xd9, 0xf1, 0x4b, 0xe9, 0x08, + 0xc4, 0xe8, 0xa5, 0x8c, 0xc6, 0x09, 0xae, 0xab, 0xc5, 0x5c, 0x4f, 0xe9, 0x5c, 0xc7, 0xd6, 0x55, + 0x4b, 0x58, 0xd7, 0x3e, 0x98, 0x79, 0x84, 0x96, 0x2b, 0xfb, 0xf9, 0xac, 0x4d, 0xc4, 0x33, 0xf2, + 0xf6, 0xd8, 0x13, 0x75, 0xf3, 0xa8, 0x1c, 0x90, 0x22, 0xd4, 0x28, 0x22, 0xb4, 0x92, 0xf0, 0x00, + 0x05, 0xec, 0xe3, 0x9f, 0xf3, 0xf6, 0x50, 0xf6, 0xa1, 0xa5, 0x34, 0x78, 0xa6, 0x62, 0xc0, 0x09, + 0x0b, 0x91, 0x62, 0x3a, 0x3e, 0xb3, 0xae, 0xe8, 0xc7, 0x3c, 0xc8, 0xd1, 0x4e, 0x2e, 0x27, 0x82, + 0xd7, 0xd1, 0x1b, 0xfd, 0x4f, 0x05, 0x16, 0x93, 0xf6, 0xa5, 0x14, 0x2c, 0x73, 0x2e, 0x41, 0x09, + 0x0b, 0x98, 0xe0, 0x02, 0x7c, 0x55, 0xb9, 0x5a, 0x35, 0x91, 0x25, 0xdb, 0xae, 0x6b, 0x0f, 0x09, + 0xff, 0x8b, 0xe1, 0x60, 0xdc, 0x5f, 0x6b, 0x07, 0xfe, 0xc0, 0xb1, 0xbf, 0xd3, 0x19, 0x8e, 0x89, + 0x72, 0xf1, 0xee, 0xc0, 0x74, 0xbf, 0xd3, 0x25, 0x1f, 0x58, 0x4f, 0x58, 0xfd, 0xe4, 0xb4, 0x85, + 0x11, 0x32, 0xfa, 0x1a, 0xd4, 0x7d, 0x99, 0x11, 0x4c, 0xb3, 0x95, 0x57, 0xb4, 0x95, 0x3b, 0x4e, + 0x70, 0x7b, 0x9d, 0x2f, 0x8c, 0xb1, 0xd1, 0x4d, 0xa8, 0x90, 0x97, 0xad, 0x99, 0x09, 0x4e, 0xab, + 0x90, 0x97, 0xf8, 0x31, 0x2c, 0x65, 0xc9, 0xb8, 0xdc, 0xfd, 0x3d, 0x8a, 0xeb, 0xb9, 0xf7, 0x0e, + 0x68, 0xe0, 0x77, 0xba, 0xc1, 0xe9, 0x2a, 0x53, 0x55, 0x53, 0x29, 0x56, 0x4d, 0x55, 0x53, 0x0d, + 0xfe, 0xb3, 0x01, 0xad, 0xec, 0x33, 0xcb, 0xf5, 0x30, 0x6f, 0x8a, 0xff, 0x5e, 0x64, 0xe8, 0x7c, + 0x40, 0x7c, 0x51, 0x30, 0xd5, 0x27, 0xd0, 0x97, 0x61, 0xc1, 0x4e, 0xd6, 0xff, 0xb7, 0x3b, 0xf4, + 0x07, 0x8c, 0xce, 0x29, 0x2b, 0x6b, 0x6a, 0xfd, 0x9f, 0x0b, 0xc0, 0xff, 0xa2, 0x41, 0xdf, 0x80, + 0xd9, 0x6e, 0xfc, 0xef, 0x05, 0x5a, 0x8c, 0xe8, 0x4a, 0xfc, 0x80, 0x62, 0x2e, 0x65, 0x81, 0xa9, + 0x87, 0xee, 0x40, 0xfd, 0x87, 0x51, 0x03, 0x0d, 0x2d, 0x08, 0x24, 0xb5, 0x41, 0x68, 0x5e, 0xd4, + 0x81, 0x7c, 0xdd, 0x51, 0xd4, 0x9d, 0x91, 0xeb, 0xd4, 0xbe, 0x90, 0x5c, 0x97, 0x6c, 0xe2, 0x6c, + 0x40, 0xc3, 0x56, 0xff, 0x99, 0x40, 0x97, 0xa2, 0x3f, 0x60, 0x52, 0xbf, 0x6f, 0x98, 0xad, 0xec, + 0x09, 0xea, 0xa1, 0xbb, 0x30, 0x47, 0x95, 0x9f, 0x09, 0x50, 0xc4, 0x5b, 0xea, 0x07, 0x08, 0xf3, + 0x52, 0x26, 0x9c, 0x7a, 0xe8, 0xfb, 0x70, 0xc9, 0xce, 0xee, 0xe4, 0xa3, 0x6b, 0xa9, 0x53, 0xf5, + 0x4e, 0xba, 0x89, 0x4f, 0x43, 0xa1, 0x1e, 0xea, 0xc3, 0x65, 0x3b, 0xaf, 0x2d, 0x8e, 0xde, 0x8d, + 0x37, 0xc8, 0xed, 0xd7, 0x9b, 0xd7, 0x4f, 0x47, 0xa2, 0x1e, 0x7a, 0x0a, 0x28, 0xd0, 0x7a, 0xc3, + 0x68, 0x59, 0xac, 0xcd, 0xec, 0x7b, 0x9b, 0xef, 0x14, 0xcc, 0x52, 0x0f, 0x75, 0xa1, 0x65, 0xe7, + 0xb4, 0x0c, 0x11, 0x4e, 0xfc, 0xae, 0x94, 0xd9, 0x2e, 0x35, 0xdf, 0x3d, 0x15, 0x87, 0xd3, 0x6d, + 0x6b, 0x3d, 0x2f, 0x49, 0x77, 0x66, 0xcb, 0x4e, 0xd2, 0x9d, 0xd3, 0x2c, 0x7b, 0x06, 0x0b, 0xb6, + 0xde, 0x04, 0x42, 0xd9, 0xab, 0xa4, 0x95, 0xad, 0x14, 0x4d, 0x53, 0x0f, 0x6d, 0x43, 0xf3, 0x30, + 0xd9, 0xd5, 0x40, 0xd1, 0x3f, 0x5b, 0x7a, 0x73, 0xc7, 0x34, 0xf3, 0xa6, 0x24, 0xcb, 0xa9, 0x36, + 0x81, 0xca, 0xb2, 0xde, 0xb9, 0x50, 0x59, 0xce, 0xea, 0x2f, 0xec, 0xc1, 0x85, 0x41, 0xba, 0x72, + 0x8e, 0xae, 0x44, 0xc5, 0xee, 0x8c, 0x56, 0x80, 0xb9, 0x9c, 0x3f, 0xc9, 0xf7, 0xb3, 0xd3, 0x65, + 0x66, 0xb9, 0x5f, 0x56, 0x7d, 0xdc, 0x5c, 0xce, 0x9f, 0xe4, 0x17, 0x55, 0xad, 0xf4, 0xc8, 0x8b, + 0x9a, 0xaa, 0x26, 0x99, 0x97, 0x32, 0xe1, 0xd4, 0x43, 0xb7, 0x61, 0x26, 0x82, 0x21, 0x94, 0x42, + 0x0a, 0x17, 0x2e, 0x68, 0x30, 0xee, 0x9a, 0xa4, 0xcf, 0x40, 0x69, 0x0c, 0xaa, 0xba, 0xa6, 0x64, + 0xa1, 0x71, 0x1b, 0x9a, 0xa9, 0xea, 0x97, 0x54, 0xb5, 0x5e, 0x9d, 0x93, 0xaa, 0xce, 0x28, 0x98, + 0x85, 0xaa, 0xd6, 0xeb, 0x3c, 0x39, 0xd6, 0x2d, 0x4a, 0x0b, 0x39, 0xd6, 0x2d, 0xf3, 0xfc, 0xe7, + 0xb0, 0x98, 0x59, 0xe2, 0x40, 0x57, 0xc5, 0xba, 0xbc, 0xa2, 0x8c, 0xb9, 0x5a, 0x8c, 0xc0, 0xc9, + 0xd5, 0xab, 0x0b, 0x92, 0xdc, 0xcc, 0x4a, 0x88, 0x24, 0x37, 0xa7, 0x2c, 0x71, 0x17, 0xe6, 0xd4, + 0xcc, 0x5f, 0x6a, 0x3e, 0x55, 0x79, 0x90, 0x9a, 0xd7, 0xca, 0x04, 0xdb, 0xd0, 0x4c, 0xe5, 0x9a, + 0x52, 0x19, 0x7a, 0x3e, 0x2c, 0x95, 0x91, 0x95, 0x9e, 0x3e, 0x87, 0xc5, 0xcc, 0xdc, 0x55, 0x4a, + 0x2e, 0x2f, 0xcb, 0x96, 0x92, 0xcb, 0x4f, 0x7d, 0xef, 0x40, 0x5d, 0x82, 0xa5, 0xa9, 0xa9, 0x79, + 0xa2, 0x34, 0xb5, 0x64, 0x3a, 0xb7, 0x0d, 0xcd, 0xd4, 0xa6, 0x92, 0x3b, 0x3d, 0xd7, 0x94, 0xdc, + 0x65, 0x25, 0x86, 0xdf, 0x4b, 0xc7, 0x5d, 0x51, 0xee, 0x84, 0x56, 0x53, 0xaf, 0x9f, 0x96, 0x03, + 0x9a, 0xd7, 0x4e, 0xc1, 0xe0, 0x2f, 0x65, 0x4e, 0x52, 0xa3, 0xbe, 0x94, 0x39, 0x99, 0x96, 0xfa, + 0x52, 0xe6, 0xe6, 0x45, 0xfc, 0xae, 0xa4, 0xd2, 0x05, 0xf5, 0xae, 0xe8, 0x39, 0x8c, 0x7a, 0x57, + 0xb2, 0xf2, 0x8c, 0xa7, 0x80, 0xf4, 0x58, 0x54, 0x6e, 0x99, 0x99, 0x0a, 0xc8, 0x2d, 0x73, 0x82, + 0xd8, 0xef, 0x2a, 0xfd, 0x41, 0x25, 0x3a, 0x44, 0xe9, 0xe7, 0x23, 0x15, 0xae, 0x9a, 0x57, 0x0b, + 0xe7, 0xa9, 0xb7, 0xd1, 0x7c, 0xde, 0x58, 0xe3, 0xff, 0x46, 0xbf, 0xcf, 0xbe, 0x07, 0xe7, 0x58, + 0x88, 0x7d, 0xfb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xe2, 0x3c, 0x77, 0x37, 0x2d, 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 96fd1648f..cffe91886 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -247,16 +247,6 @@ message GetGroupMemberReq { string OperationID = 2; } -message OperateGroupStatusReq { - string GroupID = 1; - int32 Status = 2; - string OperationID = 3; -} - -message OperateGroupStatusResp { - -} - message OperateUserRoleReq { string GroupID = 1; string UserID = 2; @@ -268,15 +258,6 @@ message OperateUserRoleResp { } -message DeleteGroupReq { - string GroupID = 1; - string OperationID = 2; -} - -message DeleteGroupResp { - -} - message GetGroupByIDReq { string GroupID = 1; string OperationID = 2; @@ -463,12 +444,10 @@ service group{ rpc inviteUserToGroup(InviteUserToGroupReq) returns (InviteUserToGroupResp); rpc getGroupAllMember(GetGroupAllMemberReq) returns(GetGroupAllMemberResp); - rpc GetGroupById(GetGroupByIDReq) returns(GetGroupByIDResp); + rpc GetGroupByID(GetGroupByIDReq) returns(GetGroupByIDResp); rpc GetGroup(GetGroupReq) returns(GetGroupResp); rpc GetGroups(GetGroupsReq) returns(GetGroupsResp); - rpc OperateGroupStatus(OperateGroupStatusReq) returns(OperateGroupStatusResp); rpc OperateUserRole(OperateUserRoleReq) returns(OperateUserRoleResp); - rpc DeleteGroup(DeleteGroupReq) returns(DeleteGroupResp); rpc GetGroupMembersCMS(GetGroupMembersCMSReq) returns(GetGroupMembersCMSResp); rpc RemoveGroupMembersCMS(RemoveGroupMembersCMSReq) returns(RemoveGroupMembersCMSResp); rpc AddGroupMembersCMS(AddGroupMembersCMSReq) returns(AddGroupMembersCMSResp);