From f6ce8342abe92e57f89239242473a5d50ef79f2c Mon Sep 17 00:00:00 2001
From: MarSeventh <1193267292@qq.com>
Date: Tue, 9 Dec 2025 15:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 functions/upload/chunkMerge.js  | 19 ++++++-------------
 functions/upload/chunkUpload.js |  3 +--
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/functions/upload/chunkMerge.js b/functions/upload/chunkMerge.js
index afc674a..a5f97a1 100644
--- a/functions/upload/chunkMerge.js
+++ b/functions/upload/chunkMerge.js
@@ -78,11 +78,10 @@ export async function handleChunkMerge(context) {
 
 // 开始合并处理
 async function startMerge(context, uploadId, totalChunks, originalFileName, originalFileType, uploadChannel) {
-    const { env, url, waitUntil } = context;
-    const db = getDatabase(env);
+    const { env } = context;
 
     try {
-        // 创建合并任务状态记录
+        // 合并任务状态输出
         const mergeStatus = {
             uploadId,
             status: 'processing',
@@ -94,15 +93,10 @@ async function startMerge(context, uploadId, totalChunks, originalFileName, orig
             createdAt: Date.now(),
             message: 'Starting merge process...'
         };
-
-        // 存储合并状态
-        const statusKey = `merge_status_${uploadId}`;
-        await db.put(statusKey, JSON.stringify(mergeStatus), {
-            expirationTtl: 3600 // 1小时过期
-        });
+        console.log(`Merge status: ${JSON.stringify(mergeStatus)}`);
 
         // 同步执行合并
-        const result = await handleChannelBasedMerge(context, uploadId, totalChunks, originalFileName, originalFileType, uploadChannel, statusKey);
+        const result = await handleChannelBasedMerge(context, uploadId, totalChunks, originalFileName, originalFileType, uploadChannel);
 
         if (result.success) {
             // 清理临时分块数据
@@ -136,9 +130,8 @@ async function startMerge(context, uploadId, totalChunks, originalFileName, orig
 }
 
 // 基于渠道的合并处理
-async function handleChannelBasedMerge(context, uploadId, totalChunks, originalFileName, originalFileType, uploadChannel, statusKey = null) {
-    const { request, env, url, waitUntil } = context;
-    const db = getDatabase(env);
+async function handleChannelBasedMerge(context, uploadId, totalChunks, originalFileName, originalFileType, uploadChannel) {
+    const { request, env, url } = context;
 
     try {
         // 获得上传IP
diff --git a/functions/upload/chunkUpload.js b/functions/upload/chunkUpload.js
index 521ff41..244eac5 100644
--- a/functions/upload/chunkUpload.js
+++ b/functions/upload/chunkUpload.js
@@ -997,8 +997,7 @@ export async function forceCleanupUpload(context, uploadId, totalChunks) {
         // 清理相关的键
         const keysToCleanup = [
             `upload_session_${uploadId}`,
-            `multipart_${uploadId}`,
-            `merge_status_${uploadId}`
+            `multipart_${uploadId}`
         ];
 
         keysToCleanup.forEach(key => {