merge v3dev into main (#504)

* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
2026-05-17 15:29:03 +08:00 · 2023-07-12 15:31:24 +08:00
parent 5467887e1c
commit 454bf97e3f
123 changed files with 7377 additions and 10288 deletions
@@ -16,66 +16,49 @@ package errs

 var (
 	ErrArgs             = NewCodeError(ArgsError, "ArgsError")
+	ErrNoPermission     = NewCodeError(NoPermissionError, "NoPermissionError")
 	ErrDatabase         = NewCodeError(DatabaseError, "DatabaseError")
 	ErrInternalServer   = NewCodeError(ServerInternalError, "ServerInternalError")
 	ErrNetwork          = NewCodeError(NetworkError, "NetworkError")
-	ErrNoPermission     = NewCodeError(NoPermissionError, "NoPermissionError")
-	ErrIdentity         = NewCodeError(IdentityError, "IdentityError")
 	ErrCallback         = NewCodeError(CallbackError, "CallbackError")
 	ErrCallbackContinue = NewCodeError(CallbackError, "ErrCallbackContinue")

 	ErrUserIDNotFound  = NewCodeError(UserIDNotFoundError, "UserIDNotFoundError")
 	ErrGroupIDNotFound = NewCodeError(GroupIDNotFoundError, "GroupIDNotFoundError")
 	ErrGroupIDExisted  = NewCodeError(GroupIDExisted, "GroupIDExisted")
-	ErrUserIDExisted   = NewCodeError(UserIDExisted, "UserIDExisted")

 	ErrRecordNotFound = NewCodeError(RecordNotFoundError, "RecordNotFoundError")

-	ErrRelationshipAlready = NewCodeError(RelationshipAlreadyError, "RelationshipAlreadyError")
-	ErrNotRelationshipYet  = NewCodeError(NotRelationshipYetError, "NotRelationshipYetError")
-	ErrCanNotAddYourself   = NewCodeError(CanNotAddYourselfError, "CanNotAddYourselfError")
-
-	ErrOnlyOneOwner        = NewCodeError(OnlyOneOwnerError, "OnlyOneOwnerError")
-	ErrInGroupAlready      = NewCodeError(InGroupAlreadyError, "InGroupAlreadyError")
 	ErrNotInGroupYet       = NewCodeError(NotInGroupYetError, "NotInGroupYetError")
 	ErrDismissedAlready    = NewCodeError(DismissedAlreadyError, "DismissedAlreadyError")
-	ErrOwnerNotAllowedQuit = NewCodeError(OwnerNotAllowedQuitError, "OwnerNotAllowedQuitError")
 	ErrRegisteredAlready   = NewCodeError(RegisteredAlreadyError, "RegisteredAlreadyError")
 	ErrGroupTypeNotSupport = NewCodeError(GroupTypeNotSupport, "")
-	ErrGroupNoOwner        = NewCodeError(GroupNoOwner, "ErrGroupNoOwner")
+	ErrGroupRequestHandled = NewCodeError(GroupRequestHandled, "GroupRequestHandled")

-	ErrDefaultOther             = NewCodeError(DefaultOtherError, "DefaultOtherError")
-	ErrData                     = NewCodeError(DataError, "DataError")
-	ErrTokenExpired             = NewCodeError(TokenExpiredError, "TokenExpiredError")
-	ErrTokenInvalid             = NewCodeError(TokenInvalidError, "TokenInvalidError")         //
-	ErrTokenMalformed           = NewCodeError(TokenMalformedError, "TokenMalformedError")     //格式错误
-	ErrTokenNotValidYet         = NewCodeError(TokenNotValidYetError, "TokenNotValidYetError") //还未生效
-	ErrTokenUnknown             = NewCodeError(TokenUnknownError, "TokenUnknownError")         //未知错误
-	ErrTokenKicked              = NewCodeError(TokenKickedError, "TokenKickedError")
-	ErrTokenNotExist            = NewCodeError(TokenNotExistError, "TokenNotExistError") //在redis中不存在
-	ErrTokenDifferentPlatformID = NewCodeError(TokenDifferentPlatformIDError, "TokenDifferentPlatformIDError")
-	ErrTokenDifferentUserID     = NewCodeError(TokenDifferentUserIDError, "TokenDifferentUserIDError")
-	ErrDuplicateKey             = NewCodeError(DuplicateKeyError, "DuplicateKeyError")
+	ErrData             = NewCodeError(DataError, "DataError")
+	ErrTokenExpired     = NewCodeError(TokenExpiredError, "TokenExpiredError")
+	ErrTokenInvalid     = NewCodeError(TokenInvalidError, "TokenInvalidError")         //
+	ErrTokenMalformed   = NewCodeError(TokenMalformedError, "TokenMalformedError")     //格式错误
+	ErrTokenNotValidYet = NewCodeError(TokenNotValidYetError, "TokenNotValidYetError") //还未生效
+	ErrTokenUnknown     = NewCodeError(TokenUnknownError, "TokenUnknownError")         //未知错误
+	ErrTokenKicked      = NewCodeError(TokenKickedError, "TokenKickedError")
+	ErrTokenNotExist    = NewCodeError(TokenNotExistError, "TokenNotExistError") //在redis中不存在
+	ErrDuplicateKey     = NewCodeError(DuplicateKeyError, "DuplicateKeyError")

 	ErrMessageHasReadDisable = NewCodeError(MessageHasReadDisable, "MessageHasReadDisable")

-	ErrBlockedByPeer = NewCodeError(BlockedByPeer, "BlockedByPeer")
-	//不是对方的好友
-	ErrNotPeersFriend = NewCodeError(NotPeersFriend, "NotPeersFriend")
+	ErrCanNotAddYourself   = NewCodeError(CanNotAddYourselfError, "CanNotAddYourselfError")
+	ErrBlockedByPeer       = NewCodeError(BlockedByPeer, "BlockedByPeer")
+	ErrNotPeersFriend      = NewCodeError(NotPeersFriend, "NotPeersFriend")
+	ErrRelationshipAlready = NewCodeError(RelationshipAlreadyError, "RelationshipAlreadyError")

 	ErrMutedInGroup     = NewCodeError(MutedInGroup, "MutedInGroup")
 	ErrMutedGroup       = NewCodeError(MutedGroup, "MutedGroup")
-	ErrUserNotRecvMsg   = NewCodeError(UserNotRecvMsg, "UserNotRecvMsg")
 	ErrMsgAlreadyRevoke = NewCodeError(MsgAlreadyRevoke, "MsgAlreadyRevoke")

 	ErrConnOverMaxNumLimit = NewCodeError(ConnOverMaxNumLimit, "ConnOverMaxNumLimit")

-	ErrConnArgsErr   = NewCodeError(ConnArgsErr, "args err, need token, sendID, platformID")
-	ErrConnUpdateErr = NewCodeError(ConnArgsErr, "upgrade http conn err")
+	ErrConnArgsErr = NewCodeError(ConnArgsErr, "args err, need token, sendID, platformID")

-	ErrConfig = NewCodeError(ConfigError, "ConfigError")
-
-	ErrFileUploadedComplete = NewCodeError(FileUploadedCompleteError, "FileUploadedComplete")
-	ErrFileUploadedExpired  = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError")
-	ErrGroupRequestHandled  = NewCodeError(GroupRequestHandled, "GroupRequestHandled")
+	ErrFileUploadedExpired = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError")
 )