diff --git a/pkg/common/constant/err_info.go b/pkg/common/constant/err_info.go index 316ff8be4..00d0ef3db 100644 --- a/pkg/common/constant/err_info.go +++ b/pkg/common/constant/err_info.go @@ -24,11 +24,11 @@ func (e *ErrInfo) Code() int32 { } 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 { @@ -44,15 +44,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) { diff --git a/pkg/common/constant/errors.go b/pkg/common/constant/errors.go index 41258ab53..c34fe521b 100644 --- a/pkg/common/constant/errors.go +++ b/pkg/common/constant/errors.go @@ -1,46 +1,46 @@ package constant 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"} - - ErrUserIDNotFound = ErrInfo{UserIDNotFoundError, "UserIDNotFoundError", ""} - ErrGroupIDNotFound = ErrInfo{GroupIDNotFoundError, "GroupIDNotFoundError", ""} - - ErrRecordNotFound = ErrInfo{RecordNotFoundError, "RecordNotFoundError", ""} - - 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", ""} - - 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", ""} + 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", ""} + + ErrRecordNotFound = &ErrInfo{RecordNotFoundError, "RecordNotFoundError", ""} + + 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", ""} + + 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", ""} ErrDB = ErrDatabase ErrSendLimit = ErrInternalServer @@ -129,6 +129,6 @@ const ( // temp var ( - ErrServer = ErrInfo{500, "server error", ""} - ErrTencentCredential = ErrInfo{400, "ErrTencentCredential", ""} + ErrServer = &ErrInfo{500, "server error", ""} + ErrTencentCredential = &ErrInfo{400, "ErrTencentCredential", ""} )