From f2e1770533d183140b453a61c90aa9f829dea006 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Tue, 14 Apr 2026 15:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/vendor/volcengine.ts | 2 +- src/router.ts | 280 +++++++++--------- .../production/editImage/updateImageFlow.ts | 5 +- .../production/workbench/generateVideo.ts | 4 +- .../workbench/generateVideoPrompt.ts | 11 +- src/routes/production/workbench/getFileUrl.ts | 2 - .../workbench/updateVideoDuration.ts | 20 ++ .../production/workbench/updateVideoPrompt.ts | 2 - src/types/database.d.ts | 37 +-- 9 files changed, 175 insertions(+), 188 deletions(-) create mode 100644 src/routes/production/workbench/updateVideoDuration.ts diff --git a/data/vendor/volcengine.ts b/data/vendor/volcengine.ts index 7409f11..b3fc132 100644 --- a/data/vendor/volcengine.ts +++ b/data/vendor/volcengine.ts @@ -615,7 +615,7 @@ const videoRequest = async (config: VideoConfig, model: VideoModel): Promise { app.use("/api/agents/clearMemory", route1); @@ -238,73 +239,74 @@ export default async (app: Express) => { app.use("/api/production/workbench/getGenerateData", route81); app.use("/api/production/workbench/getVideoList", route82); app.use("/api/production/workbench/selectVideo", route83); - app.use("/api/production/workbench/updateVideoPrompt", route84); - app.use("/api/project/addDirectorManual", route85); - app.use("/api/project/addProject", route86); - app.use("/api/project/addVisualManual", route87); - app.use("/api/project/deleteDirectorManual", route88); - app.use("/api/project/deleteVisualManual", route89); - app.use("/api/project/delProject", route90); - app.use("/api/project/editDirectorlManual", route91); - app.use("/api/project/editProject", route92); - app.use("/api/project/editVisualManual", route93); - app.use("/api/project/getModelDetails", route94); - app.use("/api/project/getProject", route95); - app.use("/api/project/getVisualManual", route96); - app.use("/api/project/queryDirectorManual", route97); - app.use("/api/project/visualManual", route98); - app.use("/api/script/addScript", route99); - app.use("/api/script/batchAddScript", route100); - app.use("/api/script/delScript", route101); - app.use("/api/script/exportScript", route102); - app.use("/api/script/extractAssets", route103); - app.use("/api/script/getAiRegex", route104); - app.use("/api/script/getScrptApi", route105); - app.use("/api/script/pollScriptAssets", route106); - app.use("/api/script/updateScript", route107); - app.use("/api/scriptAgent/getPlanData", route108); - app.use("/api/scriptAgent/setPlanData", route109); - app.use("/api/scriptAgent/updateData", route110); - app.use("/api/setting/about/checkUpdate", route111); - app.use("/api/setting/about/downloadApp", route112); - app.use("/api/setting/agentDeploy/agentSetKey", route113); - app.use("/api/setting/agentDeploy/deployAgentModel", route114); - app.use("/api/setting/agentDeploy/getAgentDeploy", route115); - app.use("/api/setting/dbConfig/clearData", route116); - app.use("/api/setting/dbConfig/clearTable", route117); - app.use("/api/setting/dbConfig/dbInfo", route118); - app.use("/api/setting/dbConfig/exportData", route119); - app.use("/api/setting/dbConfig/importData", route120); - app.use("/api/setting/dev/getSwitchAiDevTool", route121); - app.use("/api/setting/dev/updateSwitchAiDevTool", route122); - app.use("/api/setting/fileManagement/openFolder", route123); - app.use("/api/setting/getTextModel", route124); - app.use("/api/setting/loginConfig/getUser", route125); - app.use("/api/setting/loginConfig/updateUserPwd", route126); - app.use("/api/setting/memoryConfig/delAllMemory", route127); - app.use("/api/setting/memoryConfig/getMemory", route128); - app.use("/api/setting/memoryConfig/sureMemory", route129); - app.use("/api/setting/modelMap/bindingPrompt", route130); - app.use("/api/setting/modelMap/getImageAndVideoModel", route131); - app.use("/api/setting/promptManage/getPrompt", route132); - app.use("/api/setting/promptManage/updatePrompt", route133); - app.use("/api/setting/skillManagement/getSkillContent", route134); - app.use("/api/setting/skillManagement/getSkillList", route135); - app.use("/api/setting/skillManagement/saveSkillContent", route136); - app.use("/api/setting/vendorConfig/addVendor", route137); - app.use("/api/setting/vendorConfig/addVendorModel", route138); - app.use("/api/setting/vendorConfig/deleteVendor", route139); - app.use("/api/setting/vendorConfig/delVendorModel", route140); - app.use("/api/setting/vendorConfig/enableVendor", route141); - app.use("/api/setting/vendorConfig/getCodeByLink", route142); - app.use("/api/setting/vendorConfig/getVendorList", route143); - app.use("/api/setting/vendorConfig/modelTest", route144); - app.use("/api/setting/vendorConfig/updateCode", route145); - app.use("/api/setting/vendorConfig/updateVendorInputs", route146); - app.use("/api/setting/vendorConfig/upVendorModel", route147); - app.use("/api/task/getProject", route148); - app.use("/api/task/getTaskApi", route149); - app.use("/api/task/getTaskCategories", route150); - app.use("/api/task/taskDetails", route151); - app.use("/api/test/test", route152); + app.use("/api/production/workbench/updateVideoDuration", route84); + app.use("/api/production/workbench/updateVideoPrompt", route85); + app.use("/api/project/addDirectorManual", route86); + app.use("/api/project/addProject", route87); + app.use("/api/project/addVisualManual", route88); + app.use("/api/project/deleteDirectorManual", route89); + app.use("/api/project/deleteVisualManual", route90); + app.use("/api/project/delProject", route91); + app.use("/api/project/editDirectorlManual", route92); + app.use("/api/project/editProject", route93); + app.use("/api/project/editVisualManual", route94); + app.use("/api/project/getModelDetails", route95); + app.use("/api/project/getProject", route96); + app.use("/api/project/getVisualManual", route97); + app.use("/api/project/queryDirectorManual", route98); + app.use("/api/project/visualManual", route99); + app.use("/api/script/addScript", route100); + app.use("/api/script/batchAddScript", route101); + app.use("/api/script/delScript", route102); + app.use("/api/script/exportScript", route103); + app.use("/api/script/extractAssets", route104); + app.use("/api/script/getAiRegex", route105); + app.use("/api/script/getScrptApi", route106); + app.use("/api/script/pollScriptAssets", route107); + app.use("/api/script/updateScript", route108); + app.use("/api/scriptAgent/getPlanData", route109); + app.use("/api/scriptAgent/setPlanData", route110); + app.use("/api/scriptAgent/updateData", route111); + app.use("/api/setting/about/checkUpdate", route112); + app.use("/api/setting/about/downloadApp", route113); + app.use("/api/setting/agentDeploy/agentSetKey", route114); + app.use("/api/setting/agentDeploy/deployAgentModel", route115); + app.use("/api/setting/agentDeploy/getAgentDeploy", route116); + app.use("/api/setting/dbConfig/clearData", route117); + app.use("/api/setting/dbConfig/clearTable", route118); + app.use("/api/setting/dbConfig/dbInfo", route119); + app.use("/api/setting/dbConfig/exportData", route120); + app.use("/api/setting/dbConfig/importData", route121); + app.use("/api/setting/dev/getSwitchAiDevTool", route122); + app.use("/api/setting/dev/updateSwitchAiDevTool", route123); + app.use("/api/setting/fileManagement/openFolder", route124); + app.use("/api/setting/getTextModel", route125); + app.use("/api/setting/loginConfig/getUser", route126); + app.use("/api/setting/loginConfig/updateUserPwd", route127); + app.use("/api/setting/memoryConfig/delAllMemory", route128); + app.use("/api/setting/memoryConfig/getMemory", route129); + app.use("/api/setting/memoryConfig/sureMemory", route130); + app.use("/api/setting/modelMap/bindingPrompt", route131); + app.use("/api/setting/modelMap/getImageAndVideoModel", route132); + app.use("/api/setting/promptManage/getPrompt", route133); + app.use("/api/setting/promptManage/updatePrompt", route134); + app.use("/api/setting/skillManagement/getSkillContent", route135); + app.use("/api/setting/skillManagement/getSkillList", route136); + app.use("/api/setting/skillManagement/saveSkillContent", route137); + app.use("/api/setting/vendorConfig/addVendor", route138); + app.use("/api/setting/vendorConfig/addVendorModel", route139); + app.use("/api/setting/vendorConfig/deleteVendor", route140); + app.use("/api/setting/vendorConfig/delVendorModel", route141); + app.use("/api/setting/vendorConfig/enableVendor", route142); + app.use("/api/setting/vendorConfig/getCodeByLink", route143); + app.use("/api/setting/vendorConfig/getVendorList", route144); + app.use("/api/setting/vendorConfig/modelTest", route145); + app.use("/api/setting/vendorConfig/updateCode", route146); + app.use("/api/setting/vendorConfig/updateVendorInputs", route147); + app.use("/api/setting/vendorConfig/upVendorModel", route148); + app.use("/api/task/getProject", route149); + app.use("/api/task/getTaskApi", route150); + app.use("/api/task/getTaskCategories", route151); + app.use("/api/task/taskDetails", route152); + app.use("/api/test/test", route153); } diff --git a/src/routes/production/editImage/updateImageFlow.ts b/src/routes/production/editImage/updateImageFlow.ts index 1c4bbd9..b9e9239 100644 --- a/src/routes/production/editImage/updateImageFlow.ts +++ b/src/routes/production/editImage/updateImageFlow.ts @@ -18,9 +18,12 @@ export default router.post( if (node.type == "upload") { node.data.image = node.data.image ? u.replaceUrl(node.data.image) : ""; } - + if (node.type == "generated") { node.data.generatedImage = node.data.generatedImage ? u.replaceUrl(node.data.generatedImage) : ""; + node.data.references.forEach((item: { image: string }) => { + item.image = item.image ? u.replaceUrl(item.image) : ""; + }); } }); diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index b741a3d..a5e388d 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -43,7 +43,7 @@ export default router.post( } else if (typeof mode === "string" && mode.startsWith('["') && mode.endsWith('"]')) { try { modeData = JSON.parse(mode); - } catch (e) {} + } catch (e) { } } //获取生成视频比例 const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first(); @@ -117,7 +117,7 @@ export default router.post( .where("id", videoId) .update({ state: "生成失败", - errorReason: error instanceof Error ? error.message : "未知错误", + errorReason: u.error(error).message, }); } })(); diff --git a/src/routes/production/workbench/generateVideoPrompt.ts b/src/routes/production/workbench/generateVideoPrompt.ts index 8a0a75a..51b09f1 100644 --- a/src/routes/production/workbench/generateVideoPrompt.ts +++ b/src/routes/production/workbench/generateVideoPrompt.ts @@ -92,17 +92,16 @@ export default router.post( const content = ` **模型名称**：${modelData}, **资产信息**（角色、场景、道具):${assets - .filter((i) => i.filePath) - .map((i) => `[${i.id},${i.type},${i.name}]`) - .join("，")}, + .filter((i) => i.filePath) + .map((i) => `[${i.id},${i.type},${i.name}]`) + .join("，")}, **分镜信息**：${storyboard.map( - (i) => ` ``, - )}, + )}, `; - console.log("%c Line:93 🥥 content", "background:#e41a6a", content); try { const { text } = await u.Ai.Text("universalAi").invoke({ diff --git a/src/routes/production/workbench/getFileUrl.ts b/src/routes/production/workbench/getFileUrl.ts index 4119c1f..a3bca4e 100644 --- a/src/routes/production/workbench/getFileUrl.ts +++ b/src/routes/production/workbench/getFileUrl.ts @@ -28,8 +28,6 @@ export default router.post( const assetsPaths = await u.db("o_assets").leftJoin("o_image", "o_image.id", "o_assets.imageId").whereIn("o_assets.id", assetsIds).select("o_assets.id", "o_image.filePath"); totalFilePaths.push(...assetsPaths.map(i => ({ id: i.id, filePath: i.filePath, sources: "assets" }))) } - console.log("%c Line:30 🍇 totalFilePaths", "background:#93c0a4", totalFilePaths); - await Promise.all( totalFilePaths.map(async (item: { id: string, filePath: string, sources: string }) => { diff --git a/src/routes/production/workbench/updateVideoDuration.ts b/src/routes/production/workbench/updateVideoDuration.ts new file mode 100644 index 0000000..f702f94 --- /dev/null +++ b/src/routes/production/workbench/updateVideoDuration.ts @@ -0,0 +1,20 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); +export default router.post( + "/", + validateFields({ + id: z.number(), + duration: z.number().optional(), + }), + async (req, res) => { + const { id, duration } = req.body; + await u.db("o_videoTrack").where("id", id).update({ + duration, + }); + res.status(200).send(success("更新成功")); + }, +); diff --git a/src/routes/production/workbench/updateVideoPrompt.ts b/src/routes/production/workbench/updateVideoPrompt.ts index 5124875..78becb9 100644 --- a/src/routes/production/workbench/updateVideoPrompt.ts +++ b/src/routes/production/workbench/updateVideoPrompt.ts @@ -9,13 +9,11 @@ export default router.post( validateFields({ id: z.number(), prompt: z.string().optional(), - duration: z.number().optional(), }), async (req, res) => { const { id, prompt, duration } = req.body; await u.db("o_videoTrack").where("id", id).update({ prompt, - duration, }); res.status(200).send(success("更新成功")); }, diff --git a/src/types/database.d.ts b/src/types/database.d.ts index ddb8902..74ef407 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,37 +1,6 @@ -// @db-hash 61fa5dc78f789e88edc7eeb51f55a1b7 +// @db-hash 88c167ba73e2771e7b043419ca5089dd //该文件由脚本自动生成，请勿手动修改 -export interface _o_project_old_20260404 { - 'artStyle'?: string | null; - 'createTime'?: number | null; - 'directorManual'?: string | null; - 'id'?: number | null; - 'imageModel'?: string | null; - 'imageQuality'?: string | null; - 'intro'?: string | null; - 'mode'?: string | null; - 'name'?: string | null; - 'projectType'?: string | null; - 'type'?: string | null; - 'userId'?: number | null; - 'videoModel'?: string | null; - 'videoRatio'?: string | null; -} -export interface _o_prompt_old_20260406 { - 'data'?: string | null; - 'id'?: number; - 'name'?: string | null; - 'type'?: string | null; - 'useData'?: string | null; -} -export interface _o_prompt_old_20260406_1 { - 'data'?: string | null; - 'id'?: number; - 'name'?: string | null; - 'TEXT'?: any | null; - 'type'?: string | null; - 'useData'?: string | null; -} export interface memories { 'content': string; 'createTime': number; @@ -241,6 +210,7 @@ export interface o_user { 'password'?: string | null; } export interface o_vendorConfig { + 'code'?: string | null; 'enable'?: number | null; 'id'?: string; 'inputValues'?: string | null; @@ -269,9 +239,6 @@ export interface o_videoTrack { } export interface DB { - "_o_project_old_20260404": _o_project_old_20260404; - "_o_prompt_old_20260406": _o_prompt_old_20260406; - "_o_prompt_old_20260406_1": _o_prompt_old_20260406_1; "memories": memories; "o_agentDeploy": o_agentDeploy; "o_agentWorkData": o_agentWorkData;