|
@@ -351,20 +351,19 @@ export async function uploadMinIOWithPolicy(
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- const key = `${uploadPath}${fileKey}`
|
|
|
|
|
if( file.size > PART_SIZE ){
|
|
if( file.size > PART_SIZE ){
|
|
|
- const policy = await getMultipartUploadPolicy(file.size, key)
|
|
|
|
|
|
|
+ const policy = await getMultipartUploadPolicy(file.size, `${uploadPath}${fileKey}`)
|
|
|
return MinIOXHRMultipartUploader.upload(
|
|
return MinIOXHRMultipartUploader.upload(
|
|
|
policy,
|
|
policy,
|
|
|
file,
|
|
file,
|
|
|
- key,
|
|
|
|
|
|
|
+ policy.key,
|
|
|
callbacks
|
|
callbacks
|
|
|
);
|
|
);
|
|
|
}else{
|
|
}else{
|
|
|
if (!(file instanceof File)) {
|
|
if (!(file instanceof File)) {
|
|
|
throw new Error('不支持的文件类型,无法获取文件名');
|
|
throw new Error('不支持的文件类型,无法获取文件名');
|
|
|
}
|
|
}
|
|
|
- const policy = await getUploadPolicy(key, file.name);
|
|
|
|
|
- return MinIOXHRUploader.upload(policy, file, key, callbacks);
|
|
|
|
|
|
|
+ const policy = await getUploadPolicy(`${uploadPath}${fileKey}`, file.name);
|
|
|
|
|
+ return MinIOXHRUploader.upload(policy, file, policy.uploadPolicy.key, callbacks);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|