Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

pkg/common/db/controller/storage.go

@@ -274,14 +274,14 @@ func (c *s3Database) ConfirmPut(ctx context.Context, req *third.ConfirmPutReq) (
 		}
 	}()
 	if put.Complete {
-		return nil, errors.New("put completed")
+		return nil, errs.ErrFileUploadedComplete.Wrap("put complete")
 	}
 	now := time.Now().UnixMilli()
 	if put.EffectiveTime.UnixMilli() < now {
-		return nil, errors.New("upload expired")
+		return nil, errs.ErrFileUploadedExpired.Wrap("put expired")
 	}
 	if put.ValidTime != nil && put.ValidTime.UnixMilli() < now {
-		return nil, errors.New("object expired")
+		return nil, errs.ErrFileUploadedExpired.Wrap("object expired")
 	}
 	if hash, err := c.hash.Take(ctx, put.Hash, c.obj.Name()); err == nil {
 		o := relation.ObjectInfoModel{

pkg/errs/code.go

@@ -82,4 +82,8 @@ const (
 	ConnOverMaxNumLimit = 1601
 	ConnArgsErr         = 1602
 	ConnUpdateErr       = 1603
+
+	// S3错误码
+	FileUploadedCompleteError = 2001 // 文件已上传
+	FileUploadedExpiredError  = 2002 // 上传过期
 )

pkg/errs/predefine.go

@@ -58,4 +58,7 @@ var (
 	ErrConnUpdateErr = NewCodeError(ConnArgsErr, "upgrade http conn err")
 
 	ErrConfig = NewCodeError(ConfigError, "ConfigError")
+
+	ErrFileUploadedComplete = NewCodeError(FileUploadedCompleteError, "FileUploadedComplete")
+	ErrFileUploadedExpired  = NewCodeError(FileUploadedExpiredError, "FileUploadedExpiredError")
 )