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-04 09:05:59 +08:00 · 2023-07-12 15:31:24 +08:00
parent 5467887e1c
commit 454bf97e3f
123 changed files with 7377 additions and 10288 deletions
@@ -36,17 +36,12 @@ const (

 // 通用错误码
 const (
-	NoError                  = 0     //无错误
-	DatabaseError            = 90002 //redis/mysql等db错误
-	NetworkError             = 90004 //网络错误
-	IdentityError            = 90008 // 身份错误 非管理员token，且token中userID与请求userID不一致
-	GRPCConnIsNil            = 90006 //grpc连接空
-	DefaultOtherError        = 90006 //其他错误
-	DataError                = 90007 //数据错误
-	ConfigError              = 90009
-	CallbackError            = 80000
-	RelationshipAlreadyError = 92001 //已经是好友关系（或者黑名单）
-	NotRelationshipYetError  = 92002 //不是好友关系（或者黑名单）
+	NoError       = 0     //无错误
+	DatabaseError = 90002 //redis/mysql等db错误
+	NetworkError  = 90004 //网络错误
+	DataError     = 90007 //数据错误
+
+	CallbackError = 80000

 	//通用错误码
 	ServerInternalError = 500  //服务器内部错误
@@ -57,50 +52,41 @@ const (

 	// 账号错误码
 	UserIDNotFoundError    = 1101 //UserID不存在 或未注册
-	UserIDExisted          = 1102 //UserID已存在
-	RegisteredAlreadyError = 1103 //用户已经注册过了
+	RegisteredAlreadyError = 1102 //用户已经注册过了

 	// 群组错误码
-	GroupIDNotFoundError     = 1201 //GroupID不存在
-	GroupIDExisted           = 1202 //GroupID已存在
-	OnlyOneOwnerError        = 1203 //只能有一个群主
-	InGroupAlreadyError      = 1204 //已在群组中
-	NotInGroupYetError       = 1205 //不在群组中
-	DismissedAlreadyError    = 1206 //群组已经解散
-	OwnerNotAllowedQuitError = 1207 //群主不能退群
-	GroupTypeNotSupport      = 1208
-	GroupNoOwner             = 1209
-	GroupRequestHandled      = 1210
+	GroupIDNotFoundError  = 1201 //GroupID不存在
+	GroupIDExisted        = 1202 //GroupID已存在
+	NotInGroupYetError    = 1203 //不在群组中
+	DismissedAlreadyError = 1204 //群组已经解散
+	GroupTypeNotSupport   = 1205
+	GroupRequestHandled   = 1206

 	// 关系链错误码
-	CanNotAddYourselfError = 1301 //不能添加自己为好友
-	BlockedByPeer          = 1302 //被对方拉黑
-	NotPeersFriend         = 1303 //不是对方的好友
+	CanNotAddYourselfError   = 1301 //不能添加自己为好友
+	BlockedByPeer            = 1302 //被对方拉黑
+	NotPeersFriend           = 1303 //不是对方的好友
+	RelationshipAlreadyError = 1304 //已经是好友关系

 	// 消息错误码
 	MessageHasReadDisable = 1401
 	MutedInGroup          = 1402 //群成员被禁言
 	MutedGroup            = 1403 //群被禁言
-	UserNotRecvMsg        = 1404 //用户设置了不接收消息
-	MsgAlreadyRevoke      = 1405 //消息已撤回
+	MsgAlreadyRevoke      = 1404 //消息已撤回

 	// token错误码
-	TokenExpiredError             = 1501
-	TokenInvalidError             = 1502
-	TokenMalformedError           = 1503
-	TokenNotValidYetError         = 1504
-	TokenUnknownError             = 1505
-	TokenKickedError              = 1506
-	TokenDifferentPlatformIDError = 1507
-	TokenDifferentUserIDError     = 1508
-	TokenNotExistError            = 1509
+	TokenExpiredError     = 1501
+	TokenInvalidError     = 1502
+	TokenMalformedError   = 1503
+	TokenNotValidYetError = 1504
+	TokenUnknownError     = 1505
+	TokenKickedError      = 1506
+	TokenNotExistError    = 1507

 	// 长连接网关错误码
 	ConnOverMaxNumLimit = 1601
 	ConnArgsErr         = 1602
-	ConnUpdateErr       = 1603

 	// S3错误码
-	FileUploadedCompleteError = 1701 // 文件已上传
-	FileUploadedExpiredError  = 1702 // 上传过期
+	FileUploadedExpiredError = 1701 // 上传过期
 )