From 92c0bc7e52ff0c12d4817eed4a5f790f4c4c5ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Fri, 20 Mar 2026 22:46:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 112 +++++++++--------- src/routes/modelSelect/getModelList.ts | 62 +++++----- .../production/workbench/generateVideo.ts | 70 +++++++++++ .../setting/vendorConfig/updateVendor.ts | 26 +--- src/utils/ai.ts | 19 ++- 5 files changed, 183 insertions(+), 106 deletions(-) create mode 100644 src/routes/production/workbench/generateVideo.ts diff --git a/src/router.ts b/src/router.ts index bddd2d8..ebc0e67 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 45e23a536a13265ff62fe92b1cb71fe3 +// @routes-hash ee45dd26b9149e6eabf834c1fb5cfbb6 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -36,33 +36,34 @@ import route32 from "./routes/novel/updateNovel"; import route33 from "./routes/other/deleteAllData"; import route34 from "./routes/other/getCaptcha"; import route35 from "./routes/production/getProductionData"; -import route36 from "./routes/production/workbench/getVideoModelDetail"; -import route37 from "./routes/project/addProject"; -import route38 from "./routes/project/delProject"; -import route39 from "./routes/project/editProject"; -import route40 from "./routes/project/getProject"; -import route41 from "./routes/script/addScript"; -import route42 from "./routes/script/delScript"; -import route43 from "./routes/script/getScrptApi"; -import route44 from "./routes/script/updateScript"; -import route45 from "./routes/setting/agentDeploy/deployAgentModel"; -import route46 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route47 from "./routes/setting/agentDeploy/updateKey"; -import route48 from "./routes/setting/dbConfig/clearData"; -import route49 from "./routes/setting/getTextModel"; -import route50 from "./routes/setting/loginConfig/getUser"; -import route51 from "./routes/setting/loginConfig/updateUserPwd"; -import route52 from "./routes/setting/memoryConfig/getMemory"; -import route53 from "./routes/setting/memoryConfig/sureMemory"; -import route54 from "./routes/setting/vendorConfig/addVendor"; -import route55 from "./routes/setting/vendorConfig/deleteVendor"; -import route56 from "./routes/setting/vendorConfig/getVendorList"; -import route57 from "./routes/setting/vendorConfig/modelTest"; -import route58 from "./routes/setting/vendorConfig/updateVendor"; -import route59 from "./routes/task/getMyTaskApi"; -import route60 from "./routes/task/getTaskCategories"; -import route61 from "./routes/task/taskDetails"; -import route62 from "./routes/test/test"; +import route36 from "./routes/production/workbench/generateVideo"; +import route37 from "./routes/production/workbench/getVideoModelDetail"; +import route38 from "./routes/project/addProject"; +import route39 from "./routes/project/delProject"; +import route40 from "./routes/project/editProject"; +import route41 from "./routes/project/getProject"; +import route42 from "./routes/script/addScript"; +import route43 from "./routes/script/delScript"; +import route44 from "./routes/script/getScrptApi"; +import route45 from "./routes/script/updateScript"; +import route46 from "./routes/setting/agentDeploy/deployAgentModel"; +import route47 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route48 from "./routes/setting/agentDeploy/updateKey"; +import route49 from "./routes/setting/dbConfig/clearData"; +import route50 from "./routes/setting/getTextModel"; +import route51 from "./routes/setting/loginConfig/getUser"; +import route52 from "./routes/setting/loginConfig/updateUserPwd"; +import route53 from "./routes/setting/memoryConfig/getMemory"; +import route54 from "./routes/setting/memoryConfig/sureMemory"; +import route55 from "./routes/setting/vendorConfig/addVendor"; +import route56 from "./routes/setting/vendorConfig/deleteVendor"; +import route57 from "./routes/setting/vendorConfig/getVendorList"; +import route58 from "./routes/setting/vendorConfig/modelTest"; +import route59 from "./routes/setting/vendorConfig/updateVendor"; +import route60 from "./routes/task/getMyTaskApi"; +import route61 from "./routes/task/getTaskCategories"; +import route62 from "./routes/task/taskDetails"; +import route63 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -100,31 +101,32 @@ export default async (app: Express) => { app.use("/api/other/deleteAllData", route33); app.use("/api/other/getCaptcha", route34); app.use("/api/production/getProductionData", route35); - app.use("/api/production/workbench/getVideoModelDetail", route36); - app.use("/api/project/addProject", route37); - app.use("/api/project/delProject", route38); - app.use("/api/project/editProject", route39); - app.use("/api/project/getProject", route40); - app.use("/api/script/addScript", route41); - app.use("/api/script/delScript", route42); - app.use("/api/script/getScrptApi", route43); - app.use("/api/script/updateScript", route44); - app.use("/api/setting/agentDeploy/deployAgentModel", route45); - app.use("/api/setting/agentDeploy/getAgentDeploy", route46); - app.use("/api/setting/agentDeploy/updateKey", route47); - app.use("/api/setting/dbConfig/clearData", route48); - app.use("/api/setting/getTextModel", route49); - app.use("/api/setting/loginConfig/getUser", route50); - app.use("/api/setting/loginConfig/updateUserPwd", route51); - app.use("/api/setting/memoryConfig/getMemory", route52); - app.use("/api/setting/memoryConfig/sureMemory", route53); - app.use("/api/setting/vendorConfig/addVendor", route54); - app.use("/api/setting/vendorConfig/deleteVendor", route55); - app.use("/api/setting/vendorConfig/getVendorList", route56); - app.use("/api/setting/vendorConfig/modelTest", route57); - app.use("/api/setting/vendorConfig/updateVendor", route58); - app.use("/api/task/getMyTaskApi", route59); - app.use("/api/task/getTaskCategories", route60); - app.use("/api/task/taskDetails", route61); - app.use("/api/test/test", route62); + app.use("/api/production/workbench/generateVideo", route36); + app.use("/api/production/workbench/getVideoModelDetail", route37); + app.use("/api/project/addProject", route38); + app.use("/api/project/delProject", route39); + app.use("/api/project/editProject", route40); + app.use("/api/project/getProject", route41); + app.use("/api/script/addScript", route42); + app.use("/api/script/delScript", route43); + app.use("/api/script/getScrptApi", route44); + app.use("/api/script/updateScript", route45); + app.use("/api/setting/agentDeploy/deployAgentModel", route46); + app.use("/api/setting/agentDeploy/getAgentDeploy", route47); + app.use("/api/setting/agentDeploy/updateKey", route48); + app.use("/api/setting/dbConfig/clearData", route49); + app.use("/api/setting/getTextModel", route50); + app.use("/api/setting/loginConfig/getUser", route51); + app.use("/api/setting/loginConfig/updateUserPwd", route52); + app.use("/api/setting/memoryConfig/getMemory", route53); + app.use("/api/setting/memoryConfig/sureMemory", route54); + app.use("/api/setting/vendorConfig/addVendor", route55); + app.use("/api/setting/vendorConfig/deleteVendor", route56); + app.use("/api/setting/vendorConfig/getVendorList", route57); + app.use("/api/setting/vendorConfig/modelTest", route58); + app.use("/api/setting/vendorConfig/updateVendor", route59); + app.use("/api/task/getMyTaskApi", route60); + app.use("/api/task/getTaskCategories", route61); + app.use("/api/task/taskDetails", route62); + app.use("/api/test/test", route63); } diff --git a/src/routes/modelSelect/getModelList.ts b/src/routes/modelSelect/getModelList.ts index 4e022ef..5e4fa8e 100644 --- a/src/routes/modelSelect/getModelList.ts +++ b/src/routes/modelSelect/getModelList.ts @@ -6,34 +6,38 @@ import { validateFields } from "@/middleware/middleware"; const router = express.Router(); export default router.post( - "/", - validateFields({ - type: z.enum(["text", "image", "video", "all"]), - }), - async (req, res) => { - const { type } = req.body; - const data = await u.db("o_vendorConfig").select("id", "models", "name").first(); - if (!data) { - return res.status(404).send({ error: "模型未找到" }); - } - const models = JSON.parse(data.models!); - if (type === "all") { - const allData = models.filter((item: { type: string }) => item.type !== "video").map((item: { name: string; modelName: string; type: string }) => ({ - id: data.id, - label: item.name, - value: item.modelName, - type: item.type, - name: data.name, - })); - return res.status(200).send(success(allData)); - } - const filteredData = models.filter((item: { type: string }) => item.type === type).map((item: { name: string; modelName: string; type: string }) => ({ - id: data.id, - label: item.name, - value: item.modelName, - type: item.type, - name: data.name, - })); - res.status(200).send(success(filteredData)); + "/", + validateFields({ + type: z.enum(["text", "image", "video", "all"]), + }), + async (req, res) => { + const { type } = req.body; + const data = await u.db("o_vendorConfig").select("id", "models", "name").first(); + if (!data) { + return res.status(404).send({ error: "模型未找到" }); } + const models = JSON.parse(data.models!); + if (type === "all") { + const allData = models + .filter((item: { type: string }) => item.type !== "video") + .map((item: { name: string; modelName: string; type: string }) => ({ + id: data.id, + label: item.name, + value: item.modelName, + type: item.type, + name: data.name, + })); + return res.status(200).send(success(allData)); + } + const filteredData = models + .filter((item: { type: string }) => item.type === type) + .map((item: { name: string; modelName: string; type: string }) => ({ + id: data.id, + label: item.name, + value: item.modelName, + type: item.type, + name: data.name, + })); + res.status(200).send(success(filteredData)); + }, ); diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts new file mode 100644 index 0000000..b0942de --- /dev/null +++ b/src/routes/production/workbench/generateVideo.ts @@ -0,0 +1,70 @@ +import express from "express"; +import u from "@/utils"; +import { z } from "zod"; +import { v4 as uuidv4 } from "uuid"; +import { success } from "@/lib/responseFormat"; +import { validateFields } from "@/middleware/middleware"; +const router = express.Router(); + +export default router.post( + "/", + validateFields({ + scriptId: z.number(), + projectId: z.number(), + storyboardId: z.number(), + prompt: z.string(), + imageData: z.array(z.string()).optional(), + model: z.string(), + duration: z.number(), + resolution: z.string(), + audio: z.boolean().optional(), + modeData: z.string(), + }), + async (req, res) => { + const { scriptId, projectId, storyboardId, prompt, imageData, model, duration, resolution, audio, modeData } = req.body; + console.log("%c Line:24 🍡 req.body", "background:#b03734", req.body); + try { + const relatedObjects = { + id: storyboardId, + projectId, + type: "视频", + }; + const systemPrompt = `你是一个专业的视频生成引擎，能够根据用户提供的提示词、图片和参数生成高质量的视频内容。请严格按照用户的需求进行视频创作，确保输出的视频符合以下要求： +1. 视频内容必须与用户提供的提示词和图片相关联，准确反映用户的创意意图。 +2. 视频质量应达到专业水平，画面清晰、流畅，符合用户指定的分辨率和时长要求。 +3. 视频风格应与用户指定的模式数据相匹配，包括色彩、音乐、特效等元素。 +4. 视频中应包含用户提供的图片，并在视频中适当展示，以增强视频的视觉效果。 +5. 如果用户指定了音频，请确保视频中的音频与视频内容相匹配，符合用户的创意意图。`; + const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; + const aiVideo = u.Ai.Video(model); + await aiVideo.run({ + systemPrompt, // 系统提示词 + projectId: projectId, + storyboardId: storyboardId, + prompt: prompt, + imageData: imageData, + modeData: modeData, + duration: duration, + resolution: resolution, + audio: audio, + taskClass: "视频生成", + describe: "根据提示词生成视频", + relatedObjects: JSON.stringify(relatedObjects), + }); + await aiVideo.save(videoPath); // 保存视频 + //保存视频信息到数据库 + // await u.db("o_video").insert({ + // resolution, + // prompt, + // filePath: videoPath, + // model, + // time: new Date(), + // state: "生成成功", + // scriptId: scriptId, + // }); + res.status(200).send(success("视频生成成功")); + } catch (error) { + res.status(500).send({ error: "视频生成失败" }); + } + }, +); diff --git a/src/routes/setting/vendorConfig/updateVendor.ts b/src/routes/setting/vendorConfig/updateVendor.ts index 49277de..67d23a5 100644 --- a/src/routes/setting/vendorConfig/updateVendor.ts +++ b/src/routes/setting/vendorConfig/updateVendor.ts @@ -40,16 +40,9 @@ const vendorConfigSchema = z.object({ modelName: z.string(), type: z.literal("video"), mode: z.array( - z.enum([ - "singleImage", - "multiImage", - "gridImage", - "startEndRequired", - "endFrameOptional", - "startFrameOptional", - "text", - "audioReference", - "videoReference", + z.union([ + z.enum(["singleImage", "multiImage", "gridImage", "startEndRequired", "endFrameOptional", "startFrameOptional", "text"]), + z.array(z.enum(["audioReference", "videoReference", "textReference", "imageReference"])), ]), ), audio: z.union([z.literal("optional"), z.boolean()]), @@ -100,16 +93,9 @@ export default router.post( modelName: z.string(), type: z.literal("video"), mode: z.array( - z.enum([ - "singleImage", - "multiImage", - "gridImage", - "startEndRequired", - "endFrameOptional", - "startFrameOptional", - "text", - "audioReference", - "videoReference", + z.union([ + z.enum(["singleImage", "multiImage", "gridImage", "startEndRequired", "endFrameOptional", "startFrameOptional", "text"]), + z.array(z.enum(["audioReference", "videoReference", "textReference", "imageReference"])), ]), ), audio: z.union([z.literal("optional"), z.boolean()]), diff --git a/src/utils/ai.ts b/src/utils/ai.ts index e3be26b..fa90e1f 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -112,13 +112,28 @@ class AiImage { return this; } } +interface VideoConfig { + projectId: number; // 项目ID + storyboardId: number; // 关联的分镜ID + systemPrompt?: string; // 系统提示词 + prompt: string; //视频提示词 + imageData: string[]; //输入的图片提示词 + modeData: string; //模式 + duration: number; // 视频时长，单位秒 + resolution: string; // 视频分辨率 + audio: boolean; // 是否需要配音 + taskClass: string; // 任务分类 + describe: string; // 任务描述 + relatedObjects: string; // 相关对象信息，便于后续分析和追踪 +} + class AiVideo { private key: `${number}:${string}`; private result: string = ""; constructor(key: `${number}:${string}`) { this.key = key; } - async run(input: ImageConfig) { + async run(input: VideoConfig) { return withTaskRecord(this.key, input.taskClass, input.describe, input.relatedObjects, input.projectId, async (modelName) => { const fn = await getVendorTemplateFn("videoRequest", modelName); this.result = await fn(input); @@ -137,7 +152,7 @@ class AiAudio { constructor(key: `${number}:${string}`) { this.key = key; } - async run(input: ImageConfig) { + async run(input: VideoConfig) { return withTaskRecord(this.key, input.taskClass, input.describe, input.relatedObjects, input.projectId, async (modelName) => { const fn = await getVendorTemplateFn("ttsRequest", modelName); this.result = await fn(input); From e44974964c50bd377ef99bfd9f4413f1f81a81c5 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Sat, 21 Mar 2026 10:01:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=95=9C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/lib/initDB.ts | 19 ++- src/router.ts | 122 ++++++++++-------- .../editStoryboard/generateStoryboardImage.ts | 41 ++++++ .../editStoryboard/getStoryboardFlow.ts | 27 ++++ .../editStoryboard/saveStoryboardFlow.ts | 28 ++++ .../editStoryboard/updateStoryboardFlow.ts | 28 ++++ src/types/database.d.ts | 90 ++++++++++++- yarn.lock | 7 + 9 files changed, 297 insertions(+), 66 deletions(-) create mode 100644 src/routes/production/editStoryboard/generateStoryboardImage.ts create mode 100644 src/routes/production/editStoryboard/getStoryboardFlow.ts create mode 100644 src/routes/production/editStoryboard/saveStoryboardFlow.ts create mode 100644 src/routes/production/editStoryboard/updateStoryboardFlow.ts diff --git a/package.json b/package.json index f774e23..28fd220 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "express-ws": "^5.0.2", "fast-glob": "^3.3.3", "form-data": "^4.0.5", + "graphlib": "^2.1.8", "is-path-inside": "^4.0.0", "js-md5": "^0.8.3", "jsonwebtoken": "^9.0.3", diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index ada4c87..36ac4a0 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -276,7 +276,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("remark"); table.text("type"); table.text("describe"); - table.integer("scriptId");//剧本id + table.integer("scriptId"); //剧本id table.integer("imageId").unsigned().references("id").inTable("o_image"); table.integer("sonId"); table.integer("projectId"); @@ -307,7 +307,11 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => name: "o_storyboard", builder: (table) => { table.integer("id").notNullable(); - table.string("name"); + table.text("name"); + table.text("detail"); + table.text("prompt"); + table.text("seconds"); + table.integer("imageId"); table.integer("createTime"); table.primary(["id"]); table.unique(["id"]); @@ -420,6 +424,17 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.index(["isolationKey", "summarized"]); }, }, + //分镜工作流表 + { + name: "o_storyboardFlow", + builder: (table) => { + table.integer("id").notNullable(); + table.text("flowData").notNullable(); + table.integer("stroryboardId").notNullable(); + table.primary(["id"]); + table.unique(["id"]); + }, + }, ]; for (const t of tables) { diff --git a/src/router.ts b/src/router.ts index bddd2d8..2b2aa3b 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 45e23a536a13265ff62fe92b1cb71fe3 +// @routes-hash 84d4d9cf99aad5cde060895dad6ed2b1 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -35,34 +35,38 @@ import route31 from "./routes/novel/getNovel"; import route32 from "./routes/novel/updateNovel"; import route33 from "./routes/other/deleteAllData"; import route34 from "./routes/other/getCaptcha"; -import route35 from "./routes/production/getProductionData"; -import route36 from "./routes/production/workbench/getVideoModelDetail"; -import route37 from "./routes/project/addProject"; -import route38 from "./routes/project/delProject"; -import route39 from "./routes/project/editProject"; -import route40 from "./routes/project/getProject"; -import route41 from "./routes/script/addScript"; -import route42 from "./routes/script/delScript"; -import route43 from "./routes/script/getScrptApi"; -import route44 from "./routes/script/updateScript"; -import route45 from "./routes/setting/agentDeploy/deployAgentModel"; -import route46 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route47 from "./routes/setting/agentDeploy/updateKey"; -import route48 from "./routes/setting/dbConfig/clearData"; -import route49 from "./routes/setting/getTextModel"; -import route50 from "./routes/setting/loginConfig/getUser"; -import route51 from "./routes/setting/loginConfig/updateUserPwd"; -import route52 from "./routes/setting/memoryConfig/getMemory"; -import route53 from "./routes/setting/memoryConfig/sureMemory"; -import route54 from "./routes/setting/vendorConfig/addVendor"; -import route55 from "./routes/setting/vendorConfig/deleteVendor"; -import route56 from "./routes/setting/vendorConfig/getVendorList"; -import route57 from "./routes/setting/vendorConfig/modelTest"; -import route58 from "./routes/setting/vendorConfig/updateVendor"; -import route59 from "./routes/task/getMyTaskApi"; -import route60 from "./routes/task/getTaskCategories"; -import route61 from "./routes/task/taskDetails"; -import route62 from "./routes/test/test"; +import route35 from "./routes/production/editStoryboard/generateStoryboardImage"; +import route36 from "./routes/production/editStoryboard/getStoryboardFlow"; +import route37 from "./routes/production/editStoryboard/saveStoryboardFlow"; +import route38 from "./routes/production/editStoryboard/updateStoryboardFlow"; +import route39 from "./routes/production/getProductionData"; +import route40 from "./routes/production/workbench/getVideoModelDetail"; +import route41 from "./routes/project/addProject"; +import route42 from "./routes/project/delProject"; +import route43 from "./routes/project/editProject"; +import route44 from "./routes/project/getProject"; +import route45 from "./routes/script/addScript"; +import route46 from "./routes/script/delScript"; +import route47 from "./routes/script/getScrptApi"; +import route48 from "./routes/script/updateScript"; +import route49 from "./routes/setting/agentDeploy/deployAgentModel"; +import route50 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route51 from "./routes/setting/agentDeploy/updateKey"; +import route52 from "./routes/setting/dbConfig/clearData"; +import route53 from "./routes/setting/getTextModel"; +import route54 from "./routes/setting/loginConfig/getUser"; +import route55 from "./routes/setting/loginConfig/updateUserPwd"; +import route56 from "./routes/setting/memoryConfig/getMemory"; +import route57 from "./routes/setting/memoryConfig/sureMemory"; +import route58 from "./routes/setting/vendorConfig/addVendor"; +import route59 from "./routes/setting/vendorConfig/deleteVendor"; +import route60 from "./routes/setting/vendorConfig/getVendorList"; +import route61 from "./routes/setting/vendorConfig/modelTest"; +import route62 from "./routes/setting/vendorConfig/updateVendor"; +import route63 from "./routes/task/getMyTaskApi"; +import route64 from "./routes/task/getTaskCategories"; +import route65 from "./routes/task/taskDetails"; +import route66 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -99,32 +103,36 @@ export default async (app: Express) => { app.use("/api/novel/updateNovel", route32); app.use("/api/other/deleteAllData", route33); app.use("/api/other/getCaptcha", route34); - app.use("/api/production/getProductionData", route35); - app.use("/api/production/workbench/getVideoModelDetail", route36); - app.use("/api/project/addProject", route37); - app.use("/api/project/delProject", route38); - app.use("/api/project/editProject", route39); - app.use("/api/project/getProject", route40); - app.use("/api/script/addScript", route41); - app.use("/api/script/delScript", route42); - app.use("/api/script/getScrptApi", route43); - app.use("/api/script/updateScript", route44); - app.use("/api/setting/agentDeploy/deployAgentModel", route45); - app.use("/api/setting/agentDeploy/getAgentDeploy", route46); - app.use("/api/setting/agentDeploy/updateKey", route47); - app.use("/api/setting/dbConfig/clearData", route48); - app.use("/api/setting/getTextModel", route49); - app.use("/api/setting/loginConfig/getUser", route50); - app.use("/api/setting/loginConfig/updateUserPwd", route51); - app.use("/api/setting/memoryConfig/getMemory", route52); - app.use("/api/setting/memoryConfig/sureMemory", route53); - app.use("/api/setting/vendorConfig/addVendor", route54); - app.use("/api/setting/vendorConfig/deleteVendor", route55); - app.use("/api/setting/vendorConfig/getVendorList", route56); - app.use("/api/setting/vendorConfig/modelTest", route57); - app.use("/api/setting/vendorConfig/updateVendor", route58); - app.use("/api/task/getMyTaskApi", route59); - app.use("/api/task/getTaskCategories", route60); - app.use("/api/task/taskDetails", route61); - app.use("/api/test/test", route62); + app.use("/api/production/editStoryboard/generateStoryboardImage", route35); + app.use("/api/production/editStoryboard/getStoryboardFlow", route36); + app.use("/api/production/editStoryboard/saveStoryboardFlow", route37); + app.use("/api/production/editStoryboard/updateStoryboardFlow", route38); + app.use("/api/production/getProductionData", route39); + app.use("/api/production/workbench/getVideoModelDetail", route40); + app.use("/api/project/addProject", route41); + app.use("/api/project/delProject", route42); + app.use("/api/project/editProject", route43); + app.use("/api/project/getProject", route44); + app.use("/api/script/addScript", route45); + app.use("/api/script/delScript", route46); + app.use("/api/script/getScrptApi", route47); + app.use("/api/script/updateScript", route48); + app.use("/api/setting/agentDeploy/deployAgentModel", route49); + app.use("/api/setting/agentDeploy/getAgentDeploy", route50); + app.use("/api/setting/agentDeploy/updateKey", route51); + app.use("/api/setting/dbConfig/clearData", route52); + app.use("/api/setting/getTextModel", route53); + app.use("/api/setting/loginConfig/getUser", route54); + app.use("/api/setting/loginConfig/updateUserPwd", route55); + app.use("/api/setting/memoryConfig/getMemory", route56); + app.use("/api/setting/memoryConfig/sureMemory", route57); + app.use("/api/setting/vendorConfig/addVendor", route58); + app.use("/api/setting/vendorConfig/deleteVendor", route59); + app.use("/api/setting/vendorConfig/getVendorList", route60); + app.use("/api/setting/vendorConfig/modelTest", route61); + app.use("/api/setting/vendorConfig/updateVendor", route62); + app.use("/api/task/getMyTaskApi", route63); + app.use("/api/task/getTaskCategories", route64); + app.use("/api/task/taskDetails", route65); + app.use("/api/test/test", route66); } diff --git a/src/routes/production/editStoryboard/generateStoryboardImage.ts b/src/routes/production/editStoryboard/generateStoryboardImage.ts new file mode 100644 index 0000000..31d4db0 --- /dev/null +++ b/src/routes/production/editStoryboard/generateStoryboardImage.ts @@ -0,0 +1,41 @@ +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({ + model: z.string(), + references: z.array(z.string()).optional(), + quality: z.string(), + ratio: z.string(), + prompt: z.string(), + projectId: z.number(), + }), + async (req, res) => { + const { model, references = [], quality, ratio, prompt, projectId } = req.body; + const imageClass = await u.Ai.Image(model).run({ + prompt: prompt, + imageBase64: references, + size: quality, + aspectRatio: ratio, + taskClass: "分镜生成", + describe: "生成分镜图片", + relatedObjects: JSON.stringify(req.body), + projectId: projectId, + }); + const savePath = `${projectId}/storyboard/${u.uuid()}.jpg`; + await imageClass.save(savePath); + + const url = await u.oss.getFileUrl(savePath); + const [imageId] = await u.db("o_image").insert({ + filePath: savePath, + state: "1", + type: "storyFlow", + }); + return res.status(200).send(success({ imageId, url })); + }, +); diff --git a/src/routes/production/editStoryboard/getStoryboardFlow.ts b/src/routes/production/editStoryboard/getStoryboardFlow.ts new file mode 100644 index 0000000..499aee7 --- /dev/null +++ b/src/routes/production/editStoryboard/getStoryboardFlow.ts @@ -0,0 +1,27 @@ +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(), + }), + async (req, res) => { + const { id } = req.body; + console.log("%c Line:15 🥤 id", "background:#e41a6a", id); + const storyboardFlowData = await u.db("o_storyboardFlow").where("stroryboardId", id).first(); + if (storyboardFlowData?.flowData) { + return res.status(200).send(success(JSON.parse(storyboardFlowData?.flowData))); + } + return res.status(200).send( + success({ + nodes: [], + edges: [], + }), + ); + }, +); diff --git a/src/routes/production/editStoryboard/saveStoryboardFlow.ts b/src/routes/production/editStoryboard/saveStoryboardFlow.ts new file mode 100644 index 0000000..920bd48 --- /dev/null +++ b/src/routes/production/editStoryboard/saveStoryboardFlow.ts @@ -0,0 +1,28 @@ +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({ + edges: z.any(), + nodes: z.any(), + imageId: z.number(), + }), + async (req, res) => { + const { edges, nodes, imageId } = req.body; + // if + const [id] = await u.db("o_storyboad").insert({ + imageId, + }); + await u.db("o_storyboardFlow").insert({ + id: 1, + stroryboardId: id, + flowData: JSON.stringify({ edges, nodes }), + }); + return res.status(200).send(success()); + }, +); diff --git a/src/routes/production/editStoryboard/updateStoryboardFlow.ts b/src/routes/production/editStoryboard/updateStoryboardFlow.ts new file mode 100644 index 0000000..0174a25 --- /dev/null +++ b/src/routes/production/editStoryboard/updateStoryboardFlow.ts @@ -0,0 +1,28 @@ +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({ + edges: z.any(), + nodes: z.any(), + id: z.number(), + imageId: z.number(), + }), + async (req, res) => { + const { edges, nodes, id, imageId } = req.body; + // if + await u.db("o_storyboard").where("id", id).update({ imageId }); + await u + .db("o_storyboardFlow") + .where("stroryboardId", id) + .update({ + flowData: JSON.stringify({ edges, nodes }), + }); + return res.status(200).send(success()); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index e3a7e5f..fdc1421 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,9 +1,9 @@ -// @db-hash 04e1150a9773602183de5f660a52b092 +// @db-hash 85366ab7662bd484810dcec778054957 //该文件由脚本自动生成，请勿手动修改 export interface memories { 'content': string; - 'createTime': number; + 'createdAt': number; 'embedding'?: string | null; 'id'?: string; 'isolationKey': string; @@ -35,12 +35,18 @@ export interface o_assets { 'projectId'?: number | null; 'prompt'?: string | null; 'remark'?: string | null; - 'scriptId'?: number | null; 'sonId'?: number | null; 'startTime'?: number | null; 'state'?: string | null; 'type'?: string | null; } +export interface o_chatHistory { + 'data'?: string | null; + 'id'?: number; + 'novel'?: string | null; + 'projectId'?: number | null; + 'type'?: string | null; +} export interface o_event { 'createTime'?: number | null; 'detail'?: string | null; @@ -61,10 +67,33 @@ export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; 'id'?: number; - 'model'?: string | null; - 'resolution'?: string | null; + 'projectId'?: number | null; + 'scriptId'?: number | null; 'state'?: string | null; 'type'?: string | null; + 'videoId'?: number | null; +} +export interface o_model { + 'apiKey'?: string | null; + 'baseUrl'?: string | null; + 'createTime'?: number | null; + 'id'?: number; + 'index'?: number | null; + 'manufacturer'?: string | null; + 'model'?: string | null; + 'modelType'?: string | null; + 'type'?: string | null; +} +export interface o_myTasks { + 'describe'?: string | null; + 'id'?: number; + 'model'?: string | null; + 'projectId'?: number | null; + 'reason'?: string | null; + 'relatedObjects'?: string | null; + 'startTime'?: number | null; + 'state'?: string | null; + 'taskClass'?: string | null; } export interface o_novel { 'chapter'?: string | null; @@ -97,6 +126,15 @@ export interface o_project { 'userId'?: number | null; 'videoRatio'?: string | null; } +export interface o_prompts { + 'code'?: string | null; + 'customValue'?: string | null; + 'defaultValue'?: string | null; + 'id'?: number; + 'name'?: string | null; + 'parentCode'?: string | null; + 'type'?: string | null; +} export interface o_script { 'content'?: string | null; 'createTime'?: number | null; @@ -104,14 +142,43 @@ export interface o_script { 'name'?: string | null; 'projectId'?: number | null; } +export interface o_scriptAssets { + 'assetsId'?: number | null; + 'id'?: number; + 'scriptId'?: number | null; +} +export interface o_scriptOutline { + 'id'?: number; + 'outlineId'?: number | null; + 'scriptId'?: number | null; +} export interface o_setting { 'key'?: string | null; 'value'?: string | null; } -export interface o_storyboard { - 'createTime'?: number | null; +export interface o_skills { 'id'?: number; 'name'?: string | null; + 'startTime'?: number | null; +} +export interface o_storyboard { + 'createTime'?: number | null; + 'detail'?: string | null; + 'id'?: number; + 'imageId'?: number | null; + 'name'?: string | null; + 'prompt'?: string | null; + 'seconds'?: string | null; +} +export interface o_storyboardFlow { + 'flowData': string; + 'id'?: string; + 'stroryboardId': string; +} +export interface o_storyboardScript { + 'id'?: number; + 'scriptId'?: number | null; + 'storyboardId'?: number | null; } export interface o_tasks { 'describe'?: string | null; @@ -178,17 +245,26 @@ export interface DB { "o_agentDeploy": o_agentDeploy; "o_artStyle": o_artStyle; "o_assets": o_assets; + "o_chatHistory": o_chatHistory; "o_event": o_event; "o_eventChapter": o_eventChapter; "o_flowData": o_flowData; "o_image": o_image; + "o_model": o_model; + "o_myTasks": o_myTasks; "o_novel": o_novel; "o_outline": o_outline; "o_outlineNovel": o_outlineNovel; "o_project": o_project; + "o_prompts": o_prompts; "o_script": o_script; + "o_scriptAssets": o_scriptAssets; + "o_scriptOutline": o_scriptOutline; "o_setting": o_setting; + "o_skills": o_skills; "o_storyboard": o_storyboard; + "o_storyboardFlow": o_storyboardFlow; + "o_storyboardScript": o_storyboardScript; "o_tasks": o_tasks; "o_user": o_user; "o_vendorConfig": o_vendorConfig; diff --git a/yarn.lock b/yarn.lock index 31f5e73..ad79782 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2481,6 +2481,13 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, resolved "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +graphlib@^2.1.8: + version "2.1.8" + resolved "https://registry.npmmirror.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" + integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== + dependencies: + lodash "^4.17.15" + guid-typescript@^1.0.9: version "1.0.9" resolved "https://registry.npmmirror.com/guid-typescript/-/guid-typescript-1.0.9.tgz#e35f77003535b0297ea08548f5ace6adb1480ddc" From 4f3ba9502b32cf032fc2358f2c8f14019490d9e6 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Sat, 21 Mar 2026 10:25:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/initDB.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index 36ac4a0..747927b 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -311,7 +311,8 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("detail"); table.text("prompt"); table.text("seconds"); - table.integer("imageId"); + table.text("filePath"); + table.text("frameType"); table.integer("createTime"); table.primary(["id"]); table.unique(["id"]); From ef092b869ccaf56bf1402abf5057fa994eff1f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Sat, 21 Mar 2026 10:36:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/initDB.ts | 22 +- src/router.ts | 244 +++++++++--------- .../production/workbench/generateVideo.ts | 18 +- src/types/database.d.ts | 94 +------ src/utils/ai.ts | 2 +- 5 files changed, 154 insertions(+), 226 deletions(-) diff --git a/src/lib/initDB.ts b/src/lib/initDB.ts index ada4c87..bd43e3e 100644 --- a/src/lib/initDB.ts +++ b/src/lib/initDB.ts @@ -276,7 +276,7 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("remark"); table.text("type"); table.text("describe"); - table.integer("scriptId");//剧本id + table.integer("scriptId"); //剧本id table.integer("imageId").unsigned().references("id").inTable("o_image"); table.integer("sonId"); table.integer("projectId"); @@ -332,14 +332,13 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => table.text("resolution"); table.text("prompt"); table.text("filePath"); - table.text("firstFrame"); - table.text("storyboardImgs"); table.text("model"); + table.text("mode"); table.text("errorReason"); table.integer("time"); - table.integer("state"); + table.text("state"); table.integer("scriptId"); - table.integer("configId"); // 关联的视频配置ID + table.integer("storyboardId"); table.primary(["id"]); table.unique(["id"]); }, @@ -349,19 +348,14 @@ export default async (knex: Knex, forceInit: boolean = false): Promise => name: "o_videoConfig", builder: (table) => { table.integer("id").notNullable(); - table.integer("scriptId"); // 关联的脚本ID - table.integer("projectId"); // 关联的项目ID - table.integer("aiConfigId"); //ai配置ID - table.integer("audioEnabled"); //声音 - table.text("manufacturer"); // 厂商：volcengine/runninghub/openAi + table.integer("videoId"); //视频Id + table.integer("audio"); //声音 + table.text("model"); //模型 table.text("mode"); // 模式：startEnd/multi/single - table.text("startFrame"); // 首帧图片信息 JSON - table.text("endFrame"); // 尾帧图片信息 JSON - table.text("images"); // 多图模式的图片列表 JSON + table.text("data"); // 所选数据集图片 JSON table.text("resolution"); // 分辨率 table.integer("duration"); // 时长 table.text("prompt"); // 提示词 - table.integer("selectedResultId"); // 选中的生成结果ID table.integer("createTime"); // 创建时间 table.integer("updateTime"); // 更新时间 table.primary(["id"]); diff --git a/src/router.ts b/src/router.ts index ebc0e67..f65c868 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,132 +1,130 @@ -// @routes-hash ee45dd26b9149e6eabf834c1fb5cfbb6 +// @routes-hash beeb358ee056d0414c7a2ca88bc9b566 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; import route2 from "./routes/agents/getMemory"; -import route3 from "./routes/agents/productionAgent"; -import route4 from "./routes/artStyle/getArtStyle"; -import route5 from "./routes/assets/addAssets"; -import route6 from "./routes/assets/batchDelete"; -import route7 from "./routes/assets/batchGenerationData"; -import route8 from "./routes/assets/delAssets"; -import route9 from "./routes/assets/getAssetsApi"; -import route10 from "./routes/assets/getImage"; -import route11 from "./routes/assets/saveAssets"; -import route12 from "./routes/assets/updateAssets"; -import route13 from "./routes/assets/uploadClip"; -import route14 from "./routes/assetsGenerate/generateAssets"; -import route15 from "./routes/assetsGenerate/polishAssetsPrompt"; -import route16 from "./routes/cornerScape/getAllAssets"; -import route17 from "./routes/general/generalStatistics"; -import route18 from "./routes/general/getSingleProject"; -import route19 from "./routes/general/updateProject"; -import route20 from "./routes/login/login"; -import route21 from "./routes/migrate/migrateData"; -import route22 from "./routes/modelSelect/getModelDetail"; -import route23 from "./routes/modelSelect/getModelList"; -import route24 from "./routes/novel/addNovel"; -import route25 from "./routes/novel/batchDeleteNovel"; -import route26 from "./routes/novel/delNovel"; -import route27 from "./routes/novel/event/batchDeleteEvent"; -import route28 from "./routes/novel/event/deletEvent"; -import route29 from "./routes/novel/event/generateEvents"; -import route30 from "./routes/novel/event/getEvent"; -import route31 from "./routes/novel/getNovel"; -import route32 from "./routes/novel/updateNovel"; -import route33 from "./routes/other/deleteAllData"; -import route34 from "./routes/other/getCaptcha"; -import route35 from "./routes/production/getProductionData"; -import route36 from "./routes/production/workbench/generateVideo"; -import route37 from "./routes/production/workbench/getVideoModelDetail"; -import route38 from "./routes/project/addProject"; -import route39 from "./routes/project/delProject"; -import route40 from "./routes/project/editProject"; -import route41 from "./routes/project/getProject"; -import route42 from "./routes/script/addScript"; -import route43 from "./routes/script/delScript"; -import route44 from "./routes/script/getScrptApi"; -import route45 from "./routes/script/updateScript"; -import route46 from "./routes/setting/agentDeploy/deployAgentModel"; -import route47 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route48 from "./routes/setting/agentDeploy/updateKey"; -import route49 from "./routes/setting/dbConfig/clearData"; -import route50 from "./routes/setting/getTextModel"; -import route51 from "./routes/setting/loginConfig/getUser"; -import route52 from "./routes/setting/loginConfig/updateUserPwd"; -import route53 from "./routes/setting/memoryConfig/getMemory"; -import route54 from "./routes/setting/memoryConfig/sureMemory"; -import route55 from "./routes/setting/vendorConfig/addVendor"; -import route56 from "./routes/setting/vendorConfig/deleteVendor"; -import route57 from "./routes/setting/vendorConfig/getVendorList"; -import route58 from "./routes/setting/vendorConfig/modelTest"; -import route59 from "./routes/setting/vendorConfig/updateVendor"; -import route60 from "./routes/task/getMyTaskApi"; -import route61 from "./routes/task/getTaskCategories"; -import route62 from "./routes/task/taskDetails"; -import route63 from "./routes/test/test"; +import route3 from "./routes/artStyle/getArtStyle"; +import route4 from "./routes/assets/addAssets"; +import route5 from "./routes/assets/batchDelete"; +import route6 from "./routes/assets/batchGenerationData"; +import route7 from "./routes/assets/delAssets"; +import route8 from "./routes/assets/getAssetsApi"; +import route9 from "./routes/assets/getImage"; +import route10 from "./routes/assets/saveAssets"; +import route11 from "./routes/assets/updateAssets"; +import route12 from "./routes/assets/uploadClip"; +import route13 from "./routes/assetsGenerate/generateAssets"; +import route14 from "./routes/assetsGenerate/polishAssetsPrompt"; +import route15 from "./routes/cornerScape/getAllAssets"; +import route16 from "./routes/general/generalStatistics"; +import route17 from "./routes/general/getSingleProject"; +import route18 from "./routes/general/updateProject"; +import route19 from "./routes/login/login"; +import route20 from "./routes/migrate/migrateData"; +import route21 from "./routes/modelSelect/getModelDetail"; +import route22 from "./routes/modelSelect/getModelList"; +import route23 from "./routes/novel/addNovel"; +import route24 from "./routes/novel/batchDeleteNovel"; +import route25 from "./routes/novel/delNovel"; +import route26 from "./routes/novel/event/batchDeleteEvent"; +import route27 from "./routes/novel/event/deletEvent"; +import route28 from "./routes/novel/event/generateEvents"; +import route29 from "./routes/novel/event/getEvent"; +import route30 from "./routes/novel/getNovel"; +import route31 from "./routes/novel/updateNovel"; +import route32 from "./routes/other/deleteAllData"; +import route33 from "./routes/other/getCaptcha"; +import route34 from "./routes/production/getProductionData"; +import route35 from "./routes/production/workbench/generateVideo"; +import route36 from "./routes/production/workbench/getVideoModelDetail"; +import route37 from "./routes/project/addProject"; +import route38 from "./routes/project/delProject"; +import route39 from "./routes/project/editProject"; +import route40 from "./routes/project/getProject"; +import route41 from "./routes/script/addScript"; +import route42 from "./routes/script/delScript"; +import route43 from "./routes/script/getScrptApi"; +import route44 from "./routes/script/updateScript"; +import route45 from "./routes/setting/agentDeploy/deployAgentModel"; +import route46 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route47 from "./routes/setting/agentDeploy/updateKey"; +import route48 from "./routes/setting/dbConfig/clearData"; +import route49 from "./routes/setting/getTextModel"; +import route50 from "./routes/setting/loginConfig/getUser"; +import route51 from "./routes/setting/loginConfig/updateUserPwd"; +import route52 from "./routes/setting/memoryConfig/getMemory"; +import route53 from "./routes/setting/memoryConfig/sureMemory"; +import route54 from "./routes/setting/vendorConfig/addVendor"; +import route55 from "./routes/setting/vendorConfig/deleteVendor"; +import route56 from "./routes/setting/vendorConfig/getVendorList"; +import route57 from "./routes/setting/vendorConfig/modelTest"; +import route58 from "./routes/setting/vendorConfig/updateVendor"; +import route59 from "./routes/task/getMyTaskApi"; +import route60 from "./routes/task/getTaskCategories"; +import route61 from "./routes/task/taskDetails"; +import route62 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); app.use("/api/agents/getMemory", route2); - app.use("/api/agents/productionAgent", route3); - app.use("/api/artStyle/getArtStyle", route4); - app.use("/api/assets/addAssets", route5); - app.use("/api/assets/batchDelete", route6); - app.use("/api/assets/batchGenerationData", route7); - app.use("/api/assets/delAssets", route8); - app.use("/api/assets/getAssetsApi", route9); - app.use("/api/assets/getImage", route10); - app.use("/api/assets/saveAssets", route11); - app.use("/api/assets/updateAssets", route12); - app.use("/api/assets/uploadClip", route13); - app.use("/api/assetsGenerate/generateAssets", route14); - app.use("/api/assetsGenerate/polishAssetsPrompt", route15); - app.use("/api/cornerScape/getAllAssets", route16); - app.use("/api/general/generalStatistics", route17); - app.use("/api/general/getSingleProject", route18); - app.use("/api/general/updateProject", route19); - app.use("/api/login/login", route20); - app.use("/api/migrate/migrateData", route21); - app.use("/api/modelSelect/getModelDetail", route22); - app.use("/api/modelSelect/getModelList", route23); - app.use("/api/novel/addNovel", route24); - app.use("/api/novel/batchDeleteNovel", route25); - app.use("/api/novel/delNovel", route26); - app.use("/api/novel/event/batchDeleteEvent", route27); - app.use("/api/novel/event/deletEvent", route28); - app.use("/api/novel/event/generateEvents", route29); - app.use("/api/novel/event/getEvent", route30); - app.use("/api/novel/getNovel", route31); - app.use("/api/novel/updateNovel", route32); - app.use("/api/other/deleteAllData", route33); - app.use("/api/other/getCaptcha", route34); - app.use("/api/production/getProductionData", route35); - app.use("/api/production/workbench/generateVideo", route36); - app.use("/api/production/workbench/getVideoModelDetail", route37); - app.use("/api/project/addProject", route38); - app.use("/api/project/delProject", route39); - app.use("/api/project/editProject", route40); - app.use("/api/project/getProject", route41); - app.use("/api/script/addScript", route42); - app.use("/api/script/delScript", route43); - app.use("/api/script/getScrptApi", route44); - app.use("/api/script/updateScript", route45); - app.use("/api/setting/agentDeploy/deployAgentModel", route46); - app.use("/api/setting/agentDeploy/getAgentDeploy", route47); - app.use("/api/setting/agentDeploy/updateKey", route48); - app.use("/api/setting/dbConfig/clearData", route49); - app.use("/api/setting/getTextModel", route50); - app.use("/api/setting/loginConfig/getUser", route51); - app.use("/api/setting/loginConfig/updateUserPwd", route52); - app.use("/api/setting/memoryConfig/getMemory", route53); - app.use("/api/setting/memoryConfig/sureMemory", route54); - app.use("/api/setting/vendorConfig/addVendor", route55); - app.use("/api/setting/vendorConfig/deleteVendor", route56); - app.use("/api/setting/vendorConfig/getVendorList", route57); - app.use("/api/setting/vendorConfig/modelTest", route58); - app.use("/api/setting/vendorConfig/updateVendor", route59); - app.use("/api/task/getMyTaskApi", route60); - app.use("/api/task/getTaskCategories", route61); - app.use("/api/task/taskDetails", route62); - app.use("/api/test/test", route63); + app.use("/api/artStyle/getArtStyle", route3); + app.use("/api/assets/addAssets", route4); + app.use("/api/assets/batchDelete", route5); + app.use("/api/assets/batchGenerationData", route6); + app.use("/api/assets/delAssets", route7); + app.use("/api/assets/getAssetsApi", route8); + app.use("/api/assets/getImage", route9); + app.use("/api/assets/saveAssets", route10); + app.use("/api/assets/updateAssets", route11); + app.use("/api/assets/uploadClip", route12); + app.use("/api/assetsGenerate/generateAssets", route13); + app.use("/api/assetsGenerate/polishAssetsPrompt", route14); + app.use("/api/cornerScape/getAllAssets", route15); + app.use("/api/general/generalStatistics", route16); + app.use("/api/general/getSingleProject", route17); + app.use("/api/general/updateProject", route18); + app.use("/api/login/login", route19); + app.use("/api/migrate/migrateData", route20); + app.use("/api/modelSelect/getModelDetail", route21); + app.use("/api/modelSelect/getModelList", route22); + app.use("/api/novel/addNovel", route23); + app.use("/api/novel/batchDeleteNovel", route24); + app.use("/api/novel/delNovel", route25); + app.use("/api/novel/event/batchDeleteEvent", route26); + app.use("/api/novel/event/deletEvent", route27); + app.use("/api/novel/event/generateEvents", route28); + app.use("/api/novel/event/getEvent", route29); + app.use("/api/novel/getNovel", route30); + app.use("/api/novel/updateNovel", route31); + app.use("/api/other/deleteAllData", route32); + app.use("/api/other/getCaptcha", route33); + app.use("/api/production/getProductionData", route34); + app.use("/api/production/workbench/generateVideo", route35); + app.use("/api/production/workbench/getVideoModelDetail", route36); + app.use("/api/project/addProject", route37); + app.use("/api/project/delProject", route38); + app.use("/api/project/editProject", route39); + app.use("/api/project/getProject", route40); + app.use("/api/script/addScript", route41); + app.use("/api/script/delScript", route42); + app.use("/api/script/getScrptApi", route43); + app.use("/api/script/updateScript", route44); + app.use("/api/setting/agentDeploy/deployAgentModel", route45); + app.use("/api/setting/agentDeploy/getAgentDeploy", route46); + app.use("/api/setting/agentDeploy/updateKey", route47); + app.use("/api/setting/dbConfig/clearData", route48); + app.use("/api/setting/getTextModel", route49); + app.use("/api/setting/loginConfig/getUser", route50); + app.use("/api/setting/loginConfig/updateUserPwd", route51); + app.use("/api/setting/memoryConfig/getMemory", route52); + app.use("/api/setting/memoryConfig/sureMemory", route53); + app.use("/api/setting/vendorConfig/addVendor", route54); + app.use("/api/setting/vendorConfig/deleteVendor", route55); + app.use("/api/setting/vendorConfig/getVendorList", route56); + app.use("/api/setting/vendorConfig/modelTest", route57); + app.use("/api/setting/vendorConfig/updateVendor", route58); + app.use("/api/task/getMyTaskApi", route59); + app.use("/api/task/getTaskCategories", route60); + app.use("/api/task/taskDetails", route61); + app.use("/api/test/test", route62); } diff --git a/src/routes/production/workbench/generateVideo.ts b/src/routes/production/workbench/generateVideo.ts index b0942de..7ad90d4 100644 --- a/src/routes/production/workbench/generateVideo.ts +++ b/src/routes/production/workbench/generateVideo.ts @@ -13,7 +13,7 @@ export default router.post( projectId: z.number(), storyboardId: z.number(), prompt: z.string(), - imageData: z.array(z.string()).optional(), + data: z.array(z.string()).optional(), model: z.string(), duration: z.number(), resolution: z.string(), @@ -21,8 +21,7 @@ export default router.post( modeData: z.string(), }), async (req, res) => { - const { scriptId, projectId, storyboardId, prompt, imageData, model, duration, resolution, audio, modeData } = req.body; - console.log("%c Line:24 🍡 req.body", "background:#b03734", req.body); + const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, modeData } = req.body; try { const relatedObjects = { id: storyboardId, @@ -42,7 +41,7 @@ export default router.post( projectId: projectId, storyboardId: storyboardId, prompt: prompt, - imageData: imageData, + data: data, modeData: modeData, duration: duration, resolution: resolution, @@ -58,12 +57,21 @@ export default router.post( // prompt, // filePath: videoPath, // model, - // time: new Date(), + // time: Date.now(), // state: "生成成功", // scriptId: scriptId, // }); res.status(200).send(success("视频生成成功")); } catch (error) { + // await u.db("o_video").insert({ + // resolution, + // prompt, + // model, + // time: Date.now(), + // state: "生成失败", + // scriptId: scriptId, + // errorReason: error instanceof Error ? error.message : "未知错误", + // }); res.status(500).send({ error: "视频生成失败" }); } }, diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4c3b490..4d13935 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash feca77a2c2ec5b6a2989347f982558d5 +// @db-hash f67609654b5467393c4809a3921d8fa4 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -35,18 +35,12 @@ export interface o_assets { 'projectId'?: number | null; 'prompt'?: string | null; 'remark'?: string | null; + 'scriptId'?: number | null; 'sonId'?: number | null; 'startTime'?: number | null; 'state'?: string | null; 'type'?: string | null; } -export interface o_chatHistory { - 'data'?: string | null; - 'id'?: number; - 'novel'?: string | null; - 'projectId'?: number | null; - 'type'?: string | null; -} export interface o_event { 'createTime'?: number | null; 'detail'?: string | null; @@ -67,33 +61,10 @@ export interface o_image { 'assetsId'?: number | null; 'filePath'?: string | null; 'id'?: number; - 'projectId'?: number | null; - 'scriptId'?: number | null; + 'model'?: string | null; + 'resolution'?: string | null; 'state'?: string | null; 'type'?: string | null; - 'videoId'?: number | null; -} -export interface o_model { - 'apiKey'?: string | null; - 'baseUrl'?: string | null; - 'createTime'?: number | null; - 'id'?: number; - 'index'?: number | null; - 'manufacturer'?: string | null; - 'model'?: string | null; - 'modelType'?: string | null; - 'type'?: string | null; -} -export interface o_myTasks { - 'describe'?: string | null; - 'id'?: number; - 'model'?: string | null; - 'projectId'?: number | null; - 'reason'?: string | null; - 'relatedObjects'?: string | null; - 'startTime'?: number | null; - 'state'?: string | null; - 'taskClass'?: string | null; } export interface o_novel { 'chapter'?: string | null; @@ -126,15 +97,6 @@ export interface o_project { 'userId'?: number | null; 'videoRatio'?: string | null; } -export interface o_prompts { - 'code'?: string | null; - 'customValue'?: string | null; - 'defaultValue'?: string | null; - 'id'?: number; - 'name'?: string | null; - 'parentCode'?: string | null; - 'type'?: string | null; -} export interface o_script { 'content'?: string | null; 'createTime'?: number | null; @@ -142,35 +104,15 @@ export interface o_script { 'name'?: string | null; 'projectId'?: number | null; } -export interface o_scriptAssets { - 'assetsId'?: number | null; - 'id'?: number; - 'scriptId'?: number | null; -} -export interface o_scriptOutline { - 'id'?: number; - 'outlineId'?: number | null; - 'scriptId'?: number | null; -} export interface o_setting { 'key'?: string | null; 'value'?: string | null; } -export interface o_skills { - 'id'?: number; - 'name'?: string | null; - 'startTime'?: number | null; -} export interface o_storyboard { 'createTime'?: number | null; 'id'?: number; 'name'?: string | null; } -export interface o_storyboardScript { - 'id'?: number; - 'scriptId'?: number | null; - 'storyboardId'?: number | null; -} export interface o_tasks { 'describe'?: string | null; 'id'?: number; @@ -199,36 +141,30 @@ export interface o_vendorConfig { 'version'?: string | null; } export interface o_video { - 'configId'?: number | null; 'errorReason'?: string | null; 'filePath'?: string | null; - 'firstFrame'?: string | null; 'id'?: number; + 'mode'?: string | null; 'model'?: string | null; 'prompt'?: string | null; 'resolution'?: string | null; 'scriptId'?: number | null; - 'state'?: number | null; - 'storyboardImgs'?: string | null; + 'state'?: string | null; + 'storyboardId'?: number | null; 'time'?: number | null; } export interface o_videoConfig { - 'aiConfigId'?: number | null; - 'audioEnabled'?: number | null; + 'audio'?: number | null; 'createTime'?: number | null; + 'data'?: string | null; 'duration'?: number | null; - 'endFrame'?: string | null; 'id'?: number; - 'images'?: string | null; - 'manufacturer'?: string | null; 'mode'?: string | null; - 'projectId'?: number | null; + 'model'?: string | null; 'prompt'?: string | null; 'resolution'?: string | null; - 'scriptId'?: number | null; - 'selectedResultId'?: number | null; - 'startFrame'?: string | null; 'updateTime'?: number | null; + 'videoId'?: number | null; } export interface DB { @@ -236,25 +172,17 @@ export interface DB { "o_agentDeploy": o_agentDeploy; "o_artStyle": o_artStyle; "o_assets": o_assets; - "o_chatHistory": o_chatHistory; "o_event": o_event; "o_eventChapter": o_eventChapter; "o_flowData": o_flowData; "o_image": o_image; - "o_model": o_model; - "o_myTasks": o_myTasks; "o_novel": o_novel; "o_outline": o_outline; "o_outlineNovel": o_outlineNovel; "o_project": o_project; - "o_prompts": o_prompts; "o_script": o_script; - "o_scriptAssets": o_scriptAssets; - "o_scriptOutline": o_scriptOutline; "o_setting": o_setting; - "o_skills": o_skills; "o_storyboard": o_storyboard; - "o_storyboardScript": o_storyboardScript; "o_tasks": o_tasks; "o_user": o_user; "o_vendorConfig": o_vendorConfig; diff --git a/src/utils/ai.ts b/src/utils/ai.ts index fa90e1f..f0933f5 100644 --- a/src/utils/ai.ts +++ b/src/utils/ai.ts @@ -117,7 +117,7 @@ interface VideoConfig { storyboardId: number; // 关联的分镜ID systemPrompt?: string; // 系统提示词 prompt: string; //视频提示词 - imageData: string[]; //输入的图片提示词 + data: string[]; //输入的图片提示词 modeData: string; //模式 duration: number; // 视频时长，单位秒 resolution: string; // 视频分辨率 From 84de8b0cd42676a5d8d285d7a838560b804368b4 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Sat, 21 Mar 2026 14:45:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E9=95=9Cflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.ts | 254 +++++++++--------- .../editStoryboard/generateStoryboardImage.ts | 73 ++++- .../editStoryboard/saveStoryboardFlow.ts | 10 +- .../editStoryboard/updateStoryboardFlow.ts | 12 +- src/routes/production/getStoryboardData.ts | 27 ++ src/types/database.d.ts | 13 +- 6 files changed, 254 insertions(+), 135 deletions(-) create mode 100644 src/routes/production/getStoryboardData.ts diff --git a/src/router.ts b/src/router.ts index ebc0e67..9552da9 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,132 +1,140 @@ -// @routes-hash ee45dd26b9149e6eabf834c1fb5cfbb6 +// @routes-hash 3d0673061005074e704638efccc539d1 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; import route2 from "./routes/agents/getMemory"; -import route3 from "./routes/agents/productionAgent"; -import route4 from "./routes/artStyle/getArtStyle"; -import route5 from "./routes/assets/addAssets"; -import route6 from "./routes/assets/batchDelete"; -import route7 from "./routes/assets/batchGenerationData"; -import route8 from "./routes/assets/delAssets"; -import route9 from "./routes/assets/getAssetsApi"; -import route10 from "./routes/assets/getImage"; -import route11 from "./routes/assets/saveAssets"; -import route12 from "./routes/assets/updateAssets"; -import route13 from "./routes/assets/uploadClip"; -import route14 from "./routes/assetsGenerate/generateAssets"; -import route15 from "./routes/assetsGenerate/polishAssetsPrompt"; -import route16 from "./routes/cornerScape/getAllAssets"; -import route17 from "./routes/general/generalStatistics"; -import route18 from "./routes/general/getSingleProject"; -import route19 from "./routes/general/updateProject"; -import route20 from "./routes/login/login"; -import route21 from "./routes/migrate/migrateData"; -import route22 from "./routes/modelSelect/getModelDetail"; -import route23 from "./routes/modelSelect/getModelList"; -import route24 from "./routes/novel/addNovel"; -import route25 from "./routes/novel/batchDeleteNovel"; -import route26 from "./routes/novel/delNovel"; -import route27 from "./routes/novel/event/batchDeleteEvent"; -import route28 from "./routes/novel/event/deletEvent"; -import route29 from "./routes/novel/event/generateEvents"; -import route30 from "./routes/novel/event/getEvent"; -import route31 from "./routes/novel/getNovel"; -import route32 from "./routes/novel/updateNovel"; -import route33 from "./routes/other/deleteAllData"; -import route34 from "./routes/other/getCaptcha"; -import route35 from "./routes/production/getProductionData"; -import route36 from "./routes/production/workbench/generateVideo"; -import route37 from "./routes/production/workbench/getVideoModelDetail"; -import route38 from "./routes/project/addProject"; -import route39 from "./routes/project/delProject"; -import route40 from "./routes/project/editProject"; -import route41 from "./routes/project/getProject"; -import route42 from "./routes/script/addScript"; -import route43 from "./routes/script/delScript"; -import route44 from "./routes/script/getScrptApi"; -import route45 from "./routes/script/updateScript"; -import route46 from "./routes/setting/agentDeploy/deployAgentModel"; -import route47 from "./routes/setting/agentDeploy/getAgentDeploy"; -import route48 from "./routes/setting/agentDeploy/updateKey"; -import route49 from "./routes/setting/dbConfig/clearData"; -import route50 from "./routes/setting/getTextModel"; -import route51 from "./routes/setting/loginConfig/getUser"; -import route52 from "./routes/setting/loginConfig/updateUserPwd"; -import route53 from "./routes/setting/memoryConfig/getMemory"; -import route54 from "./routes/setting/memoryConfig/sureMemory"; -import route55 from "./routes/setting/vendorConfig/addVendor"; -import route56 from "./routes/setting/vendorConfig/deleteVendor"; -import route57 from "./routes/setting/vendorConfig/getVendorList"; -import route58 from "./routes/setting/vendorConfig/modelTest"; -import route59 from "./routes/setting/vendorConfig/updateVendor"; -import route60 from "./routes/task/getMyTaskApi"; -import route61 from "./routes/task/getTaskCategories"; -import route62 from "./routes/task/taskDetails"; -import route63 from "./routes/test/test"; +import route3 from "./routes/artStyle/getArtStyle"; +import route4 from "./routes/assets/addAssets"; +import route5 from "./routes/assets/batchDelete"; +import route6 from "./routes/assets/batchGenerationData"; +import route7 from "./routes/assets/delAssets"; +import route8 from "./routes/assets/getAssetsApi"; +import route9 from "./routes/assets/getImage"; +import route10 from "./routes/assets/saveAssets"; +import route11 from "./routes/assets/updateAssets"; +import route12 from "./routes/assets/uploadClip"; +import route13 from "./routes/assetsGenerate/generateAssets"; +import route14 from "./routes/assetsGenerate/polishAssetsPrompt"; +import route15 from "./routes/cornerScape/getAllAssets"; +import route16 from "./routes/general/generalStatistics"; +import route17 from "./routes/general/getSingleProject"; +import route18 from "./routes/general/updateProject"; +import route19 from "./routes/login/login"; +import route20 from "./routes/migrate/migrateData"; +import route21 from "./routes/modelSelect/getModelDetail"; +import route22 from "./routes/modelSelect/getModelList"; +import route23 from "./routes/novel/addNovel"; +import route24 from "./routes/novel/batchDeleteNovel"; +import route25 from "./routes/novel/delNovel"; +import route26 from "./routes/novel/event/batchDeleteEvent"; +import route27 from "./routes/novel/event/deletEvent"; +import route28 from "./routes/novel/event/generateEvents"; +import route29 from "./routes/novel/event/getEvent"; +import route30 from "./routes/novel/getNovel"; +import route31 from "./routes/novel/updateNovel"; +import route32 from "./routes/other/deleteAllData"; +import route33 from "./routes/other/getCaptcha"; +import route34 from "./routes/production/editStoryboard/generateStoryboardImage"; +import route35 from "./routes/production/editStoryboard/getStoryboardFlow"; +import route36 from "./routes/production/editStoryboard/saveStoryboardFlow"; +import route37 from "./routes/production/editStoryboard/updateStoryboardFlow"; +import route38 from "./routes/production/getProductionData"; +import route39 from "./routes/production/getStoryboardData"; +import route40 from "./routes/production/workbench/generateVideo"; +import route41 from "./routes/production/workbench/getVideoModelDetail"; +import route42 from "./routes/project/addProject"; +import route43 from "./routes/project/delProject"; +import route44 from "./routes/project/editProject"; +import route45 from "./routes/project/getProject"; +import route46 from "./routes/script/addScript"; +import route47 from "./routes/script/delScript"; +import route48 from "./routes/script/getScrptApi"; +import route49 from "./routes/script/updateScript"; +import route50 from "./routes/setting/agentDeploy/deployAgentModel"; +import route51 from "./routes/setting/agentDeploy/getAgentDeploy"; +import route52 from "./routes/setting/agentDeploy/updateKey"; +import route53 from "./routes/setting/dbConfig/clearData"; +import route54 from "./routes/setting/getTextModel"; +import route55 from "./routes/setting/loginConfig/getUser"; +import route56 from "./routes/setting/loginConfig/updateUserPwd"; +import route57 from "./routes/setting/memoryConfig/getMemory"; +import route58 from "./routes/setting/memoryConfig/sureMemory"; +import route59 from "./routes/setting/vendorConfig/addVendor"; +import route60 from "./routes/setting/vendorConfig/deleteVendor"; +import route61 from "./routes/setting/vendorConfig/getVendorList"; +import route62 from "./routes/setting/vendorConfig/modelTest"; +import route63 from "./routes/setting/vendorConfig/updateVendor"; +import route64 from "./routes/task/getMyTaskApi"; +import route65 from "./routes/task/getTaskCategories"; +import route66 from "./routes/task/taskDetails"; +import route67 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); app.use("/api/agents/getMemory", route2); - app.use("/api/agents/productionAgent", route3); - app.use("/api/artStyle/getArtStyle", route4); - app.use("/api/assets/addAssets", route5); - app.use("/api/assets/batchDelete", route6); - app.use("/api/assets/batchGenerationData", route7); - app.use("/api/assets/delAssets", route8); - app.use("/api/assets/getAssetsApi", route9); - app.use("/api/assets/getImage", route10); - app.use("/api/assets/saveAssets", route11); - app.use("/api/assets/updateAssets", route12); - app.use("/api/assets/uploadClip", route13); - app.use("/api/assetsGenerate/generateAssets", route14); - app.use("/api/assetsGenerate/polishAssetsPrompt", route15); - app.use("/api/cornerScape/getAllAssets", route16); - app.use("/api/general/generalStatistics", route17); - app.use("/api/general/getSingleProject", route18); - app.use("/api/general/updateProject", route19); - app.use("/api/login/login", route20); - app.use("/api/migrate/migrateData", route21); - app.use("/api/modelSelect/getModelDetail", route22); - app.use("/api/modelSelect/getModelList", route23); - app.use("/api/novel/addNovel", route24); - app.use("/api/novel/batchDeleteNovel", route25); - app.use("/api/novel/delNovel", route26); - app.use("/api/novel/event/batchDeleteEvent", route27); - app.use("/api/novel/event/deletEvent", route28); - app.use("/api/novel/event/generateEvents", route29); - app.use("/api/novel/event/getEvent", route30); - app.use("/api/novel/getNovel", route31); - app.use("/api/novel/updateNovel", route32); - app.use("/api/other/deleteAllData", route33); - app.use("/api/other/getCaptcha", route34); - app.use("/api/production/getProductionData", route35); - app.use("/api/production/workbench/generateVideo", route36); - app.use("/api/production/workbench/getVideoModelDetail", route37); - app.use("/api/project/addProject", route38); - app.use("/api/project/delProject", route39); - app.use("/api/project/editProject", route40); - app.use("/api/project/getProject", route41); - app.use("/api/script/addScript", route42); - app.use("/api/script/delScript", route43); - app.use("/api/script/getScrptApi", route44); - app.use("/api/script/updateScript", route45); - app.use("/api/setting/agentDeploy/deployAgentModel", route46); - app.use("/api/setting/agentDeploy/getAgentDeploy", route47); - app.use("/api/setting/agentDeploy/updateKey", route48); - app.use("/api/setting/dbConfig/clearData", route49); - app.use("/api/setting/getTextModel", route50); - app.use("/api/setting/loginConfig/getUser", route51); - app.use("/api/setting/loginConfig/updateUserPwd", route52); - app.use("/api/setting/memoryConfig/getMemory", route53); - app.use("/api/setting/memoryConfig/sureMemory", route54); - app.use("/api/setting/vendorConfig/addVendor", route55); - app.use("/api/setting/vendorConfig/deleteVendor", route56); - app.use("/api/setting/vendorConfig/getVendorList", route57); - app.use("/api/setting/vendorConfig/modelTest", route58); - app.use("/api/setting/vendorConfig/updateVendor", route59); - app.use("/api/task/getMyTaskApi", route60); - app.use("/api/task/getTaskCategories", route61); - app.use("/api/task/taskDetails", route62); - app.use("/api/test/test", route63); + app.use("/api/artStyle/getArtStyle", route3); + app.use("/api/assets/addAssets", route4); + app.use("/api/assets/batchDelete", route5); + app.use("/api/assets/batchGenerationData", route6); + app.use("/api/assets/delAssets", route7); + app.use("/api/assets/getAssetsApi", route8); + app.use("/api/assets/getImage", route9); + app.use("/api/assets/saveAssets", route10); + app.use("/api/assets/updateAssets", route11); + app.use("/api/assets/uploadClip", route12); + app.use("/api/assetsGenerate/generateAssets", route13); + app.use("/api/assetsGenerate/polishAssetsPrompt", route14); + app.use("/api/cornerScape/getAllAssets", route15); + app.use("/api/general/generalStatistics", route16); + app.use("/api/general/getSingleProject", route17); + app.use("/api/general/updateProject", route18); + app.use("/api/login/login", route19); + app.use("/api/migrate/migrateData", route20); + app.use("/api/modelSelect/getModelDetail", route21); + app.use("/api/modelSelect/getModelList", route22); + app.use("/api/novel/addNovel", route23); + app.use("/api/novel/batchDeleteNovel", route24); + app.use("/api/novel/delNovel", route25); + app.use("/api/novel/event/batchDeleteEvent", route26); + app.use("/api/novel/event/deletEvent", route27); + app.use("/api/novel/event/generateEvents", route28); + app.use("/api/novel/event/getEvent", route29); + app.use("/api/novel/getNovel", route30); + app.use("/api/novel/updateNovel", route31); + app.use("/api/other/deleteAllData", route32); + app.use("/api/other/getCaptcha", route33); + app.use("/api/production/editStoryboard/generateStoryboardImage", route34); + app.use("/api/production/editStoryboard/getStoryboardFlow", route35); + app.use("/api/production/editStoryboard/saveStoryboardFlow", route36); + app.use("/api/production/editStoryboard/updateStoryboardFlow", route37); + app.use("/api/production/getProductionData", route38); + app.use("/api/production/getStoryboardData", route39); + app.use("/api/production/workbench/generateVideo", route40); + app.use("/api/production/workbench/getVideoModelDetail", route41); + app.use("/api/project/addProject", route42); + app.use("/api/project/delProject", route43); + app.use("/api/project/editProject", route44); + app.use("/api/project/getProject", route45); + app.use("/api/script/addScript", route46); + app.use("/api/script/delScript", route47); + app.use("/api/script/getScrptApi", route48); + app.use("/api/script/updateScript", route49); + app.use("/api/setting/agentDeploy/deployAgentModel", route50); + app.use("/api/setting/agentDeploy/getAgentDeploy", route51); + app.use("/api/setting/agentDeploy/updateKey", route52); + app.use("/api/setting/dbConfig/clearData", route53); + app.use("/api/setting/getTextModel", route54); + app.use("/api/setting/loginConfig/getUser", route55); + app.use("/api/setting/loginConfig/updateUserPwd", route56); + app.use("/api/setting/memoryConfig/getMemory", route57); + app.use("/api/setting/memoryConfig/sureMemory", route58); + app.use("/api/setting/vendorConfig/addVendor", route59); + app.use("/api/setting/vendorConfig/deleteVendor", route60); + app.use("/api/setting/vendorConfig/getVendorList", route61); + app.use("/api/setting/vendorConfig/modelTest", route62); + app.use("/api/setting/vendorConfig/updateVendor", route63); + app.use("/api/task/getMyTaskApi", route64); + app.use("/api/task/getTaskCategories", route65); + app.use("/api/task/taskDetails", route66); + app.use("/api/test/test", route67); } diff --git a/src/routes/production/editStoryboard/generateStoryboardImage.ts b/src/routes/production/editStoryboard/generateStoryboardImage.ts index 31d4db0..9c57f15 100644 --- a/src/routes/production/editStoryboard/generateStoryboardImage.ts +++ b/src/routes/production/editStoryboard/generateStoryboardImage.ts @@ -3,23 +3,88 @@ import u from "@/utils"; import { z } from "zod"; import { success } from "@/lib/responseFormat"; import { validateFields } from "@/middleware/middleware"; +import axios from "axios"; const router = express.Router(); +async function getImageBase64ForId(imageId: string | number) { + const imagePath = await u + .db("o_image") + .select("filePath") + .where({ id: Number(imageId) }) + .first(); + if (!imagePath || !imagePath.filePath) return ""; // 未找到图片路径 + const url = await u.oss.getFileUrl(imagePath.filePath); + return await urlToBase64(url); +} + +async function urlToBase64(imageUrl: string): Promise { + const response = await axios.get(imageUrl, { responseType: "arraybuffer" }); + const contentType = response.headers["content-type"] || "image/png"; + const base64 = Buffer.from(response.data, "binary").toString("base64"); + return `data:${contentType};base64,${base64}`; +} +// 将图片ID和指令转换为base64数组和替换后的指令 +async function convertDirectiveAndImages(images: Record, directive: string) { + // step1: 列出所有别名 + const aliasList = Object.keys(images); + // step2: 在指令中提取所有 @别名出现 + const aliasRegex = /@[\u4e00-\u9fa5\w]+/g; + const referencedAliases = directive.match(aliasRegex) || []; + // step3: 检查别名 + for (const alias of referencedAliases) { + if (!(alias in images)) { + throw new Error(`您引用了不存在的图片：${alias}`); + } + } + // step4: 构建别名与顺序编号映射 + const aliasToIndex: Record = {}; + aliasList.forEach((alias, i) => { + aliasToIndex[alias] = i + 1; + }); + // step5: 替换指令中的别名为"图N" + let prompt = directive; + for (const [alias, idx] of Object.entries(aliasToIndex)) { + // 转义alias可能含特殊字符 + const reg = new RegExp(alias.replace(/([.*+?^${}()|\[\]\/\\])/g, "\\$1"), "g"); + prompt = prompt.replace(reg, `图${idx}`); + } + // step6: 依次获取图片 base64 内容（区分id或者本身就是base64） + const base64Images: string[] = []; + + for (const imageVal of Object.values(images)) { + // 判断是否为base64串 + const isBase64 = typeof imageVal === "string" && /^data:image\//.test(imageVal); + if (isBase64) { + base64Images.push(imageVal); + } else if (typeof imageVal === "number") { + const base64 = await getImageBase64ForId(imageVal); + base64Images.push(base64); + } else if (imageVal.includes("http")) { + const base64 = await urlToBase64(imageVal); + base64Images.push(base64); + } + } + return { + prompt, + images: base64Images, + }; +} export default router.post( "/", validateFields({ model: z.string(), - references: z.array(z.string()).optional(), + references: z.object().optional(), quality: z.string(), ratio: z.string(), prompt: z.string(), projectId: z.number(), }), async (req, res) => { - const { model, references = [], quality, ratio, prompt, projectId } = req.body; + const { model, references = {}, quality, ratio, prompt, projectId } = req.body; + const { prompt: userPrompt, images: base64Images } = await convertDirectiveAndImages(references, prompt); const imageClass = await u.Ai.Image(model).run({ - prompt: prompt, - imageBase64: references, + prompt: userPrompt, + imageBase64: base64Images, size: quality, aspectRatio: ratio, taskClass: "分镜生成", diff --git a/src/routes/production/editStoryboard/saveStoryboardFlow.ts b/src/routes/production/editStoryboard/saveStoryboardFlow.ts index 920bd48..ca7b610 100644 --- a/src/routes/production/editStoryboard/saveStoryboardFlow.ts +++ b/src/routes/production/editStoryboard/saveStoryboardFlow.ts @@ -10,16 +10,18 @@ export default router.post( validateFields({ edges: z.any(), nodes: z.any(), - imageId: z.number(), + imageUrl: z.number(), }), async (req, res) => { - const { edges, nodes, imageId } = req.body; + const { edges, nodes, imageUrl } = req.body; + if (!imageUrl.includes("http")) { + return res.status(400).send({ message: "图片地址不合法" }); + } // if const [id] = await u.db("o_storyboad").insert({ - imageId, + filePath: new URL(imageUrl).pathname, }); await u.db("o_storyboardFlow").insert({ - id: 1, stroryboardId: id, flowData: JSON.stringify({ edges, nodes }), }); diff --git a/src/routes/production/editStoryboard/updateStoryboardFlow.ts b/src/routes/production/editStoryboard/updateStoryboardFlow.ts index 0174a25..b6d5812 100644 --- a/src/routes/production/editStoryboard/updateStoryboardFlow.ts +++ b/src/routes/production/editStoryboard/updateStoryboardFlow.ts @@ -11,12 +11,18 @@ export default router.post( edges: z.any(), nodes: z.any(), id: z.number(), - imageId: z.number(), + imageUrl: z.number(), }), async (req, res) => { - const { edges, nodes, id, imageId } = req.body; + const { edges, nodes, id, imageUrl } = req.body; + if (!imageUrl.includes("http")) { + return res.status(400).send({ message: "图片地址不合法" }); + } // if - await u.db("o_storyboard").where("id", id).update({ imageId }); + await u + .db("o_storyboard") + .where("id", id) + .update({ filePath: new URL(imageUrl).pathname }); await u .db("o_storyboardFlow") .where("stroryboardId", id) diff --git a/src/routes/production/getStoryboardData.ts b/src/routes/production/getStoryboardData.ts new file mode 100644 index 0000000..4d5dc5d --- /dev/null +++ b/src/routes/production/getStoryboardData.ts @@ -0,0 +1,27 @@ +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({ + projectId: z.number(), + }), + async (req, res) => { + const { projectId } = req.body; + const storyboardData = await u.db("o_storyboard"); + console.log("%c Line:16 🍖 storyboardData", "background:#ed9ec7", storyboardData); + const data = await Promise.all( + storyboardData.map(async (i) => { + return { + ...i, + image: i.filePath ? await u.oss.getFileUrl(i.filePath!) : "", + }; + }), + ); + res.status(200).send(success(data)); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 4c3b490..775ad75 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash feca77a2c2ec5b6a2989347f982558d5 +// @db-hash 8af8e41e3ca0cb5ee554944515d72ba8 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -163,8 +163,18 @@ export interface o_skills { } export interface o_storyboard { 'createTime'?: number | null; + 'detail'?: string | null; + 'filePath'?: string | null; + 'frameType'?: string | null; 'id'?: number; 'name'?: string | null; + 'prompt'?: string | null; + 'seconds'?: string | null; +} +export interface o_storyboardFlow { + 'flowData': string; + 'id'?: number; + 'stroryboardId': number; } export interface o_storyboardScript { 'id'?: number; @@ -254,6 +264,7 @@ export interface DB { "o_setting": o_setting; "o_skills": o_skills; "o_storyboard": o_storyboard; + "o_storyboardFlow": o_storyboardFlow; "o_storyboardScript": o_storyboardScript; "o_tasks": o_tasks; "o_user": o_user;