From f51ff6fa1910dad24a6989e5265533ceb2f6eb0f Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 12 Jan 2023 16:45:18 +0800 Subject: [PATCH] 1 --- internal/rpc/group/group.go | 53 ++++++++++++++---------- pkg/common/constant/error.go | 80 ++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 61 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 1061c5fb2..95b9b0f39 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -115,7 +115,18 @@ func (s *groupServer) Run() { log.NewInfo("", "group rpc success") } +func OperationID(ctx context.Context) string { + s, _ := ctx.Value("operationID").(string) + return s +} + +func OpUserID(ctx context.Context) string { + s, _ := ctx.Value("opUserID").(string) + return s +} + func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) { + resp := &pbGroup.CreateGroupResp{GroupInfo: &open_im_sdk.GroupInfo{}} if err := token_verify.CheckAccessV2(ctx, req.OpUserID, req.OwnerUserID); err != nil { return nil, err @@ -133,17 +144,17 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR userIDs = append(userIDs, req.OwnerUserID) } if groupOwnerNum != 1 { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } if utils.IsRepeatStringSlice(userIDs) { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } users, err := rocksCache.GetUserInfoFromCacheBatch(ctx, userIDs) if err != nil { return nil, err } if len(users) != len(userIDs) { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } userMap := make(map[string]*imdb.User) for i, user := range users { @@ -272,15 +283,15 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite resp := &pbGroup.InviteUserToGroupResp{} if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { - constant.SetErrorForResp(&constant.ErrIdentity, resp.CommonResp) - return nil, utils.Wrap(&constant.ErrIdentity, "") + constant.SetErrorForResp(constant.ErrIdentity, resp.CommonResp) + return nil, utils.Wrap(constant.ErrIdentity, "") } groupInfo, err := (*imdb.Group)(nil).Take(ctx, req.GroupID) if err != nil { return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if groupInfo.NeedVerification == constant.AllNeedVerification && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { @@ -463,7 +474,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou return nil, err } if opInfo.RoleLevel == constant.GroupOrdinaryUsers { - return nil, utils.Wrap(&constant.ErrNoPermission, "") + return nil, utils.Wrap(constant.ErrNoPermission, "") } else if opInfo.RoleLevel == constant.GroupOwner { opFlag = 2 //owner } else { @@ -477,7 +488,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou if len(req.KickedUserIDList) == 0 { //log.NewError(req.OperationID, "failed, kick list 0") //return &pbGroup.KickGroupMemberResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}, nil - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } if err := s.DelGroupAndUserCache(ctx, req.GroupID, req.KickedUserIDList); err != nil { return nil, err @@ -584,7 +595,7 @@ func FillGroupInfoByGroupID(operationID, groupID string, groupInfo *open_im_sdk. } if group.Status == constant.GroupStatusDismissed { log.Debug(operationID, " group constant.GroupStatusDismissed ", group.GroupID) - return utils.Wrap(&constant.ErrDismissedAlready, "") + return utils.Wrap(constant.ErrDismissedAlready, "") } return utils.Wrap(cp.GroupDBCopyOpenIM(groupInfo, group), "") } @@ -611,7 +622,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} err := FillGroupInfoByGroupID(req.OperationID, v.GroupID, node.GroupInfo) if err != nil { - if !errors.Is(errors.Unwrap(err), &constant.ErrDismissedAlready) { + if !errors.Is(errors.Unwrap(err), constant.ErrDismissedAlready) { errResult = err } continue @@ -655,7 +666,7 @@ func CheckPermission(ctx context.Context, groupID string, userID string) (err er trace_log.SetCtxInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID) }() if !token_verify.IsManagerUserID(userID) && !imdb.IsGroupOwnerAdmin(groupID, userID) { - return utils.Wrap(&constant.ErrNoPermission, utils.GetSelfFuncName()) + return utils.Wrap(constant.ErrNoPermission, utils.GetSelfFuncName()) } return nil } @@ -729,7 +740,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } else if req.HandleResult == constant.GroupResponseRefuse { chat.GroupApplicationRejectedNotification(req) } else { - return nil, utils.Wrap(&constant.ErrArgs, "") + return nil, utils.Wrap(constant.ErrArgs, "") } return resp, nil } @@ -745,8 +756,8 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - constant.SetErrorForResp(&constant.ErrDismissedAlready, resp.CommonResp) - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + constant.SetErrorForResp(constant.ErrDismissedAlready, resp.CommonResp) + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if groupInfo.NeedVerification == constant.Directly { @@ -795,7 +806,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) chat.MemberEnterDirectlyNotification(req.GroupID, req.OpUserID, req.OperationID) return resp, nil } else { - constant.SetErrorForResp(&constant.ErrGroupTypeNotSupport, resp.CommonResp) + constant.SetErrorForResp(constant.ErrGroupTypeNotSupport, resp.CommonResp) return resp, nil } } @@ -868,14 +879,14 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf resp := &pbGroup.SetGroupInfoResp{} if !hasAccess(req) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } group, err := imdb.GetGroupInfoByGroupID(req.GroupInfoForSet.GroupID) if err != nil { return nil, err } if group.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } var changedType int32 @@ -987,7 +998,7 @@ func (s *groupServer) TransferGroupOwner(ctx context.Context, req *pbGroup.Trans return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - return nil, utils.Wrap(&constant.ErrDismissedAlready, "") + return nil, utils.Wrap(constant.ErrDismissedAlready, "") } if req.OldOwnerUserID == req.NewOwnerUserID { @@ -1123,7 +1134,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou resp := &pbGroup.DismissGroupResp{} if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupID); err != nil { @@ -1257,7 +1268,7 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) //errMsg := req.OperationID + "opFlag == 0 " + req.GroupID + req.OpUserID //log.Error(req.OperationID, errMsg) //return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}}, nil - return nil, utils.Wrap(&constant.ErrNoPermission, "") + return nil, utils.Wrap(constant.ErrNoPermission, "") } //mutedInfo, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(req.GroupID, req.UserID) @@ -1325,7 +1336,7 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S resp := &pbGroup.SetGroupMemberNicknameResp{} if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.OpUserID) { - return nil, utils.Wrap(&constant.ErrIdentity, "") + return nil, utils.Wrap(constant.ErrIdentity, "") } cbReq := &pbGroup.SetGroupMemberInfoReq{ GroupID: req.GroupID, diff --git a/pkg/common/constant/error.go b/pkg/common/constant/error.go index 5663f8614..81413f569 100644 --- a/pkg/common/constant/error.go +++ b/pkg/common/constant/error.go @@ -25,57 +25,57 @@ func (e *ErrInfo) Code() int32 { } var ( - ErrNone = ErrInfo{0, "", ""} - ErrArgs = ErrInfo{ArgsError, "ArgsError", ""} - ErrDatabase = ErrInfo{DatabaseError, "DatabaseError", ""} - ErrInternalServer = ErrInfo{ServerInternalError, "ServerInternalError", ""} - ErrNetwork = ErrInfo{NetworkError, "NetworkError", ""} - ErrNoPermission = ErrInfo{NoPermissionError, "NoPermissionError", ""} - ErrIdentity = ErrInfo{IdentityError, "IdentityError", ""} - ErrCallback = ErrInfo{ErrMsg: "CallbackError"} - ErrCallbackContinue = ErrInfo{ErrMsg: "CallbackContinueError"} + ErrNone = &ErrInfo{0, "", ""} + ErrArgs = &ErrInfo{ArgsError, "ArgsError", ""} + ErrDatabase = &ErrInfo{DatabaseError, "DatabaseError", ""} + ErrInternalServer = &ErrInfo{ServerInternalError, "ServerInternalError", ""} + ErrNetwork = &ErrInfo{NetworkError, "NetworkError", ""} + ErrNoPermission = &ErrInfo{NoPermissionError, "NoPermissionError", ""} + ErrIdentity = &ErrInfo{IdentityError, "IdentityError", ""} + ErrCallback = &ErrInfo{ErrMsg: "CallbackError"} + ErrCallbackContinue = &ErrInfo{ErrMsg: "CallbackContinueError"} - ErrUserIDNotFound = ErrInfo{UserIDNotFoundError, "UserIDNotFoundError", ""} - ErrGroupIDNotFound = ErrInfo{GroupIDNotFoundError, "GroupIDNotFoundError", ""} + ErrUserIDNotFound = &ErrInfo{UserIDNotFoundError, "UserIDNotFoundError", ""} + ErrGroupIDNotFound = &ErrInfo{GroupIDNotFoundError, "GroupIDNotFoundError", ""} - ErrRecordNotFound = ErrInfo{RecordNotFoundError, "RecordNotFoundError", ""} + ErrRecordNotFound = &ErrInfo{RecordNotFoundError, "RecordNotFoundError", ""} - ErrRelationshipAlready = ErrInfo{RelationshipAlreadyError, "RelationshipAlreadyError", ""} - ErrNotRelationshipYet = ErrInfo{NotRelationshipYetError, "NotRelationshipYetError", ""} + ErrRelationshipAlready = &ErrInfo{RelationshipAlreadyError, "RelationshipAlreadyError", ""} + ErrNotRelationshipYet = &ErrInfo{NotRelationshipYetError, "NotRelationshipYetError", ""} - ErrOnlyOneOwner = ErrInfo{OnlyOneOwnerError, "OnlyOneOwnerError", ""} - ErrInGroupAlready = ErrInfo{InGroupAlreadyError, "InGroupAlreadyError", ""} - ErrNotInGroupYet = ErrInfo{NotInGroupYetError, "NotInGroupYetError", ""} - ErrDismissedAlready = ErrInfo{DismissedAlreadyError, "DismissedAlreadyError", ""} - ErrOwnerNotAllowedQuit = ErrInfo{OwnerNotAllowedQuitError, "OwnerNotAllowedQuitError", ""} - ErrRegisteredAlready = ErrInfo{RegisteredAlreadyError, "RegisteredAlreadyError", ""} - ErrGroupTypeNotSupport = ErrInfo{GroupTypeNotSupport, "", ""} - ErrGroupNoOwner = ErrInfo{GroupNoOwner, "ErrGroupNoOwner", ""} + ErrOnlyOneOwner = &ErrInfo{OnlyOneOwnerError, "OnlyOneOwnerError", ""} + ErrInGroupAlready = &ErrInfo{InGroupAlreadyError, "InGroupAlreadyError", ""} + ErrNotInGroupYet = &ErrInfo{NotInGroupYetError, "NotInGroupYetError", ""} + ErrDismissedAlready = &ErrInfo{DismissedAlreadyError, "DismissedAlreadyError", ""} + ErrOwnerNotAllowedQuit = &ErrInfo{OwnerNotAllowedQuitError, "OwnerNotAllowedQuitError", ""} + ErrRegisteredAlready = &ErrInfo{RegisteredAlreadyError, "RegisteredAlreadyError", ""} + ErrGroupTypeNotSupport = &ErrInfo{GroupTypeNotSupport, "", ""} + ErrGroupNoOwner = &ErrInfo{GroupNoOwner, "ErrGroupNoOwner", ""} - ErrDefaultOther = ErrInfo{DefaultOtherError, "DefaultOtherError", ""} - ErrData = ErrInfo{DataError, "DataError", ""} - ErrTokenExpired = ErrInfo{TokenExpiredError, "TokenExpiredError", ""} - ErrTokenInvalid = ErrInfo{TokenInvalidError, "TokenInvalidError", ""} // - ErrTokenMalformed = ErrInfo{TokenMalformedError, "TokenMalformedError", ""} //格式错误 - ErrTokenNotValidYet = ErrInfo{TokenNotValidYetError, "TokenNotValidYetError", ""} //还未生效 - ErrTokenUnknown = ErrInfo{TokenUnknownError, "TokenUnknownError", ""} //未知错误 - ErrTokenKicked = ErrInfo{TokenKickedError, "TokenKickedError", ""} - ErrTokenNotExist = ErrInfo{TokenNotExistError, "TokenNotExistError", ""} //在redis中不存在 - ErrTokenDifferentPlatformID = ErrInfo{TokenDifferentPlatformIDError, "TokenDifferentPlatformIDError", ""} - ErrTokenDifferentUserID = ErrInfo{TokenDifferentUserIDError, "TokenDifferentUserIDError", ""} + ErrDefaultOther = &ErrInfo{DefaultOtherError, "DefaultOtherError", ""} + ErrData = &ErrInfo{DataError, "DataError", ""} + ErrTokenExpired = &ErrInfo{TokenExpiredError, "TokenExpiredError", ""} + ErrTokenInvalid = &ErrInfo{TokenInvalidError, "TokenInvalidError", ""} // + ErrTokenMalformed = &ErrInfo{TokenMalformedError, "TokenMalformedError", ""} //格式错误 + ErrTokenNotValidYet = &ErrInfo{TokenNotValidYetError, "TokenNotValidYetError", ""} //还未生效 + ErrTokenUnknown = &ErrInfo{TokenUnknownError, "TokenUnknownError", ""} //未知错误 + ErrTokenKicked = &ErrInfo{TokenKickedError, "TokenKickedError", ""} + ErrTokenNotExist = &ErrInfo{TokenNotExistError, "TokenNotExistError", ""} //在redis中不存在 + ErrTokenDifferentPlatformID = &ErrInfo{TokenDifferentPlatformIDError, "TokenDifferentPlatformIDError", ""} + ErrTokenDifferentUserID = &ErrInfo{TokenDifferentUserIDError, "TokenDifferentUserIDError", ""} - ErrMessageHasReadDisable = ErrInfo{MessageHasReadDisable, "MessageHasReadDisable", ""} + ErrMessageHasReadDisable = &ErrInfo{MessageHasReadDisable, "MessageHasReadDisable", ""} ErrDB = ErrDatabase ErrSendLimit = ErrInternalServer ) func NewErrNetwork(err error) error { - return toDetail(err, &ErrNetwork) + return toDetail(err, ErrNetwork) } func NewErrData(err error) error { - return toDetail(err, &ErrData) + return toDetail(err, ErrData) } func toDetail(err error, info *ErrInfo) *ErrInfo { @@ -91,15 +91,15 @@ func ToAPIErrWithErr(err error) *ErrInfo { switch { case errors.As(err, &errComm): if errors.Is(err, gorm.ErrRecordNotFound) { - return toDetail(err, &ErrRecordNotFound) + return toDetail(err, ErrRecordNotFound) } - return toDetail(err, &ErrData) + return toDetail(err, ErrData) case errors.As(err, &marshalErr): - return toDetail(err, &ErrData) + return toDetail(err, ErrData) case errors.As(err, &errInfo): return toDetail(err, errInfo) } - return toDetail(err, &ErrDefaultOther) + return toDetail(err, ErrDefaultOther) } func SetErrorForResp(err error, commonResp *sdkws.CommonResp) {