Skip to content

Let's use AI to Earn!

aws

bulaienaofutuojsonzhang7b601012f01f
diff --git a/package.json b/package.json
index 6eb70e54..d15992a7 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"@ant-design/colors": "^7.2.1",
"@ant-design/icons": "^6.0.0",
"@ant-design/nextjs-registry": "^1.0.2",
+ "@aws-sdk/s3-presigned-post": "^3.916.0",
"@fullcalendar/core": "^6.1.17",
"@fullcalendar/daygrid": "^6.1.17",
"@fullcalendar/react": "^6.1.17",
diff --git a/src/api/oss.ts b/src/api/oss.ts
index 2a31db01..696d4662 100644
--- a/src/api/oss.ts
+++ b/src/api/oss.ts
@@ -1,105 +1,114 @@
import { request } from "@/utils/request";
-// 上传文件到OSS
+// 获取 AWS S3 presigned post 数据
+const getPresignedPostData = async (fileName: string, fileSize: number, contentType: string) => {
+ const res: any = await request({
+ url: "file/uploadUrl",
+ method: "GET",
+ params: {
+ key: fileName,
+ contentType: contentType,
+ fileSize: fileSize
+ },
+ });
+
+ if (res.code !== 0) {
+ throw new Error("获取上传URL失败");
+ }
+
+ return res.data;
+};
+
+// 上传文件到OSS (前端直传 AWS S3)
export const uploadToOss = async (file: File | Blob, onProgress?: (prog: number) => void) => {
try {
console.log("uploadToOss", file.size);
- // 如果文件大于10MB,使用分片上传
- if (file.size > (10 * 1024 * 1024)) {
- return uploadToOssMultipart(file, onProgress);
- }
- // 小于10MB,使用普通上传
+ // 获取文件信息
+ const fileName = (file as any).name || `file_${Date.now()}`;
+ const fileSize = file.size;
+ const contentType = file.type || "application/octet-stream";
+
+ // 获取 presigned post 数据
+ const presignedData = await getPresignedPostData(fileName, fileSize, contentType);
+ console.log("Presigned data:", presignedData);
+
+ // 创建 FormData 用于直传 (按照 AWS S3 presigned post 要求)
const formData = new FormData();
- formData.append("file", file);
-
- const res: any = await request({
- url: "file/upload",
- method: "POST",
- body: formData,
- });
- return res?.data.key;
- } catch (error) {
- console.error("上传文件失败:", error);
- throw error;
- }
-};
-
-// 分片上传文件到OSS
-export const uploadToOssMultipart = async (file: File | Blob, onProgress?: (prog: number) => void) => {
- try {
- // 1. 初始化分片上传
- const initResponse: any = await request({
- url: "file/uploadPart/init",
- method: "POST",
- data: {
- fileName: (file as any).name || "file",
- secondPath: "uploads",
- fileSize: file.size,
- contentType: file.type || "application/octet-stream",
- },
+
+ // 按照官方示例的顺序添加字段
+ // 1. 首先添加 key (文件名)
+ if (presignedData.fields.key) {
+ formData.append("key", presignedData.fields.key);
+ }
+
+ // 2. 添加其他隐藏字段 (按字母顺序)
+ const fieldKeys = Object.keys(presignedData.fields).filter(key => key !== 'key');
+ fieldKeys.sort().forEach(key => {
+ formData.append(key, presignedData.fields[key]);
});
-
- if (initResponse.code != 0) {
- throw new Error("初始化上传失败");
+
+ // 3. 添加 Content-Type (如果存在)
+ // if (contentType && !presignedData.fields['Content-Type']) {
+ // formData.append("Content-Type", contentType);
+ // }
+
+ // 4. 最后添加文件 (必须是最后一个字段)
+ formData.append("file", file);
+
+ // 调试:打印 FormData 内容
+ console.log("FormData entries:");
+ for (let [key, value] of formData.entries()) {
+ console.log(`${key}:`, value);
}
-
- const { fileId, uploadId } = initResponse.data;
-
- // 2. 分片上传文件
- const chunkSize = 5 * 1024 * 1024; // 5MB per chunk
- const chunks = Math.ceil(file.size / chunkSize);
- const parts = [];
-
- for (let i = 0; i < chunks; i++) {
- const start = i * chunkSize;
- const end = Math.min(start + chunkSize, file.size);
- const chunk = file.slice(start, end);
-
- // 上传分片
- const formData = new FormData();
- formData.append("file", chunk);
-
- const partResponse: any = await request({
- url: "file/uploadPart/upload",
+
+ // 直传文件到 AWS S3 (支持进度回调)
+ if (onProgress) {
+ return new Promise((resolve, reject) => {
+ const xhr = new XMLHttpRequest();
+
+ // 监听上传进度
+ xhr.upload.addEventListener('progress', (event) => {
+ if (event.lengthComputable) {
+ const progress = Math.round((event.loaded / event.total) * 100);
+ onProgress(progress);
+ }
+ });
+
+ // 监听上传完成
+ xhr.addEventListener('load', () => {
+ if (xhr.status >= 200 && xhr.status < 300) {
+ resolve(presignedData.fields.key);
+ } else {
+ reject(new Error(`上传失败: ${xhr.statusText}`));
+ }
+ });
+
+ // 监听上传错误
+ xhr.addEventListener('error', () => {
+ reject(new Error('上传失败: 网络错误'));
+ });
+
+ // 开始上传
+ xhr.open('POST', presignedData.url);
+ xhr.send(formData);
+ });
+ } else {
+ // 不使用进度回调的简单版本
+ const uploadResponse = await fetch(presignedData.url, {
method: "POST",
- data: formData,
- params: {
- fileId,
- uploadId,
- partNumber: i + 1,
- },
+ body: formData,
});
-
- if (partResponse.code != 0) {
- throw new Error("分片上传失败");
+
+ if (!uploadResponse.ok) {
+ throw new Error(`上传失败: ${uploadResponse.statusText}`);
}
-
- parts.push({
- PartNumber: partResponse.data.PartNumber,
- ETag: partResponse.data.ETag,
- });
-
- // 更新进度
- const currentProgress = Math.round(((i + 1) / chunks) * 100);
- if (onProgress) onProgress(currentProgress);
+
+ return presignedData.fields.key;
}
-
- // 3. 完成分片上传
- await request({
- url: "file/uploadPart/complete",
- method: "POST",
- data: {
- fileId,
- uploadId,
- parts,
- },
- });
-
- // 文件地址在初始化时就已经返回了
- return fileId;
} catch (error) {
- console.error("分片上传失败:", error);
+ console.error("上传文件失败:", error);
throw error;
}
};
+