blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 02:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

third

Browse Source
This commit is contained in:
withchao 2023-04-21 19:52:57 +08:00
parent d891a1ca8e
commit b5fc6dbf04
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/common/db/controller/storage.go
View File

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

4
pkg/errs/code.go
View File

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

3
pkg/errs/predefine.go
View File

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