Skip to content

X
xiaomai-cloud-class-web
Commit 29a20ad7 by renmanyi
Options

Merge branch 'feature/renmanyi/20260121/tx-upload' into 'master' 

Feature/renmanyi/20260121/tx upload

See merge request !97
parents 0e333b1d 97c09c43
Showing with 460 additions and 295 deletions
config/webpack.config.js
......@@ -137,7 +137,8 @@ module.exports = function (webpackEnv) {
mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
// Stop compilation early in production
bail: isEnvProduction,
devtool: isEnvProduction ? (shouldUseSourceMap ? 'source-map' : false) : isEnvDevelopment && 'cheap-module-source-map',
devtool: false,
// devtool: isEnvProduction ? (shouldUseSourceMap ? 'source-map' : false) : isEnvDevelopment && 'cheap-module-source-map',
// These are the "entry points" to our application.
// This means they will be the "root" imports that are included in JS bundle.
entry: [
......
package.json
......@@ -21,7 +21,8 @@
"@types/underscore": "^1.10.22",
"@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0",
"ali-oss": "6.17.1",
"ali-oss": "^6.23.0",
"cos-js-sdk-v5": "^1.10.1",
"antd": "^4.16.3",
"array-move": "^3.0.1",
"axios": "^0.20.0",
......
src/bu-components/UploadProgressModal.jsx
......@@ -9,6 +9,7 @@ import {
FILR_VERIFY_MAP,
UPLOAD_PART_SIZE,
UPLOAD_PARALLEL,
TX_UPLOAD_REGION,
} from "@/domains/resource-disk/constants";
import { getFileTypeByName } from '@/domains/resource-disk/utils';
import UploadFileService from '@/domains/resource-disk/UploadFileService';
......@@ -72,15 +73,17 @@ class UploadProgressModal extends React.Component {
accessTypeEnum: 'PUBLIC',
bizCode: 'UPLOAD_FOLDER',
}).then((result) => {
const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
this.setState({
ossClient,
resourceId,
callBack,
callbackBody,
ossUri
});
resolve({ ossClient, resourceId, callBack, callbackBody, ossUri });
const { ossClient, resourceId, ossUri, vendorType,bucket,callbackData,callback} = result;
this.setState({
ossClient,
resourceId,
callbackData,
callback,
ossUri,
bucket,
vendorType
});
resolve({ ossClient, resourceId, vendorType, bucket, callbackData, callback, ossUri });
})
})
}
......@@ -97,29 +100,62 @@ class UploadProgressModal extends React.Component {
// 开始上传之前初始化OssClient
this.initOssClient(id, resourceName).then((result) => {
const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
ossClient.multipartUpload(ossUri, fileContent, {
callback: {
url: callBack,
body: callbackBody,
contentType: 'application/json',
},
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, file)
},
mime: type
}).then(url => {
console.log('1111');
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
const { ossClient, resourceId, ossUri, vendorType,bucket,callbackData,callback} = result;
if (vendorType === 'TENCENT_COS') {
// 腾讯云分片上传
ossClient.sliceUploadFile({
Bucket: bucket,
Region: TX_UPLOAD_REGION,
Key:ossUri,
Body: fileContent,
SliceSize: UPLOAD_PART_SIZE,
// 回调配置
Callback: callback,
onProgress: (progressData) => {
const progress = progressData.percent;
this.onMultipartUploadProgress(progress, { uploadId: randomString(16), file: fileContent }, file);
},
onTaskReady: (taskId) => {
// 记录任务ID，用于取消上传
file.taskId = taskId;
},
})
.then(res => {
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
})
.catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
} else {
// 阿里云分片上传
ossClient
.multipartUpload(ossUri, fileContent, {
callback: {
url: callbackData.url,
body: callbackData.body,
callbackSNI: true,
contentType: callbackData.contentType
},
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, file);
},
mime: type
})
.then(url => {
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
})
.catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
}
});
}
......@@ -133,42 +169,79 @@ class UploadProgressModal extends React.Component {
// 如果文件小于100KB，不用记录断点，直接上传
const { fileContent } = file;
const { size } = fileContent;
if (size > 100 * 1024) {
if (size > 100 * 1024 && checkpoint && checkpoint.uploadId) {
// 确保checkpoint和uploadId存在时才记录
if (!file.checkpoints) {
file.checkpoints = {};
}
file.checkpoints[checkpoint.uploadId] = checkpoint;
}
}
// 断点续传
handleReUpload = (index) => {
const { fileList, ossClient, resourceId, callBack, callbackBody } = this.state;
const { fileList, bucket,ossUri, ossClient, callback, resourceId, callbackData, vendorType } = this.state;
const currentFile = fileList[index];
const { checkpoints, fileContent } = currentFile
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, file } = checkpoint;
const { type } = file;
ossClient.multipartUpload(uploadId, file, {
callback: {
url: callBack,
body: callbackBody,
contentType: 'application/json',
const { checkpoints, fileContent } = currentFile;
if ( vendorType === 'TENCENT_COS') {
// 腾讯云重新上传
ossClient.sliceUploadFile({
Bucket: bucket,
Region: TX_UPLOAD_REGION,
Key: ossUri,
Body: fileContent,
SliceSize: UPLOAD_PART_SIZE,
// 回调配置
Callback: callback,
onProgress: (progressData) => {
const progress = progressData.percent;
this.onMultipartUploadProgress(progress, { uploadId: uuid(), file: fileContent }, currentFile);
},
checkpoint,
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, currentFile)
onTaskReady: (taskId) => {
currentFile.taskId = taskId;
},
mime: type,
}).then(url => {
currentFile.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
currentFile.status = 'fail';
this.setState({ fileList });
})
.then(res => {
currentFile.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
})
.catch(err => {
currentFile.status = 'fail';
this.setState({ fileList });
});
} else {
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, file } = checkpoint;
const { type } = file;
ossClient
.multipartUpload(uploadId, file, {
callback: {
url: callbackData.url,
body: callbackData.body,
callbackSNI: true,
contentType: callbackData.contentType
},
checkpoint,
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, currentFile);
},
mime: type
})
.then(url => {
currentFile.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
})
.catch(err => {
currentFile.status = 'fail';
this.setState({ fileList });
});
});
})
}
}
// 显示/隐藏上传进度
......@@ -181,7 +254,7 @@ class UploadProgressModal extends React.Component {
// 取消上传
handleCancelAllUpload = () => {
// 判断是否有正在上传或者待上传的文件，有的话弹出二次提示框
const { fileList, ossClient } = this.state;
const { fileList, ossClient, vendorType } = this.state;
const uploadingFileList = fileList.filter(file => file.status === 'uploading' || file.status === 'waiting');
if (uploadingFileList.length) {
Modal.confirm({
......@@ -190,11 +263,19 @@ class UploadProgressModal extends React.Component {
icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
onOk: () => {
uploadingFileList.forEach((uploadingFile, index) => {
const { checkpoints } = uploadingFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
if (vendorType === 'TENCENT_COS') {
// 腾讯云取消上传
if (uploadingFile.taskId) {
ossClient.cancelTask(uploadingFile.taskId);
}
} else {
// 阿里云取消上传
const { checkpoints } = uploadingFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
}
fileList.splice(index, 1);
});
this.setState({ fileList: [] });
......@@ -209,15 +290,20 @@ class UploadProgressModal extends React.Component {
// 取消单个文件上传
handleCancelUpload = (currentFile, index) => {
const { fileList, ossClient } = this.state;
const { checkpoints } = currentFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
const { fileList, ossClient, vendorType } = this.state;
if (vendorType === 'TENCENT_COS') {
// 腾讯云取消上传
if (currentFile.taskId) {
ossClient.cancelTask(currentFile.taskId);
}
} else {
// 阿里云取消上传
const { checkpoints } = currentFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
}
fileList.splice(index, 1);
this.setState({ fileList });
......
src/common/js/service.ts
/*
* @Author: 吴文洁
* @Date: 2020-08-31 09:34:51
* @LastEditors: wufan
* @LastEditTime: 2021-01-06 20:18:46
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:29:54
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -34,10 +34,7 @@ class Service {
static get(url: string, params: any, option?: any) {
return Axios.post('GET', url, params, option);
}
static MFS(url: string, params: any, option: any) {
return Axios.post('POST', `mfs/${url}`, params, option);
}
}
export default Service;
\ No newline at end of file
src/core/upload.js
import { func } from "prop-types";
import Service from '@/common/js/service';
import User from '@/common/js/user';
import { message } from 'antd';
/*
* @Author: 吴文洁
* @Date: 2020-08-11 11:47:14
* @LastEditors: wufan
* @LastEditTime: 2021-01-03 21:04:30
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:28:25
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -22,73 +21,29 @@ class Upload {
return Service.Hades('public/hades/commonOssAuthority', param).then((res) => {
const signInfo = res.result;
const { fileUrl } = res.result
return this.uploadBlobToNewOSS(Blob, name, dir, signInfo.signatureVO || signInfo).then(() => {
console.log('url2222222',fileUrl);
return dataType === 'url' ? fileUrl : signInfo
});
if (signInfo.vendorType === 'TENCENT_COS') {
return this.uploadBlobToNewOSSTx(Blob, name, signInfo.signatureVO || signInfo).then(() => {
return dataType === 'url' ? fileUrl : signInfo
})
} else {
return this.uploadBlobToNewOSS(
Blob,
name,
signInfo.signatureVO || signInfo
).then(() => {
return dataType === 'url' ? fileUrl : signInfo
});
}
})
};
static asyncUploadVideoToOSS(Blob, name, complete, dir, needSize) {
name = window.encodeURI(name.toLowerCase());
let ossSignServerAddress = UPLOAD + 'xm/oss/web/token?bucket=v';
const xhr = new XMLHttpRequest();
xhr.open('GET', ossSignServerAddress, true);
xhr.onload = () => {
const signInfo = JSON.parse(xhr.responseText);
const fd = new FormData();
fd.append('Filename', name);
fd.append('callback', signInfo.callback);
fd.append('expire', signInfo.expire);
fd.append('policy', signInfo.policy);
fd.append('signature', signInfo.signature);
fd.append('OSSAccessKeyId', signInfo.accessid);
fd.append('success_action_status', 200);
if (!dir) {
dir = Blob.type == 'text/html' ? 'html/' : '';
}
fd.append('key', signInfo.dir + dir + name);
fd.append('file', Blob);
xhr.open('POST', signInfo.host, true);
xhr.onload = () => {
const result = JSON.parse(xhr.responseText);
if (needSize) {
complete(result);
} else {
complete((result.url || false).replace(/http:/, "https:"));
}
};
xhr.send(fd);
};
xhr.onerror = () => {
complete(false);
}
xhr.send(null);
return xhr;
}
static getVideoParseRoute(videoUrl) {
return Service.MFS('anon/video/parse', { videoUrl }).then((res) => {
return Service.Sales('anon/resource/parseVideo', { videoUrl }).then((res) => {
return res.result.sdUrl || videoUrl;
})
}
// mfs上传文件
static uploadBlobToMFSOSS(signInfoUrl, signInfoParams, Blob, name, dir) {
return Service.post(signInfoUrl, signInfoParams).then(res => {
var signInfo = res.result;
return this.uploadBlobToNewOSS(Blob, name, dir, signInfo.signatureVO || signInfo).then((res) => {
return signInfo;
});
})
}
static uploadBlobToNewOSS(Blob, name, dir, signInfo) {
static uploadBlobToNewOSS(Blob, name, signInfo) {
return new Promise(function (resolve, reject) {
var xhr = new XMLHttpRequest();
var fd = new FormData();
......@@ -102,6 +57,9 @@ class Upload {
// dir = Blob.type == 'text/html' ? 'html/' : '';
// }
fd.append('key', signInfo.key);
if(signInfo.securityToken) {
fd.append("x-oss-security-token", signInfo.securityToken);
}
fd.append('file', Blob);
fd.append('success_action_status', 200);
xhr.open('POST', signInfo.host.replace(/http:/, "https:"), true);
......@@ -119,33 +77,36 @@ class Upload {
};
// 监听多媒体上传进度
static uploadToOSSEvent(Blob, name, onInit=()=>{}, onProgress=()=>{}, onLoad=()=>{}, onError=()=>{}) {
Service.MFS('anon/mfs/webTokenWithAccessUrl', { resourceName: name, instId: (!!window.currentUserInstInfo && window.currentUserInstInfo.instId) || LS.get('instId') || '' }).then((res) => {
const signInfo = res.result;
const { url } = res.result;
const xhr = new XMLHttpRequest();
const fd = new FormData();
fd.append('OSSAccessKeyId', signInfo.accessId);
static uploadBlobToNewOSSTx(Blob, name, signInfo={}) {
return new Promise(function (resolve, reject) {
var xhr = new XMLHttpRequest();
var fd = new FormData();
let timeVal = JSON.parse(signInfo.extAttrs)['q-key-time'];
fd.append('q-sign-algorithm', 'sha1');
fd.append('key', signInfo.key);
fd.append('q-ak', signInfo.accessKeyId);
fd.append('policy', signInfo.policy);
fd.append('callback', signInfo.callback);
fd.append('q-signature', signInfo.signature);
fd.append('success_action_status', '200');
fd.append('x-cos-callback', signInfo.callback);
signInfo.securityToken && fd.append("x-cos-security-token", signInfo.securityToken);
fd.append('q-key-time', timeVal);
fd.append('Filename', name);
fd.append('expire', signInfo.expire);
fd.append('signature', signInfo.signature);
fd.append('key', signInfo.key);
fd.append('file', Blob);
fd.append('success_action_status', 200);
onInit(url,xhr,signInfo)
xhr.open('POST', signInfo.host);
xhr.upload.addEventListener("progress", onProgress, false);
xhr.onload = onLoad;
xhr.onerror = onError;
xhr.open('POST', signInfo.host, true);
xhr.onload = () => {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
const res = JSON.parse(xhr.responseText);
resolve(res.result.url);
} else {
console.error('Error: ' + xhr.status);
}
}
};
xhr.send(fd);
})
}
});
};
static uploadTextToOSS(string, name, success, error) {
if (!string) return success();
......@@ -156,25 +117,42 @@ class Upload {
resourceName: name,
}
Service.Hades('/public/hades/ossAuthority', params).then((res) => {
const { resourceId, accessId, policy, callback, signature,key, host } = res.result;
const xhr = new XMLHttpRequest();
const formData = new FormData();
formData.append("OSSAccessKeyId", accessId);
formData.append("policy", policy);
formData.append("callback", callback);
formData.append("Signature", signature);
formData.append("key", key);
formData.append("file", new Blob([string]));
formData.append("success_action_status", 200);
xhr.open("POST", host);
xhr.onload = () => {
success(resourceId);
};
xhr.onerror = () => {
error();
const signInfo = res.result;
const { resourceId } = res.result;
if (signInfo.vendorType === 'TENCENT_COS') {
// 腾讯云 COS 上传
this.uploadBlobToNewOSSTx(new Blob([string]), name, signInfo.signatureVO || signInfo).then(() => {
success(resourceId);
}).catch(() => {
error();
});
} else {
// 阿里云 OSS 上传
const { accessId, policy, callback, signature, key, host } = signInfo;
const xhr = new XMLHttpRequest();
const formData = new FormData();
formData.append("OSSAccessKeyId", accessId);
formData.append("policy", policy);
formData.append("callback", callback);
formData.append("Signature", signature);
formData.append("key", key);
if(signInfo.securityToken) {
formData.append("x-oss-security-token", signInfo.securityToken);
}
formData.append("file", new Blob([string]));
formData.append("success_action_status", 200);
xhr.open("POST", host);
xhr.onload = () => {
success(resourceId);
};
xhr.onerror = () => {
error();
}
xhr.send(formData);
}
xhr.send(formData);
})
}).catch(() => {
error();
});
}
}
......
src/data-source/base/request-apis.ts
/*
* @Author: wufan
* @Date: 2020-12-01 17:21:21
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-09 15:33:33
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:38:02
* @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -72,11 +72,12 @@ export const getOssClient = (
resourceName: string,
accessTypeEnum: string
) => {
return Service.postJSON('mfs/anon/mfs/multiPartUpload', {
return Service.postJSON('business/public/mfs/commonUpload', {
data,
instId,
bizCode,
resourceName,
needSecret: true,
accessTypeEnum
});
}
......
src/data-source/basic/basic-apis.ts
/*
* @Author: 吴文洁
* @Date: 2020-10-10 18:21:47
* @LastEditors: wufan
* @LastEditTime: 2020-12-09 16:05:24
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:38:06
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -15,11 +15,12 @@ export const getOssClient = (
resourceName: string,
accessTypeEnum: string
) => {
return Service.postJSON('mfs/anon/mfs/multiPartUpload', {
return Service.postJSON('business/public/mfs/commonUpload', {
data,
instId,
bizCode,
resourceName,
needSecret: true,
accessTypeEnum
});
}
\ No newline at end of file
src/domains/resource-disk/UploadFileService.ts
/*
* @Author: 吴文洁
* @Date: 2020-10-10 18:19:34
* @LastEditors: 吴文洁
* @LastEditTime: 2020-10-13 18:09:39
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:39:33
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
import OSS from 'ali-oss';
import COS from 'cos-js-sdk-v5';
import { UPLOAD_REGION } from '@/domains/resource-disk/constants';
import { getOssClient } from '@/data-source/basic/basic-apis';
......@@ -31,32 +32,26 @@ export default class UploadFileService {
accessTypeEnum
).then((res) => {
const { result = {} } = res;
const {
bucket,
callBack,
resourceId,
accessKeyId,
securityToken,
accessKeySecret,
callbackBody,
ossUri
} = result;
const ossClient = new OSS({
bucket,
accessKeyId,
accessKeySecret,
region: UPLOAD_REGION,
stsToken: securityToken,
});
resolve({
ossClient,
resourceId,
callBack,
callbackBody,
ossUri
});
const { bucket, resourceId, accessKeyId, securityToken, accessKeySecret, key, vendorType, callbackData, callback } = result;
let client;
if (vendorType === 'TENCENT_COS') {
// 腾讯云配置
client = new COS({
SecretId: accessKeyId,
SecretKey: accessKeySecret,
SecurityToken: securityToken
});
} else {
// 阿里云配置
client = new OSS({
bucket,
accessKeyId,
accessKeySecret,
region: UPLOAD_REGION,
stsToken: securityToken
});
}
resolve({ ossClient: client, resourceId, ossUri:key, vendorType,bucket,callbackData,callback });
})
})
}
......
src/domains/resource-disk/constants.ts
/*
* @Author: 吴文洁
* @Date: 2020-08-20 09:21:40
* @LastEditors: yuananting
* @LastEditTime: 2021-07-15 11:48:58
* @LastEditors: renmanyi
* @LastEditTime: 2026-02-03 15:45:43
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -172,6 +172,7 @@ const NON_COMPLIANT_FILE_MAP = {
// 文件上传
const UPLOAD_REGION = 'oss-cn-hangzhou';
const TX_UPLOAD_REGION = 'ap-shanghai';
const UPLOAD_PART_SIZE = 1024 * 1024; // 每个分片大小(byte)
const UPLOAD_PARALLEL = 5; // 同时上传的分片数
......@@ -185,6 +186,7 @@ export {
DISK_MAP,
SUFFIX_MAP,
UPLOAD_REGION,
TX_UPLOAD_REGION,
UPLOAD_PART_SIZE,
UPLOAD_PARALLEL,
}
\ No newline at end of file
src/modules/prepare-lesson/modal/UploadProgressModal.jsx
import React from 'react';
import { Modal } from 'antd';
import OSS from 'ali-oss';
import COS from 'cos-js-sdk-v5';
import Service from '@/common/js/service';
import { getEllipsText } from "@/core/util";
import { getEllipsText, randomString } from "@/core/util";
import { DEFAULT_SIZE_UNIT, FileTypeIcon, FileVerifyMap } from "@/common/constants/academic/lessonEnum";
import { getFileTypeByName } from '../components/FolderManage';
......@@ -10,6 +11,7 @@ import User from '@/common/js/user';
import './UploadProgressModal.less';
const UPLOAD_REGION = 'oss-cn-hangzhou';
const TX_UPLOAD_REGION = 'ap-shanghai';
const UPLOAD_PART_SIZE = 1024 * 1024; // 每个分片大小(byte)
const UPLOAD_PARALLEL = 5; // 同时上传的分片数
......@@ -61,9 +63,10 @@ class UploadProgressModal extends React.Component {
const instId = User.getStoreId();
return new Promise(resolve => {
Service.postJSON('mfs/anon/mfs/multiPartUpload', {
Service.postJSON('business/public/mfs/commonUpload', {
instId,
resourceName,
needSecret: true,
data: { folderId: id },
accessTypeEnum: 'PUBLIC',
bizCode: 'UPLOAD_FOLDER',
......@@ -71,30 +74,45 @@ class UploadProgressModal extends React.Component {
const { result = {} } = res;
const {
bucket,
callBack,
resourceId,
accessKeyId,
securityToken,
accessKeySecret,
callbackBody,
ossUri
key,
vendorType,
callbackData,
callback
} = result;
const ossClient = new OSS({
bucket,
accessKeyId,
accessKeySecret,
region: UPLOAD_REGION,
stsToken: securityToken,
});
let ossClient;
if (vendorType === 'TENCENT_COS') {
// 腾讯云 COS 客户端配置
ossClient = new COS({
SecretId: accessKeyId,
SecretKey: accessKeySecret,
SecurityToken: securityToken
});
} else {
// 阿里云 OSS 客户端配置
ossClient = new OSS({
bucket,
accessKeyId,
accessKeySecret,
region: UPLOAD_REGION,
stsToken: securityToken,
});
}
this.setState({
ossClient,
resourceId,
callBack,
callbackBody,
ossUri
ossUri: key,
vendorType,
bucket,
callback,
callbackData,
});
resolve({ ossClient, resourceId, callBack, callbackBody, ossUri });
resolve({ ossClient, resourceId, ossUri: key, vendorType, bucket, callback, callbackData });
})
})
}
......@@ -107,32 +125,64 @@ class UploadProgressModal extends React.Component {
const { id = 0 } = currentFolder;
const { name, type } = fileContent;
const resourceName = window.random_string(16) + name.slice(name.lastIndexOf('.'));
const resourceName = randomString(16) + name.slice(name.lastIndexOf('.'));
const { instId } = window.currentUserInstInfo;
// 开始上传之前初始化OssClient
this.initOssClient(id, resourceName).then((result) => {
const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
ossClient.multipartUpload(ossUri, fileContent, {
callback: {
url: callBack,
body: callbackBody,
contentType: 'application/json',
},
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, file)
},
mime: type
}).then(url => {
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
const { ossClient, resourceId, ossUri, vendorType, bucket, callback, callbackData } = result;
if (vendorType === 'TENCENT_COS') {
// 腾讯云分片上传
ossClient.sliceUploadFile({
Bucket: bucket,
Region: TX_UPLOAD_REGION,
Key: ossUri,
Body: fileContent,
SliceSize: UPLOAD_PART_SIZE,
// 回调配置
Callback: callback,
onProgress: (progressData) => {
const progress = progressData.percent;
this.onMultipartUploadProgress(progress, { uploadId: randomString(16), file: fileContent }, file);
},
onTaskReady: (taskId) => {
// 记录任务ID，用于取消上传
file.taskId = taskId;
},
})
.then(res => {
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
})
.catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
} else {
// 阿里云分片上传
ossClient.multipartUpload(ossUri, fileContent, {
callback: {
url: callbackData.url,
body: callbackData.body,
callbackSNI: true,
contentType: callbackData.contentType
},
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, file)
},
mime: type
}).then(url => {
file.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
file.status = 'fail';
this.setState({ fileList });
});
}
});
}
......@@ -146,42 +196,76 @@ class UploadProgressModal extends React.Component {
// 如果文件小于100KB，不用记录断点，直接上传
const { fileContent } = file;
const { size } = fileContent;
if (size > 100 * 1024) {
if (size > 100 * 1024 && checkpoint && checkpoint.uploadId) {
// 确保checkpoint和uploadId存在时才记录
if (!file.checkpoints) {
file.checkpoints = {};
}
file.checkpoints[checkpoint.uploadId] = checkpoint;
}
}
// 断点续传
handleReUpload = (index) => {
const { fileList, ossClient, resourceId, callBack, callbackBody } = this.state;
const { fileList, ossClient, resourceId, callbackData, vendorType, bucket, callback, ossUri } = this.state;
const currentFile = fileList[index];
const { checkpoints, fileContent } = currentFile
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, file } = checkpoint;
ossClient.multipartUpload(uploadId, file, {
callback: {
url: callBack,
body: callbackBody,
contentType: 'application/json',
const { checkpoints, fileContent } = currentFile;
if (vendorType === 'TENCENT_COS') {
// 腾讯云重新上传
ossClient.sliceUploadFile({
Bucket: bucket,
Region: TX_UPLOAD_REGION,
Key: ossUri,
Body: fileContent,
SliceSize: UPLOAD_PART_SIZE,
// 回调配置
Callback: callback,
onProgress: (progressData) => {
const progress = progressData.percent;
this.onMultipartUploadProgress(progress, { uploadId: randomString(16), file: fileContent }, currentFile);
},
checkpoint,
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, currentFile)
onTaskReady: (taskId) => {
currentFile.taskId = taskId;
},
mime: file.type
}).then(url => {
})
.then(res => {
currentFile.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
})
.catch(err => {
currentFile.status = 'fail';
this.setState({ fileList });
});
})
} else {
// 阿里云断点续传
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, file } = checkpoint;
ossClient.multipartUpload(uploadId, file, {
callback: {
url: callbackData.url,
body: callbackData.body,
callbackSNI: true,
contentType: callbackData.contentType
},
checkpoint,
parallel: UPLOAD_PARALLEL,
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, currentFile)
},
mime: file.type
}).then(url => {
currentFile.status = 'success';
this.setState({ fileList });
this.props.onUpload(fileContent, resourceId);
}).catch(err => {
currentFile.status = 'fail';
this.setState({ fileList });
});
});
}
}
// 显示/隐藏上传进度
......@@ -194,7 +278,7 @@ class UploadProgressModal extends React.Component {
// 取消上传
handleCancelAllUpload = () => {
// 判断是否有正在上传或者待上传的文件，有的话弹出二次提示框
const { fileList, ossClient } = this.state;
const { fileList, ossClient, vendorType } = this.state;
const uploadingFileList = fileList.filter(file => file.status === 'uploading' || file.status === 'waiting');
if (uploadingFileList.length) {
Modal.confirm({
......@@ -203,15 +287,22 @@ class UploadProgressModal extends React.Component {
icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
onOk: () => {
uploadingFileList.forEach((uploadingFile, index) => {
const { checkpoints } = uploadingFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
if (vendorType === 'TENCENT_COS') {
// 腾讯云取消上传
if (uploadingFile.taskId) {
ossClient.cancelTask(uploadingFile.taskId);
}
} else {
// 阿里云取消上传
const { checkpoints } = uploadingFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
}
fileList.splice(index, 1);
})
this.setState({ fileList });
});
this.setState({ fileList: [] });
this.props.onCancel();
}
})
......@@ -223,12 +314,21 @@ class UploadProgressModal extends React.Component {
// 取消单个文件上传
handleCancelUpload = (currentFile, index) => {
const { fileList, ossClient } = this.state;
const { checkpoints } = currentFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
const { fileList, ossClient, vendorType } = this.state;
if (vendorType === 'TENCENT_COS') {
// 腾讯云取消上传
if (currentFile.taskId) {
ossClient.cancelTask(currentFile.taskId);
}
} else {
// 阿里云取消上传
const { checkpoints } = currentFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
}
fileList.splice(index, 1);
this.setState({ fileList });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment