Skip to content

X
xiaomai-cloud-class-web
Commit d38924f0 by renmanyi
Options

feat:分片上传兼容腾讯云

parent bfbbdaaf
Showing with 202 additions and 116 deletions
package.json
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
"@types/underscore": "^1.10.22", "@types/underscore": "^1.10.22",
"@typescript-eslint/eslint-plugin": "^2.10.0", "@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^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", "antd": "^4.16.3",
"array-move": "^3.0.1", "array-move": "^3.0.1",
"axios": "^0.20.0", "axios": "^0.20.0",
......
src/bu-components/UploadProgressModal.jsx
...@@ -9,6 +9,7 @@ import { ...@@ -9,6 +9,7 @@ import {
FILR_VERIFY_MAP, FILR_VERIFY_MAP,
UPLOAD_PART_SIZE, UPLOAD_PART_SIZE,
UPLOAD_PARALLEL, UPLOAD_PARALLEL,
TX_UPLOAD_REGION,
} from "@/domains/resource-disk/constants"; } from "@/domains/resource-disk/constants";
import { getFileTypeByName } from '@/domains/resource-disk/utils'; import { getFileTypeByName } from '@/domains/resource-disk/utils';
import UploadFileService from '@/domains/resource-disk/UploadFileService'; import UploadFileService from '@/domains/resource-disk/UploadFileService';
...@@ -72,15 +73,17 @@ class UploadProgressModal extends React.Component { ...@@ -72,15 +73,17 @@ class UploadProgressModal extends React.Component {
accessTypeEnum: 'PUBLIC', accessTypeEnum: 'PUBLIC',
bizCode: 'UPLOAD_FOLDER', bizCode: 'UPLOAD_FOLDER',
}).then((result) => { }).then((result) => {
const { ossClient, resourceId, callBack, callbackBody, ossUri } = result; const { ossClient, resourceId, ossUri, vendorType,bucket,callbackData,callback} = result;
this.setState({ this.setState({
ossClient, ossClient,
resourceId, resourceId,
callBack, callbackData,
callbackBody, callback,
ossUri ossUri,
}); bucket,
resolve({ ossClient, resourceId, callBack, callbackBody, ossUri }); vendorType
});
resolve({ ossClient, resourceId, vendorType, bucket, callbackData, callback, ossUri });
}) })
}) })
} }
...@@ -97,29 +100,62 @@ class UploadProgressModal extends React.Component { ...@@ -97,29 +100,62 @@ class UploadProgressModal extends React.Component {
// 开始上传之前初始化OssClient // 开始上传之前初始化OssClient
this.initOssClient(id, resourceName).then((result) => { this.initOssClient(id, resourceName).then((result) => {
const { ossClient, resourceId, callBack, callbackBody, ossUri } = result; const { ossClient, resourceId, ossUri, vendorType,bucket,callbackData,callback} = result;
ossClient.multipartUpload(ossUri, fileContent, { if (vendorType === 'TENCENT_COS') {
callback: { // 腾讯云分片上传
url: callBack, ossClient.sliceUploadFile({
body: callbackBody, Bucket: bucket,
contentType: 'application/json', Region: TX_UPLOAD_REGION,
}, Key:ossUri,
parallel: UPLOAD_PARALLEL, Body: fileContent,
partSize: UPLOAD_PART_SIZE, SliceSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => { // 回调配置
this.onMultipartUploadProgress(progress, checkpoint, file) Callback: callback,
}, onProgress: (progressData) => {
mime: type const progress = progressData.percent;
}).then(url => { this.onMultipartUploadProgress(progress, { uploadId: randomString(16), file: fileContent }, file);
console.log('1111'); },
file.status = 'success'; onTaskReady: (taskId) => {
this.setState({ fileList }); // 记录任务ID，用于取消上传
this.props.onUpload(fileContent, resourceId); file.taskId = taskId;
}).catch(err => { },
})
file.status = 'fail'; .then(res => {
this.setState({ fileList }); 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 { ...@@ -133,42 +169,79 @@ class UploadProgressModal extends React.Component {
// 如果文件小于100KB，不用记录断点，直接上传 // 如果文件小于100KB，不用记录断点，直接上传
const { fileContent } = file; const { fileContent } = file;
const { size } = fileContent; 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; file.checkpoints[checkpoint.uploadId] = checkpoint;
} }
} }
// 断点续传 // 断点续传
handleReUpload = (index) => { 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 currentFile = fileList[index];
const { checkpoints, fileContent } = currentFile const { checkpoints, fileContent } = currentFile;
if ( vendorType === 'TENCENT_COS') {
Object.values(checkpoints).forEach(checkpoint => { // 腾讯云重新上传
const { uploadId, file } = checkpoint; ossClient.sliceUploadFile({
const { type } = file; Bucket: bucket,
ossClient.multipartUpload(uploadId, file, { Region: TX_UPLOAD_REGION,
callback: { Key: ossUri,
url: callBack, Body: fileContent,
body: callbackBody, SliceSize: UPLOAD_PART_SIZE,
contentType: 'application/json', // 回调配置
Callback: callback,
onProgress: (progressData) => {
const progress = progressData.percent;
this.onMultipartUploadProgress(progress, { uploadId: uuid(), file: fileContent }, currentFile);
}, },
checkpoint, onTaskReady: (taskId) => {
parallel: UPLOAD_PARALLEL, currentFile.taskId = taskId;
partSize: UPLOAD_PART_SIZE,
progress: (progress, checkpoint) => {
this.onMultipartUploadProgress(progress, checkpoint, currentFile)
}, },
mime: type,
}).then(url => { })
currentFile.status = 'success'; .then(res => {
this.setState({ fileList }); currentFile.status = 'success';
this.props.onUpload(fileContent, resourceId); this.setState({ fileList });
}).catch(err => { this.props.onUpload(fileContent, resourceId);
currentFile.status = 'fail'; })
this.setState({ fileList }); .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 { ...@@ -181,7 +254,7 @@ class UploadProgressModal extends React.Component {
// 取消上传 // 取消上传
handleCancelAllUpload = () => { handleCancelAllUpload = () => {
// 判断是否有正在上传或者待上传的文件，有的话弹出二次提示框 // 判断是否有正在上传或者待上传的文件，有的话弹出二次提示框
const { fileList, ossClient } = this.state; const { fileList, ossClient, vendorType } = this.state;
const uploadingFileList = fileList.filter(file => file.status === 'uploading' || file.status === 'waiting'); const uploadingFileList = fileList.filter(file => file.status === 'uploading' || file.status === 'waiting');
if (uploadingFileList.length) { if (uploadingFileList.length) {
Modal.confirm({ Modal.confirm({
...@@ -190,11 +263,19 @@ class UploadProgressModal extends React.Component { ...@@ -190,11 +263,19 @@ class UploadProgressModal extends React.Component {
icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>, icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
onOk: () => { onOk: () => {
uploadingFileList.forEach((uploadingFile, index) => { uploadingFileList.forEach((uploadingFile, index) => {
const { checkpoints } = uploadingFile; if (vendorType === 'TENCENT_COS') {
Object.values(checkpoints).forEach(checkpoint => { // 腾讯云取消上传
const { uploadId, name } = checkpoint; if (uploadingFile.taskId) {
ossClient.abortMultipartUpload(name, uploadId); 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); fileList.splice(index, 1);
}); });
this.setState({ fileList: [] }); this.setState({ fileList: [] });
...@@ -209,15 +290,20 @@ class UploadProgressModal extends React.Component { ...@@ -209,15 +290,20 @@ class UploadProgressModal extends React.Component {
// 取消单个文件上传 // 取消单个文件上传
handleCancelUpload = (currentFile, index) => { handleCancelUpload = (currentFile, index) => {
const { fileList, ossClient } = this.state; const { fileList, ossClient, vendorType } = this.state;
if (vendorType === 'TENCENT_COS') {
// 腾讯云取消上传
const { checkpoints } = currentFile; if (currentFile.taskId) {
Object.values(checkpoints).forEach(checkpoint => { ossClient.cancelTask(currentFile.taskId);
const { uploadId, name } = checkpoint; }
ossClient.abortMultipartUpload(name, uploadId); } else {
}); // 阿里云取消上传
const { checkpoints } = currentFile;
Object.values(checkpoints).forEach(checkpoint => {
const { uploadId, name } = checkpoint;
ossClient.abortMultipartUpload(name, uploadId);
});
}
fileList.splice(index, 1); fileList.splice(index, 1);
this.setState({ fileList }); this.setState({ fileList });
......
src/common/js/service.ts
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-31 09:34:51 * @Date: 2020-08-31 09:34:51
* @LastEditors: wufan * @LastEditors: renmanyi
* @LastEditTime: 2021-01-06 20:18:46 * @LastEditTime: 2026-02-03 15:29:54
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -34,10 +34,7 @@ class Service { ...@@ -34,10 +34,7 @@ class Service {
static get(url: string, params: any, option?: any) { static get(url: string, params: any, option?: any) {
return Axios.post('GET', url, params, option); 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; export default Service;
\ No newline at end of file
src/data-source/base/request-apis.ts
/* /*
* @Author: wufan * @Author: wufan
* @Date: 2020-12-01 17:21:21 * @Date: 2020-12-01 17:21:21
* @LastEditors: Please set LastEditors * @LastEditors: renmanyi
* @LastEditTime: 2021-07-09 15:33:33 * @LastEditTime: 2026-02-03 15:38:02
* @Description: Description * @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -72,11 +72,12 @@ export const getOssClient = ( ...@@ -72,11 +72,12 @@ export const getOssClient = (
resourceName: string, resourceName: string,
accessTypeEnum: string accessTypeEnum: string
) => { ) => {
return Service.postJSON('mfs/anon/mfs/multiPartUpload', { return Service.postJSON('business/public/mfs/commonUpload', {
data, data,
instId, instId,
bizCode, bizCode,
resourceName, resourceName,
needSecret: true,
accessTypeEnum accessTypeEnum
}); });
} }
......
src/data-source/basic/basic-apis.ts
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-10-10 18:21:47 * @Date: 2020-10-10 18:21:47
* @LastEditors: wufan * @LastEditors: renmanyi
* @LastEditTime: 2020-12-09 16:05:24 * @LastEditTime: 2026-02-03 15:38:06
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -15,11 +15,12 @@ export const getOssClient = ( ...@@ -15,11 +15,12 @@ export const getOssClient = (
resourceName: string, resourceName: string,
accessTypeEnum: string accessTypeEnum: string
) => { ) => {
return Service.postJSON('mfs/anon/mfs/multiPartUpload', { return Service.postJSON('business/public/mfs/commonUpload', {
data, data,
instId, instId,
bizCode, bizCode,
resourceName, resourceName,
needSecret: true,
accessTypeEnum accessTypeEnum
}); });
} }
\ No newline at end of file
src/domains/resource-disk/UploadFileService.ts
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-10-10 18:19:34 * @Date: 2020-10-10 18:19:34
* @LastEditors: 吴文洁 * @LastEditors: renmanyi
* @LastEditTime: 2020-10-13 18:09:39 * @LastEditTime: 2026-02-03 15:39:33
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import OSS from 'ali-oss'; import OSS from 'ali-oss';
import COS from 'cos-js-sdk-v5';
import { UPLOAD_REGION } from '@/domains/resource-disk/constants'; import { UPLOAD_REGION } from '@/domains/resource-disk/constants';
import { getOssClient } from '@/data-source/basic/basic-apis'; import { getOssClient } from '@/data-source/basic/basic-apis';
...@@ -31,32 +32,26 @@ export default class UploadFileService { ...@@ -31,32 +32,26 @@ export default class UploadFileService {
accessTypeEnum accessTypeEnum
).then((res) => { ).then((res) => {
const { result = {} } = res; const { result = {} } = res;
const { const { bucket, resourceId, accessKeyId, securityToken, accessKeySecret, key, vendorType, callbackData, callback } = result;
bucket, let client;
callBack, if (vendorType === 'TENCENT_COS') {
resourceId, // 腾讯云配置
accessKeyId, client = new COS({
securityToken, SecretId: accessKeyId,
accessKeySecret, SecretKey: accessKeySecret,
callbackBody, SecurityToken: securityToken
ossUri });
} = result; } else {
// 阿里云配置
const ossClient = new OSS({ client = new OSS({
bucket, bucket,
accessKeyId, accessKeyId,
accessKeySecret, accessKeySecret,
region: UPLOAD_REGION, region: UPLOAD_REGION,
stsToken: securityToken, stsToken: securityToken
}); });
}
resolve({ resolve({ ossClient: client, resourceId, ossUri:key, vendorType,bucket,callbackData,callback });
ossClient,
resourceId,
callBack,
callbackBody,
ossUri
});
}) })
}) })
} }
......
src/domains/resource-disk/constants.ts
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-20 09:21:40 * @Date: 2020-08-20 09:21:40
* @LastEditors: yuananting * @LastEditors: renmanyi
* @LastEditTime: 2021-07-15 11:48:58 * @LastEditTime: 2026-02-03 15:45:43
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -172,6 +172,7 @@ const NON_COMPLIANT_FILE_MAP = { ...@@ -172,6 +172,7 @@ const NON_COMPLIANT_FILE_MAP = {
// 文件上传 // 文件上传
const UPLOAD_REGION = 'oss-cn-hangzhou'; const UPLOAD_REGION = 'oss-cn-hangzhou';
const TX_UPLOAD_REGION = 'ap-shanghai';
const UPLOAD_PART_SIZE = 1024 * 1024; // 每个分片大小(byte) const UPLOAD_PART_SIZE = 1024 * 1024; // 每个分片大小(byte)
const UPLOAD_PARALLEL = 5; // 同时上传的分片数 const UPLOAD_PARALLEL = 5; // 同时上传的分片数
...@@ -185,6 +186,7 @@ export { ...@@ -185,6 +186,7 @@ export {
DISK_MAP, DISK_MAP,
SUFFIX_MAP, SUFFIX_MAP,
UPLOAD_REGION, UPLOAD_REGION,
TX_UPLOAD_REGION,
UPLOAD_PART_SIZE, UPLOAD_PART_SIZE,
UPLOAD_PARALLEL, UPLOAD_PARALLEL,
} }
\ No newline at end of file
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