|
@@ -199,13 +199,13 @@ async function awsupload(file, folderid, filestate) {
|
|
if (uploadid) {
|
|
if (uploadid) {
|
|
//断点续传
|
|
//断点续传
|
|
var data = await awsuploadpart(filestate, file, uploadid, partsinfo.Parts, key);
|
|
var data = await awsuploadpart(filestate, file, uploadid, partsinfo.Parts, key);
|
|
- return { data, uploadid };
|
|
|
|
|
|
+ return { data, key, uploadid };
|
|
}
|
|
}
|
|
//不存在,上传新的
|
|
//不存在,上传新的
|
|
else {
|
|
else {
|
|
const uploadid = await initMultipartUpload(key, file); //初始化文件上传
|
|
const uploadid = await initMultipartUpload(key, file); //初始化文件上传
|
|
var data = await awsuploadpart(filestate, file, uploadid, [], key);
|
|
var data = await awsuploadpart(filestate, file, uploadid, [], key);
|
|
- return { data, uploadid };
|
|
|
|
|
|
+ return { data, key, uploadid };
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//如果已经上传成功了,那么直接返回状态百分百
|
|
//如果已经上传成功了,那么直接返回状态百分百
|
|
@@ -213,7 +213,7 @@ async function awsupload(file, folderid, filestate) {
|
|
//data存在,上传成功
|
|
//data存在,上传成功
|
|
filestate.percent = 100;
|
|
filestate.percent = 100;
|
|
filestate.status = "success";
|
|
filestate.status = "success";
|
|
- return { data };
|
|
|
|
|
|
+ return { data, key };
|
|
}
|
|
}
|
|
});
|
|
});
|
|
}
|
|
}
|