From f78304602cec8f2c2db923d42ec41f1a8b5a7afe Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 13 Jan 2023 16:56:46 +0800 Subject: [PATCH] Error code standardization --- internal/rpc/group/g.go | 42 +++++++++++++++++++++++++ internal/rpc/group/group.go | 8 ++--- pkg/proto/group/group.proto | 63 +++++++++++++++++++++++++++---------- pkg/proto/sdk_ws/ws.proto | 4 --- 4 files changed, 90 insertions(+), 27 deletions(-) create mode 100644 internal/rpc/group/g.go diff --git a/internal/rpc/group/g.go b/internal/rpc/group/g.go new file mode 100644 index 000000000..4c6699584 --- /dev/null +++ b/internal/rpc/group/g.go @@ -0,0 +1,42 @@ +package group + +import ( + "Open_IM/pkg/common/constant" + imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" + "Open_IM/pkg/common/tools" + pbGroup "Open_IM/pkg/proto/group" + "Open_IM/pkg/utils" + "context" + "time" +) + +func getDBGroupRequest(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (dbGroupRequest *imdb.GroupRequest) { + dbGroupRequest = &imdb.GroupRequest{} + utils.CopyStructFields(&dbGroupRequest, req) + dbGroupRequest.UserID = req.FromUserID + dbGroupRequest.HandleUserID = tools.OpUserID(ctx) + dbGroupRequest.HandledTime = time.Now() + return dbGroupRequest +} + +func getDBGroupMember(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (dbGroupMember *imdb.GroupMember) { + dbGroupMember = &imdb.GroupMember{} + utils.CopyStructFields(&dbGroupRequest, req) + dbGroupRequest.UserID = req.FromUserID + dbGroupRequest.HandleUserID = tools.OpUserID(ctx) + dbGroupRequest.HandledTime = time.Now() + + member := imdb.GroupMember{} + member.GroupID = req.GroupID + member.UserID = req.FromUserID + member.RoleLevel = constant.GroupOrdinaryUsers + member.OperatorUserID = tools.OpUserID(ctx) + + member.FaceURL = user.FaceURL + member.Nickname = user.Nickname + member.JoinSource = request.JoinSource + member.InviterUserID = request.InviterUserID + member.MuteEndTime = time.Unix(int64(time.Now().Second()), 0) + + return dbGroupRequest +} diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 016fbd637..93698225d 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -664,12 +664,8 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup if err := CheckPermission(ctx, req.GroupID, tools.OpUserID(ctx)); err != nil { return nil, err } - groupRequest := imdb.GroupRequest{} - utils.CopyStructFields(&groupRequest, req) - groupRequest.UserID = req.FromUserID - groupRequest.HandleUserID = tools.OpUserID(ctx) - groupRequest.HandledTime = time.Now() - if err := (&imdb.GroupRequest{}).Update(ctx, []*imdb.GroupRequest{&groupRequest}); err != nil { + groupRequest := getDBGroupRequest(ctx, req) + if err := (&imdb.GroupRequest{}).Update(ctx, []*imdb.GroupRequest{groupRequest}); err != nil { return nil, err } groupInfo, err := rocksCache.GetGroupInfoFromCache(ctx, req.GroupID) diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 6f7f304de..2f9325927 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -14,8 +14,6 @@ message CreateGroupReq{ repeated GroupAddMemberInfo initMemberList = 1; server_api_params.GroupInfo groupInfo = 2; string ownerUserID = 5; //owner - - } message CreateGroupResp{ server_api_params.GroupInfo groupInfo = 3; @@ -38,17 +36,21 @@ message SetGroupInfoResp{ message GetGroupApplicationListReq { - string fromUserID = 3; //owner or manager + server_api_params.RequestPagination pagination = 1; + string fromUserID = 3; //owner or admin } message GetGroupApplicationListResp { + int32 total = 1; repeated server_api_params.GroupRequest groupRequestList = 3; } message GetUserReqApplicationListReq{ string userID = 1; + server_api_params.RequestPagination pagination = 1; } message GetUserReqApplicationListResp{ + int32 total = 1; repeated server_api_params.GroupRequest groupRequestList = 2; } @@ -67,7 +69,6 @@ message JoinGroupReq{ string reqMessage = 2; int32 joinSource = 5; string inviterUserID = 6; - } message JoinGroupResp{ } @@ -96,12 +97,12 @@ message QuitGroupResp{ message GetGroupMemberListReq { string groupID = 1; int32 filter = 4; - int32 nextSeq = 5; + server_api_params.RequestPagination pagination = 1; } message GetGroupMemberListResp { + int32 total = 1; repeated server_api_params.GroupMemberFullInfo memberList = 3; - int32 nextSeq = 4; } @@ -132,8 +133,10 @@ message KickGroupMemberResp { message GetJoinedGroupListReq { string fromUserID = 1; + server_api_params.RequestPagination pagination = 2; } message GetJoinedGroupListResp{ + int32 total = 1; repeated server_api_params.GroupInfo groupList = 3; } @@ -165,14 +168,13 @@ message CMSGroup { message GetGroupsReq { - server_api_params.RequestPagination pagination = 1; - string groupName = 2; - string groupID = 3; + server_api_params.RequestPagination pagination = 1; + string groupName = 2; + string groupID = 3; } message GetGroupsResp { repeated CMSGroup groups = 1; - server_api_params.ResponsePagination pagination = 2; int32 GroupNum = 3; } @@ -248,16 +250,17 @@ message SetGroupMemberNicknameResp{ } message GetJoinedSuperGroupListReq { + server_api_params.RequestPagination pagination = 1; string userID = 2; } message GetJoinedSuperGroupListResp { + int32 total = 1; repeated server_api_params.GroupInfo groupList = 3; } message GetSuperGroupsInfoReq { repeated string groupIDList = 1; - } message GetSuperGroupsInfoResp { @@ -278,47 +281,73 @@ message SetGroupMemberInfoResp{ } message GetGroupAbstractInfoReq{ - string groupID = 1; - + repeated string groupIDs = 1; } -message GetGroupAbstractInfoResp{ +message GroupAbstractInfo{ + string groupID = 1; int32 groupMemberNumber = 2; uint64 groupMemberListHash = 3; } +message GetGroupAbstractInfoResp{ + repeated GroupAbstractInfo groupAbstractInfos = 1; +} + service group{ + //创建群 rpc createGroup(CreateGroupReq) returns(CreateGroupResp); + //申请加群 rpc joinGroup(JoinGroupReq) returns(JoinGroupResp); + //退出群 rpc quitGroup(QuitGroupReq) returns(QuitGroupResp); + //获取指定群信息 rpc getGroupsInfo(GetGroupsInfoReq) returns(GetGroupsInfoResp); + //设置群信息 rpc setGroupInfo(SetGroupInfoReq) returns(SetGroupInfoResp); + //（以管理员或群主身份）获取群的加群申请 rpc getGroupApplicationList(GetGroupApplicationListReq) returns(GetGroupApplicationListResp); + //获取用户自己的主动加群申请 rpc getUserReqApplicationList(GetUserReqApplicationListReq) returns(GetUserReqApplicationListResp); + //转让群主 rpc transferGroupOwner(TransferGroupOwnerReq) returns(TransferGroupOwnerResp); + //群主或管理员处理进群申请 rpc groupApplicationResponse(GroupApplicationResponseReq) returns(GroupApplicationResponseResp); + //获取某个群的群成员 rpc getGroupMemberList(GetGroupMemberListReq) returns(GetGroupMemberListResp); + //获取某个群的指定群成员 rpc getGroupMembersInfo(GetGroupMembersInfoReq) returns(GetGroupMembersInfoResp); + //踢出群 rpc kickGroupMember(KickGroupMemberReq) returns (KickGroupMemberResp); + //获取某个人已加入群 rpc getJoinedGroupList(GetJoinedGroupListReq) returns (GetJoinedGroupListResp); + //邀请某些人进群 rpc inviteUserToGroup(InviteUserToGroupReq) returns (InviteUserToGroupResp); - rpc getGroupAllMember(GetGroupAllMemberReq) returns(GetGroupAllMemberResp); rpc GetGroups(GetGroupsReq) returns(GetGroupsResp); rpc GetGroupMembersCMS(GetGroupMembersCMSReq) returns(GetGroupMembersCMSResp); - + //解散群 rpc DismissGroup(DismissGroupReq) returns(DismissGroupResp); + //对某个群成员禁言 rpc MuteGroupMember(MuteGroupMemberReq) returns(MuteGroupMemberResp); + //对某个群成员取消禁言 rpc CancelMuteGroupMember(CancelMuteGroupMemberReq) returns(CancelMuteGroupMemberResp); + //对某个群禁言 rpc MuteGroup(MuteGroupReq) returns(MuteGroupResp); + //对某个群取消禁言 rpc CancelMuteGroup(CancelMuteGroupReq) returns(CancelMuteGroupResp); - rpc SetGroupMemberNickname(SetGroupMemberNicknameReq) returns (SetGroupMemberNicknameResp); + //获取某个用户加入的超级群 rpc GetJoinedSuperGroupList(GetJoinedSuperGroupListReq) returns (GetJoinedSuperGroupListResp); + //获取指定的超级群信息 rpc GetSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp); + //设置群成员昵称 + rpc SetGroupMemberNickname(SetGroupMemberNicknameReq) returns (SetGroupMemberNicknameResp); + //设置群成员信息 rpc SetGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp); + //获取群信息hash值 rpc GetGroupAbstractInfo(GetGroupAbstractInfoReq) returns (GetGroupAbstractInfoResp); } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index c7782cbbb..2ab391df5 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -519,10 +519,6 @@ message RequestPagination { int32 showNumber = 2; } -message ResponsePagination { - int32 CurrentPage = 5; - int32 ShowNumber = 6; -} ///////////////////signal//////////////