s3

pkg/common/db/controller/storage.go

@@ -20,6 +20,12 @@ import (
 	"time"
 )
 
+const (
+	hashPrefix     = "hash"
+	tempPrefix     = "temp"
+	fragmentPrefix = "fragment_"
+)
+
 type S3Database interface {
 	ApplyPut(ctx context.Context, req *third.ApplyPutReq) (*third.ApplyPutResp, error)
 	GetPut(ctx context.Context, req *third.GetPutReq) (*third.GetPutResp, error)
@@ -51,7 +57,7 @@ func (c *s3Database) today() string {
 
 // fragmentName 根据序号生成文件名
 func (c *s3Database) fragmentName(index int) string {
-	return "fragment_" + strconv.Itoa(index+1)
+	return fragmentPrefix + strconv.Itoa(index+1)
 }
 
 // getFragmentNum 获取分片大小和分片数量
@@ -79,17 +85,12 @@ func (c *s3Database) CheckHash(hash string) error {
 		return err
 	}
 	if len(val) != md5.Size {
-		return errors.New("hash value error")
+		return errs.ErrArgs.Wrap("invalid hash")
 	}
 	return nil
 }
 
 func (c *s3Database) urlName(name string) string {
-	//if name[0] != '/' {
-	//	name = "/" + name
-	//}
-	//config.Config.Credential.ObjectURL + name
-	//return "http://127.0.0.1:8080" + name
 	return config.Config.Object.ApiURL + name
 }
 
@@ -98,7 +99,7 @@ func (c *s3Database) UUID() string {
 }
 
 func (c *s3Database) HashName(hash string) string {
-	return path.Join("hash", c.today(), c.UUID())
+	return path.Join(hashPrefix, hash+"_"+c.today()+"_"+c.UUID())
 }
 
 func (c *s3Database) isNotFound(err error) bool {
@@ -146,7 +147,7 @@ func (c *s3Database) ApplyPut(ctx context.Context, req *third.ApplyPutReq) (*thi
 		ExpirationTime: expirationTime,
 		EffectiveTime:  time.Now().Add(effective),
 	}
-	put.Path = path.Join("upload", c.today(), req.Hash, put.PutID)
+	put.Path = path.Join(tempPrefix, c.today(), req.Hash, put.PutID)
 	putURLs := make([]string, 0, pack)
 	for i := 0; i < pack; i++ {
 		url, err := c.obj.PresignedPutURL(ctx, &obj.ApplyPutArgs{
@@ -373,8 +374,12 @@ func (c *s3Database) GetUrl(ctx context.Context, req *third.GetUrlReq) (*third.G
 	if err != nil {
 		return nil, err
 	}
+	u, err := c.obj.GetURL(ctx, hash.Bucket, hash.Name, time.Duration(req.Expires)*time.Millisecond)
+	if err != nil {
+		return nil, err
+	}
 	return &third.GetUrlResp{
-		Url:  c.obj.GetURL(hash.Bucket, hash.Name),
+		Url:  u,
 		Size: hash.Size,
 		Hash: hash.Hash,
 	}, nil