|
|
|
@@ -227,7 +227,6 @@ func GetModelMultipartUploadUrl(ctx *context.Context) { |
|
|
|
uploadID := ctx.Query("uploadID") |
|
|
|
partNumber := ctx.QueryInt("chunkNumber") |
|
|
|
size := ctx.QueryInt64("size") |
|
|
|
fileName := ctx.Query("file_name") |
|
|
|
typeCloudBrain := ctx.QueryInt("type") |
|
|
|
err := checkTypeCloudBrain(typeCloudBrain) |
|
|
|
if err != nil { |
|
|
|
@@ -249,24 +248,19 @@ func GetModelMultipartUploadUrl(ctx *context.Context) { |
|
|
|
ctx.Error(400, fmt.Sprintf("chunk size(%d) is too big", size)) |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
url, err = storage.GenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber, size) |
|
|
|
if err != nil { |
|
|
|
ctx.Error(500, fmt.Sprintf("GenMultiPartSignedUrl failed: %v", err)) |
|
|
|
return |
|
|
|
} |
|
|
|
} else { |
|
|
|
if setting.PROXYURL != "" { |
|
|
|
url = setting.PROXYURL + "/obs_proxy_multipart?uuid=" + uuid + "&uploadId=" + uploadID + "&partNumber=" + fmt.Sprint(partNumber) + "&file_name=" + fileName |
|
|
|
log.Info("return url=" + url) |
|
|
|
} else { |
|
|
|
url, err = storage.ObsGenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber) |
|
|
|
if err != nil { |
|
|
|
ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err)) |
|
|
|
return |
|
|
|
} |
|
|
|
log.Info("url=" + url) |
|
|
|
url, err = storage.ObsGenMultiPartSignedUrl(fileChunk.ObjectName, uploadID, partNumber) |
|
|
|
if err != nil { |
|
|
|
ctx.Error(500, fmt.Sprintf("ObsGenMultiPartSignedUrl failed: %v", err)) |
|
|
|
return |
|
|
|
} |
|
|
|
log.Info("url=" + url) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
ctx.JSON(200, map[string]string{ |
|
|
|
|