From 51a0387b09b49c231445cc0102acd9c006735be7 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Mon, 13 Apr 2026 18:36:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 276 +++++++++--------- .../assets/batchGenerateAssetsImage.ts | 2 +- .../production/editImage/getImageFlow.ts | 5 + .../production/editImage/saveImageFlow.ts | 4 + src/routes/production/workbench/getFileUrl.ts | 24 ++ src/types/database.d.ts | 4 +- 6 files changed, 175 insertions(+), 140 deletions(-) create mode 100644 src/routes/production/workbench/getFileUrl.ts diff --git a/src/router.ts b/src/router.ts index 04a0e44..ffc1fa0 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 0eb42cb2928b13229e60a26b83f977a9 +// @routes-hash 1d8352259c4b1c7d0fa4accd1acfedf0 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -80,74 +80,75 @@ import route76 from "./routes/production/workbench/deleteTrack"; import route77 from "./routes/production/workbench/delVideo"; import route78 from "./routes/production/workbench/generateVideo"; import route79 from "./routes/production/workbench/generateVideoPrompt"; -import route80 from "./routes/production/workbench/getGenerateData"; -import route81 from "./routes/production/workbench/getVideoList"; -import route82 from "./routes/production/workbench/selectVideo"; -import route83 from "./routes/production/workbench/updateVideoPrompt"; -import route84 from "./routes/project/addDirectorManual"; -import route85 from "./routes/project/addProject"; -import route86 from "./routes/project/addVisualManual"; -import route87 from "./routes/project/deleteDirectorManual"; -import route88 from "./routes/project/deleteVisualManual"; -import route89 from "./routes/project/delProject"; -import route90 from "./routes/project/editDirectorlManual"; -import route91 from "./routes/project/editProject"; -import route92 from "./routes/project/editVisualManual"; -import route93 from "./routes/project/getModelDetails"; -import route94 from "./routes/project/getProject"; -import route95 from "./routes/project/getVisualManual"; -import route96 from "./routes/project/queryDirectorManual"; -import route97 from "./routes/project/visualManual"; -import route98 from "./routes/script/addScript"; -import route99 from "./routes/script/batchAddScript"; -import route100 from "./routes/script/delScript"; -import route101 from "./routes/script/exportScript"; -import route102 from "./routes/script/extractAssets"; -import route103 from "./routes/script/getAiRegex"; -import route104 from "./routes/script/getScrptApi"; -import route105 from "./routes/script/pollScriptAssets"; -import route106 from "./routes/script/updateScript"; -import route107 from "./routes/scriptAgent/getPlanData"; -import route108 from "./routes/scriptAgent/setPlanData"; -import route109 from "./routes/scriptAgent/updateData"; -import route110 from "./routes/setting/about/checkUpdate"; -import route111 from "./routes/setting/about/downloadApp"; -import route112 from "./routes/setting/agentDeploy/agentSetKey"; -import route113 from "./routes/setting/agentDeploy/deployAgentModel"; -import route114 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route115 from "./routes/setting/dbConfig/clearData"; -import route116 from "./routes/setting/dev/getSwitchAiDevTool"; -import route117 from "./routes/setting/dev/updateSwitchAiDevTool"; -import route118 from "./routes/setting/fileManagement/openFolder"; -import route119 from "./routes/setting/getTextModel"; -import route120 from "./routes/setting/loginConfig/getUser"; -import route121 from "./routes/setting/loginConfig/updateUserPwd"; -import route122 from "./routes/setting/memoryConfig/delAllMemory"; -import route123 from "./routes/setting/memoryConfig/getMemory"; -import route124 from "./routes/setting/memoryConfig/sureMemory"; -import route125 from "./routes/setting/modelMap/bindingPrompt"; -import route126 from "./routes/setting/modelMap/getImageAndVideoModel"; -import route127 from "./routes/setting/promptManage/getPrompt"; -import route128 from "./routes/setting/promptManage/updatePrompt"; -import route129 from "./routes/setting/skillManagement/getSkillContent"; -import route130 from "./routes/setting/skillManagement/getSkillList"; -import route131 from "./routes/setting/skillManagement/saveSkillContent"; -import route132 from "./routes/setting/vendorConfig/addVendor"; -import route133 from "./routes/setting/vendorConfig/addVendorModel"; -import route134 from "./routes/setting/vendorConfig/deleteVendor"; -import route135 from "./routes/setting/vendorConfig/delVendorModel"; -import route136 from "./routes/setting/vendorConfig/enableVendor"; -import route137 from "./routes/setting/vendorConfig/getCodeByLink"; -import route138 from "./routes/setting/vendorConfig/getVendorList"; -import route139 from "./routes/setting/vendorConfig/modelTest"; -import route140 from "./routes/setting/vendorConfig/updateCode"; -import route141 from "./routes/setting/vendorConfig/updateVendorInputs"; -import route142 from "./routes/setting/vendorConfig/upVendorModel"; -import route143 from "./routes/task/getProject"; -import route144 from "./routes/task/getTaskApi"; -import route145 from "./routes/task/getTaskCategories"; -import route146 from "./routes/task/taskDetails"; -import route147 from "./routes/test/test"; +import route80 from "./routes/production/workbench/getFileUrl"; +import route81 from "./routes/production/workbench/getGenerateData"; +import route82 from "./routes/production/workbench/getVideoList"; +import route83 from "./routes/production/workbench/selectVideo"; +import route84 from "./routes/production/workbench/updateVideoPrompt"; +import route85 from "./routes/project/addDirectorManual"; +import route86 from "./routes/project/addProject"; +import route87 from "./routes/project/addVisualManual"; +import route88 from "./routes/project/deleteDirectorManual"; +import route89 from "./routes/project/deleteVisualManual"; +import route90 from "./routes/project/delProject"; +import route91 from "./routes/project/editDirectorlManual"; +import route92 from "./routes/project/editProject"; +import route93 from "./routes/project/editVisualManual"; +import route94 from "./routes/project/getModelDetails"; +import route95 from "./routes/project/getProject"; +import route96 from "./routes/project/getVisualManual"; +import route97 from "./routes/project/queryDirectorManual"; +import route98 from "./routes/project/visualManual"; +import route99 from "./routes/script/addScript"; +import route100 from "./routes/script/batchAddScript"; +import route101 from "./routes/script/delScript"; +import route102 from "./routes/script/exportScript"; +import route103 from "./routes/script/extractAssets"; +import route104 from "./routes/script/getAiRegex"; +import route105 from "./routes/script/getScrptApi"; +import route106 from "./routes/script/pollScriptAssets"; +import route107 from "./routes/script/updateScript"; +import route108 from "./routes/scriptAgent/getPlanData"; +import route109 from "./routes/scriptAgent/setPlanData"; +import route110 from "./routes/scriptAgent/updateData"; +import route111 from "./routes/setting/about/checkUpdate"; +import route112 from "./routes/setting/about/downloadApp"; +import route113 from "./routes/setting/agentDeploy/agentSetKey"; +import route114 from "./routes/setting/agentDeploy/deployAgentModel"; +import route115 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route116 from "./routes/setting/dbConfig/clearData"; +import route117 from "./routes/setting/dev/getSwitchAiDevTool"; +import route118 from "./routes/setting/dev/updateSwitchAiDevTool"; +import route119 from "./routes/setting/fileManagement/openFolder"; +import route120 from "./routes/setting/getTextModel"; +import route121 from "./routes/setting/loginConfig/getUser"; +import route122 from "./routes/setting/loginConfig/updateUserPwd"; +import route123 from "./routes/setting/memoryConfig/delAllMemory"; +import route124 from "./routes/setting/memoryConfig/getMemory"; +import route125 from "./routes/setting/memoryConfig/sureMemory"; +import route126 from "./routes/setting/modelMap/bindingPrompt"; +import route127 from "./routes/setting/modelMap/getImageAndVideoModel"; +import route128 from "./routes/setting/promptManage/getPrompt"; +import route129 from "./routes/setting/promptManage/updatePrompt"; +import route130 from "./routes/setting/skillManagement/getSkillContent"; +import route131 from "./routes/setting/skillManagement/getSkillList"; +import route132 from "./routes/setting/skillManagement/saveSkillContent"; +import route133 from "./routes/setting/vendorConfig/addVendor"; +import route134 from "./routes/setting/vendorConfig/addVendorModel"; +import route135 from "./routes/setting/vendorConfig/deleteVendor"; +import route136 from "./routes/setting/vendorConfig/delVendorModel"; +import route137 from "./routes/setting/vendorConfig/enableVendor"; +import route138 from "./routes/setting/vendorConfig/getCodeByLink"; +import route139 from "./routes/setting/vendorConfig/getVendorList"; +import route140 from "./routes/setting/vendorConfig/modelTest"; +import route141 from "./routes/setting/vendorConfig/updateCode"; +import route142 from "./routes/setting/vendorConfig/updateVendorInputs"; +import route143 from "./routes/setting/vendorConfig/upVendorModel"; +import route144 from "./routes/task/getProject"; +import route145 from "./routes/task/getTaskApi"; +import route146 from "./routes/task/getTaskCategories"; +import route147 from "./routes/task/taskDetails"; +import route148 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -229,72 +230,73 @@ export default async (app: Express) => { app.use("/api/production/workbench/delVideo", route77); app.use("/api/production/workbench/generateVideo", route78); app.use("/api/production/workbench/generateVideoPrompt", route79); - app.use("/api/production/workbench/getGenerateData", route80); - app.use("/api/production/workbench/getVideoList", route81); - app.use("/api/production/workbench/selectVideo", route82); - app.use("/api/production/workbench/updateVideoPrompt", route83); - app.use("/api/project/addDirectorManual", route84); - app.use("/api/project/addProject", route85); - app.use("/api/project/addVisualManual", route86); - app.use("/api/project/deleteDirectorManual", route87); - app.use("/api/project/deleteVisualManual", route88); - app.use("/api/project/delProject", route89); - app.use("/api/project/editDirectorlManual", route90); - app.use("/api/project/editProject", route91); - app.use("/api/project/editVisualManual", route92); - app.use("/api/project/getModelDetails", route93); - app.use("/api/project/getProject", route94); - app.use("/api/project/getVisualManual", route95); - app.use("/api/project/queryDirectorManual", route96); - app.use("/api/project/visualManual", route97); - app.use("/api/script/addScript", route98); - app.use("/api/script/batchAddScript", route99); - app.use("/api/script/delScript", route100); - app.use("/api/script/exportScript", route101); - app.use("/api/script/extractAssets", route102); - app.use("/api/script/getAiRegex", route103); - app.use("/api/script/getScrptApi", route104); - app.use("/api/script/pollScriptAssets", route105); - app.use("/api/script/updateScript", route106); - app.use("/api/scriptAgent/getPlanData", route107); - app.use("/api/scriptAgent/setPlanData", route108); - app.use("/api/scriptAgent/updateData", route109); - app.use("/api/setting/about/checkUpdate", route110); - app.use("/api/setting/about/downloadApp", route111); - app.use("/api/setting/agentDeploy/agentSetKey", route112); - app.use("/api/setting/agentDeploy/deployAgentModel", route113); - app.use("/api/setting/agentDeploy/getAgentDeploy", route114); - app.use("/api/setting/dbConfig/clearData", route115); - app.use("/api/setting/dev/getSwitchAiDevTool", route116); - app.use("/api/setting/dev/updateSwitchAiDevTool", route117); - app.use("/api/setting/fileManagement/openFolder", route118); - app.use("/api/setting/getTextModel", route119); - app.use("/api/setting/loginConfig/getUser", route120); - app.use("/api/setting/loginConfig/updateUserPwd", route121); - app.use("/api/setting/memoryConfig/delAllMemory", route122); - app.use("/api/setting/memoryConfig/getMemory", route123); - app.use("/api/setting/memoryConfig/sureMemory", route124); - app.use("/api/setting/modelMap/bindingPrompt", route125); - app.use("/api/setting/modelMap/getImageAndVideoModel", route126); - app.use("/api/setting/promptManage/getPrompt", route127); - app.use("/api/setting/promptManage/updatePrompt", route128); - app.use("/api/setting/skillManagement/getSkillContent", route129); - app.use("/api/setting/skillManagement/getSkillList", route130); - app.use("/api/setting/skillManagement/saveSkillContent", route131); - app.use("/api/setting/vendorConfig/addVendor", route132); - app.use("/api/setting/vendorConfig/addVendorModel", route133); - app.use("/api/setting/vendorConfig/deleteVendor", route134); - app.use("/api/setting/vendorConfig/delVendorModel", route135); - app.use("/api/setting/vendorConfig/enableVendor", route136); - app.use("/api/setting/vendorConfig/getCodeByLink", route137); - app.use("/api/setting/vendorConfig/getVendorList", route138); - app.use("/api/setting/vendorConfig/modelTest", route139); - app.use("/api/setting/vendorConfig/updateCode", route140); - app.use("/api/setting/vendorConfig/updateVendorInputs", route141); - app.use("/api/setting/vendorConfig/upVendorModel", route142); - app.use("/api/task/getProject", route143); - app.use("/api/task/getTaskApi", route144); - app.use("/api/task/getTaskCategories", route145); - app.use("/api/task/taskDetails", route146); - app.use("/api/test/test", route147); + app.use("/api/production/workbench/getFileUrl", route80); + 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/dev/getSwitchAiDevTool", route117); + app.use("/api/setting/dev/updateSwitchAiDevTool", route118); + app.use("/api/setting/fileManagement/openFolder", route119); + app.use("/api/setting/getTextModel", route120); + app.use("/api/setting/loginConfig/getUser", route121); + app.use("/api/setting/loginConfig/updateUserPwd", route122); + app.use("/api/setting/memoryConfig/delAllMemory", route123); + app.use("/api/setting/memoryConfig/getMemory", route124); + app.use("/api/setting/memoryConfig/sureMemory", route125); + app.use("/api/setting/modelMap/bindingPrompt", route126); + app.use("/api/setting/modelMap/getImageAndVideoModel", route127); + app.use("/api/setting/promptManage/getPrompt", route128); + app.use("/api/setting/promptManage/updatePrompt", route129); + app.use("/api/setting/skillManagement/getSkillContent", route130); + app.use("/api/setting/skillManagement/getSkillList", route131); + app.use("/api/setting/skillManagement/saveSkillContent", route132); + app.use("/api/setting/vendorConfig/addVendor", route133); + app.use("/api/setting/vendorConfig/addVendorModel", route134); + app.use("/api/setting/vendorConfig/deleteVendor", route135); + app.use("/api/setting/vendorConfig/delVendorModel", route136); + app.use("/api/setting/vendorConfig/enableVendor", route137); + app.use("/api/setting/vendorConfig/getCodeByLink", route138); + app.use("/api/setting/vendorConfig/getVendorList", route139); + app.use("/api/setting/vendorConfig/modelTest", route140); + app.use("/api/setting/vendorConfig/updateCode", route141); + app.use("/api/setting/vendorConfig/updateVendorInputs", route142); + app.use("/api/setting/vendorConfig/upVendorModel", route143); + app.use("/api/task/getProject", route144); + app.use("/api/task/getTaskApi", route145); + app.use("/api/task/getTaskCategories", route146); + app.use("/api/task/taskDetails", route147); + app.use("/api/test/test", route148); } diff --git a/src/routes/production/assets/batchGenerateAssetsImage.ts b/src/routes/production/assets/batchGenerateAssetsImage.ts index 6728dab..1b391e5 100644 --- a/src/routes/production/assets/batchGenerateAssetsImage.ts +++ b/src/routes/production/assets/batchGenerateAssetsImage.ts @@ -82,6 +82,7 @@ export default router.post( }, ], }); + await u.db("o_assets").where("id", item.id).update({ prompt: text }); const imageBase64 = imageUrlRecord[item.assetsId!] ? await u.oss.getImageBase64(imageUrlRecord[item.assetsId!]) : null; try { @@ -104,7 +105,6 @@ export default router.post( ); const savePath = `/${projectId}/assets/${scriptId}/${item.type}/${u.uuid()}.jpg`; await imageCls.save(savePath); - await u.db("o_assets").where("id", item.id).update({ prompt: text }); await u.db("o_image").where({ id: imageId }).update({ state: "已完成", filePath: savePath }); return { id: item.id!, diff --git a/src/routes/production/editImage/getImageFlow.ts b/src/routes/production/editImage/getImageFlow.ts index 65dee77..2058a33 100644 --- a/src/routes/production/editImage/getImageFlow.ts +++ b/src/routes/production/editImage/getImageFlow.ts @@ -21,6 +21,11 @@ export default router.post( node.data.image = node.data.image ? await u.oss.getFileUrl(node.data.image) : ""; } else if (node.type === "generated") { node.data.generatedImage = node.data.generatedImage ? await u.oss.getFileUrl(node.data.generatedImage) : ""; + node.data.references = await node.data.references.map(async (item: { image: string }) => { + return { + image: await u.oss.getFileUrl(item.image) + } + }); } }), ); diff --git a/src/routes/production/editImage/saveImageFlow.ts b/src/routes/production/editImage/saveImageFlow.ts index b3c2380..0d3ff59 100644 --- a/src/routes/production/editImage/saveImageFlow.ts +++ b/src/routes/production/editImage/saveImageFlow.ts @@ -14,12 +14,16 @@ export default router.post( async (req, res) => { const { edges, nodes } = req.body; nodes.forEach((node: any) => { + console.log("%c Line:17 🌮 node", "background:#465975", node); 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) : ""; + }); } }); const [insertFlowId] = await u.db("o_imageFlow").insert({ diff --git a/src/routes/production/workbench/getFileUrl.ts b/src/routes/production/workbench/getFileUrl.ts new file mode 100644 index 0000000..495e26b --- /dev/null +++ b/src/routes/production/workbench/getFileUrl.ts @@ -0,0 +1,24 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +import { id } from "zod/locales"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + paths: z.array(z.string()) + }), + async (req, res) => { + const { paths } = req.body; + const result: Record = {}; + await Promise.all( + paths.map(async (path: string) => { + result[path] = await u.oss.getFileUrl(path.replace(/^\/oss/, '')); + })) + + res.status(200).send(success({ data: result })); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index eb4d216..74ef407 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash 5364c2db0bf42b520761b813ce040489 +// @db-hash 88c167ba73e2771e7b043419ca5089dd //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -23,7 +23,6 @@ export interface o_agentDeploy { 'modelName'?: string | null; 'name'?: string | null; 'temperature'?: number | null; - 'topP'?: number | null; 'type'?: string | null; 'vendorId'?: string | null; } @@ -211,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; From 435bd17bca3325beb3302d12597500e3b5993f1b Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Mon, 13 Apr 2026 19:55:50 +0800 Subject: [PATCH 2/2] no message --- data/vendor/toonflow.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/vendor/toonflow.ts b/data/vendor/toonflow.ts index a002957..3c5e1f7 100644 --- a/data/vendor/toonflow.ts +++ b/data/vendor/toonflow.ts @@ -327,7 +327,7 @@ const videoRequest = async (config: VideoConfig, model: VideoModel): Promise r.type === "image").map((r) => r.base64); const videoRefs = (config.referenceList ?? []).filter((r) => r.type === "video").map((r) => r.base64); const audioRefs = (config.referenceList ?? []).filter((r) => r.type === "audio").map((r) => r.base64);