Merge branch 'develop' of https://github.com/HBAI-Ltd/Toonflow-app into develop

# Conflicts:
#	src/router.ts
This commit is contained in:
ACT丶流星雨 2026-04-13 20:04:29 +08:00
commit 0d6cea0155
6 changed files with 174 additions and 147 deletions

View File

@ -327,7 +327,7 @@ const videoRequest = async (config: VideoConfig, model: VideoModel): Promise<str
const lowerName = model.modelName.toLowerCase(); const lowerName = model.modelName.toLowerCase();
// 当前激活的单一 VideoMode取第一个非数组模式或数组模式 // 当前激活的单一 VideoMode取第一个非数组模式或数组模式
const activeMode = config.mode[0]; const activeMode = config.mode;
const imageRefs = (config.referenceList ?? []).filter((r) => r.type === "image").map((r) => r.base64); const imageRefs = (config.referenceList ?? []).filter((r) => r.type === "image").map((r) => r.base64);
const videoRefs = (config.referenceList ?? []).filter((r) => r.type === "video").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); const audioRefs = (config.referenceList ?? []).filter((r) => r.type === "audio").map((r) => r.base64);

View File

@ -1,4 +1,4 @@
// @routes-hash c02f29c05205a2e88fe50767bb47c392 // @routes-hash 1d8352259c4b1c7d0fa4accd1acfedf0
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -80,78 +80,75 @@ import route76 from "./routes/production/workbench/deleteTrack";
import route77 from "./routes/production/workbench/delVideo"; import route77 from "./routes/production/workbench/delVideo";
import route78 from "./routes/production/workbench/generateVideo"; import route78 from "./routes/production/workbench/generateVideo";
import route79 from "./routes/production/workbench/generateVideoPrompt"; import route79 from "./routes/production/workbench/generateVideoPrompt";
import route80 from "./routes/production/workbench/getGenerateData"; import route80 from "./routes/production/workbench/getFileUrl";
import route81 from "./routes/production/workbench/getVideoList"; import route81 from "./routes/production/workbench/getGenerateData";
import route82 from "./routes/production/workbench/selectVideo"; import route82 from "./routes/production/workbench/getVideoList";
import route83 from "./routes/production/workbench/updateVideoPrompt"; import route83 from "./routes/production/workbench/selectVideo";
import route84 from "./routes/project/addDirectorManual"; import route84 from "./routes/production/workbench/updateVideoPrompt";
import route85 from "./routes/project/addProject"; import route85 from "./routes/project/addDirectorManual";
import route86 from "./routes/project/addVisualManual"; import route86 from "./routes/project/addProject";
import route87 from "./routes/project/deleteDirectorManual"; import route87 from "./routes/project/addVisualManual";
import route88 from "./routes/project/deleteVisualManual"; import route88 from "./routes/project/deleteDirectorManual";
import route89 from "./routes/project/delProject"; import route89 from "./routes/project/deleteVisualManual";
import route90 from "./routes/project/editDirectorlManual"; import route90 from "./routes/project/delProject";
import route91 from "./routes/project/editProject"; import route91 from "./routes/project/editDirectorlManual";
import route92 from "./routes/project/editVisualManual"; import route92 from "./routes/project/editProject";
import route93 from "./routes/project/getModelDetails"; import route93 from "./routes/project/editVisualManual";
import route94 from "./routes/project/getProject"; import route94 from "./routes/project/getModelDetails";
import route95 from "./routes/project/getVisualManual"; import route95 from "./routes/project/getProject";
import route96 from "./routes/project/queryDirectorManual"; import route96 from "./routes/project/getVisualManual";
import route97 from "./routes/project/visualManual"; import route97 from "./routes/project/queryDirectorManual";
import route98 from "./routes/script/addScript"; import route98 from "./routes/project/visualManual";
import route99 from "./routes/script/batchAddScript"; import route99 from "./routes/script/addScript";
import route100 from "./routes/script/delScript"; import route100 from "./routes/script/batchAddScript";
import route101 from "./routes/script/exportScript"; import route101 from "./routes/script/delScript";
import route102 from "./routes/script/extractAssets"; import route102 from "./routes/script/exportScript";
import route103 from "./routes/script/getAiRegex"; import route103 from "./routes/script/extractAssets";
import route104 from "./routes/script/getScrptApi"; import route104 from "./routes/script/getAiRegex";
import route105 from "./routes/script/pollScriptAssets"; import route105 from "./routes/script/getScrptApi";
import route106 from "./routes/script/updateScript"; import route106 from "./routes/script/pollScriptAssets";
import route107 from "./routes/scriptAgent/getPlanData"; import route107 from "./routes/script/updateScript";
import route108 from "./routes/scriptAgent/setPlanData"; import route108 from "./routes/scriptAgent/getPlanData";
import route109 from "./routes/scriptAgent/updateData"; import route109 from "./routes/scriptAgent/setPlanData";
import route110 from "./routes/setting/about/checkUpdate"; import route110 from "./routes/scriptAgent/updateData";
import route111 from "./routes/setting/about/downloadApp"; import route111 from "./routes/setting/about/checkUpdate";
import route112 from "./routes/setting/agentDeploy/agentSetKey"; import route112 from "./routes/setting/about/downloadApp";
import route113 from "./routes/setting/agentDeploy/deployAgentModel"; import route113 from "./routes/setting/agentDeploy/agentSetKey";
import route114 from "./routes/setting/agentDeploy/getAgentDeploy"; import route114 from "./routes/setting/agentDeploy/deployAgentModel";
import route115 from "./routes/setting/dbConfig/clearData"; import route115 from "./routes/setting/agentDeploy/getAgentDeploy";
import route116 from "./routes/setting/dbConfig/clearTable"; import route116 from "./routes/setting/dbConfig/clearData";
import route117 from "./routes/setting/dbConfig/dbInfo"; import route117 from "./routes/setting/dev/getSwitchAiDevTool";
import route118 from "./routes/setting/dbConfig/exportData"; import route118 from "./routes/setting/dev/updateSwitchAiDevTool";
import route119 from "./routes/setting/dbConfig/importData"; import route119 from "./routes/setting/fileManagement/openFolder";
import route120 from "./routes/setting/dev/getSwitchAiDevTool"; import route120 from "./routes/setting/getTextModel";
import route121 from "./routes/setting/dev/updateSwitchAiDevTool"; import route121 from "./routes/setting/loginConfig/getUser";
import route122 from "./routes/setting/fileManagement/openFolder"; import route122 from "./routes/setting/loginConfig/updateUserPwd";
import route123 from "./routes/setting/getTextModel"; import route123 from "./routes/setting/memoryConfig/delAllMemory";
import route124 from "./routes/setting/loginConfig/getUser"; import route124 from "./routes/setting/memoryConfig/getMemory";
import route125 from "./routes/setting/loginConfig/updateUserPwd"; import route125 from "./routes/setting/memoryConfig/sureMemory";
import route126 from "./routes/setting/memoryConfig/delAllMemory"; import route126 from "./routes/setting/modelMap/bindingPrompt";
import route127 from "./routes/setting/memoryConfig/getMemory"; import route127 from "./routes/setting/modelMap/getImageAndVideoModel";
import route128 from "./routes/setting/memoryConfig/sureMemory"; import route128 from "./routes/setting/promptManage/getPrompt";
import route129 from "./routes/setting/modelMap/bindingPrompt"; import route129 from "./routes/setting/promptManage/updatePrompt";
import route130 from "./routes/setting/modelMap/getImageAndVideoModel"; import route130 from "./routes/setting/skillManagement/getSkillContent";
import route131 from "./routes/setting/promptManage/getPrompt"; import route131 from "./routes/setting/skillManagement/getSkillList";
import route132 from "./routes/setting/promptManage/updatePrompt"; import route132 from "./routes/setting/skillManagement/saveSkillContent";
import route133 from "./routes/setting/skillManagement/getSkillContent"; import route133 from "./routes/setting/vendorConfig/addVendor";
import route134 from "./routes/setting/skillManagement/getSkillList"; import route134 from "./routes/setting/vendorConfig/addVendorModel";
import route135 from "./routes/setting/skillManagement/saveSkillContent"; import route135 from "./routes/setting/vendorConfig/deleteVendor";
import route136 from "./routes/setting/vendorConfig/addVendor"; import route136 from "./routes/setting/vendorConfig/delVendorModel";
import route137 from "./routes/setting/vendorConfig/addVendorModel"; import route137 from "./routes/setting/vendorConfig/enableVendor";
import route138 from "./routes/setting/vendorConfig/deleteVendor"; import route138 from "./routes/setting/vendorConfig/getCodeByLink";
import route139 from "./routes/setting/vendorConfig/delVendorModel"; import route139 from "./routes/setting/vendorConfig/getVendorList";
import route140 from "./routes/setting/vendorConfig/enableVendor"; import route140 from "./routes/setting/vendorConfig/modelTest";
import route141 from "./routes/setting/vendorConfig/getCodeByLink"; import route141 from "./routes/setting/vendorConfig/updateCode";
import route142 from "./routes/setting/vendorConfig/getVendorList"; import route142 from "./routes/setting/vendorConfig/updateVendorInputs";
import route143 from "./routes/setting/vendorConfig/modelTest"; import route143 from "./routes/setting/vendorConfig/upVendorModel";
import route144 from "./routes/setting/vendorConfig/updateCode"; import route144 from "./routes/task/getProject";
import route145 from "./routes/setting/vendorConfig/updateVendorInputs"; import route145 from "./routes/task/getTaskApi";
import route146 from "./routes/setting/vendorConfig/upVendorModel"; import route146 from "./routes/task/getTaskCategories";
import route147 from "./routes/task/getProject"; import route147 from "./routes/task/taskDetails";
import route148 from "./routes/task/getTaskApi"; import route148 from "./routes/test/test";
import route149 from "./routes/task/getTaskCategories";
import route150 from "./routes/task/taskDetails";
import route151 from "./routes/test/test";
export default async (app: Express) => { export default async (app: Express) => {
app.use("/api/agents/clearMemory", route1); app.use("/api/agents/clearMemory", route1);
@ -233,76 +230,73 @@ export default async (app: Express) => {
app.use("/api/production/workbench/delVideo", route77); app.use("/api/production/workbench/delVideo", route77);
app.use("/api/production/workbench/generateVideo", route78); app.use("/api/production/workbench/generateVideo", route78);
app.use("/api/production/workbench/generateVideoPrompt", route79); app.use("/api/production/workbench/generateVideoPrompt", route79);
app.use("/api/production/workbench/getGenerateData", route80); app.use("/api/production/workbench/getFileUrl", route80);
app.use("/api/production/workbench/getVideoList", route81); app.use("/api/production/workbench/getGenerateData", route81);
app.use("/api/production/workbench/selectVideo", route82); app.use("/api/production/workbench/getVideoList", route82);
app.use("/api/production/workbench/updateVideoPrompt", route83); app.use("/api/production/workbench/selectVideo", route83);
app.use("/api/project/addDirectorManual", route84); app.use("/api/production/workbench/updateVideoPrompt", route84);
app.use("/api/project/addProject", route85); app.use("/api/project/addDirectorManual", route85);
app.use("/api/project/addVisualManual", route86); app.use("/api/project/addProject", route86);
app.use("/api/project/deleteDirectorManual", route87); app.use("/api/project/addVisualManual", route87);
app.use("/api/project/deleteVisualManual", route88); app.use("/api/project/deleteDirectorManual", route88);
app.use("/api/project/delProject", route89); app.use("/api/project/deleteVisualManual", route89);
app.use("/api/project/editDirectorlManual", route90); app.use("/api/project/delProject", route90);
app.use("/api/project/editProject", route91); app.use("/api/project/editDirectorlManual", route91);
app.use("/api/project/editVisualManual", route92); app.use("/api/project/editProject", route92);
app.use("/api/project/getModelDetails", route93); app.use("/api/project/editVisualManual", route93);
app.use("/api/project/getProject", route94); app.use("/api/project/getModelDetails", route94);
app.use("/api/project/getVisualManual", route95); app.use("/api/project/getProject", route95);
app.use("/api/project/queryDirectorManual", route96); app.use("/api/project/getVisualManual", route96);
app.use("/api/project/visualManual", route97); app.use("/api/project/queryDirectorManual", route97);
app.use("/api/script/addScript", route98); app.use("/api/project/visualManual", route98);
app.use("/api/script/batchAddScript", route99); app.use("/api/script/addScript", route99);
app.use("/api/script/delScript", route100); app.use("/api/script/batchAddScript", route100);
app.use("/api/script/exportScript", route101); app.use("/api/script/delScript", route101);
app.use("/api/script/extractAssets", route102); app.use("/api/script/exportScript", route102);
app.use("/api/script/getAiRegex", route103); app.use("/api/script/extractAssets", route103);
app.use("/api/script/getScrptApi", route104); app.use("/api/script/getAiRegex", route104);
app.use("/api/script/pollScriptAssets", route105); app.use("/api/script/getScrptApi", route105);
app.use("/api/script/updateScript", route106); app.use("/api/script/pollScriptAssets", route106);
app.use("/api/scriptAgent/getPlanData", route107); app.use("/api/script/updateScript", route107);
app.use("/api/scriptAgent/setPlanData", route108); app.use("/api/scriptAgent/getPlanData", route108);
app.use("/api/scriptAgent/updateData", route109); app.use("/api/scriptAgent/setPlanData", route109);
app.use("/api/setting/about/checkUpdate", route110); app.use("/api/scriptAgent/updateData", route110);
app.use("/api/setting/about/downloadApp", route111); app.use("/api/setting/about/checkUpdate", route111);
app.use("/api/setting/agentDeploy/agentSetKey", route112); app.use("/api/setting/about/downloadApp", route112);
app.use("/api/setting/agentDeploy/deployAgentModel", route113); app.use("/api/setting/agentDeploy/agentSetKey", route113);
app.use("/api/setting/agentDeploy/getAgentDeploy", route114); app.use("/api/setting/agentDeploy/deployAgentModel", route114);
app.use("/api/setting/dbConfig/clearData", route115); app.use("/api/setting/agentDeploy/getAgentDeploy", route115);
app.use("/api/setting/dbConfig/clearTable", route116); app.use("/api/setting/dbConfig/clearData", route116);
app.use("/api/setting/dbConfig/dbInfo", route117); app.use("/api/setting/dev/getSwitchAiDevTool", route117);
app.use("/api/setting/dbConfig/exportData", route118); app.use("/api/setting/dev/updateSwitchAiDevTool", route118);
app.use("/api/setting/dbConfig/importData", route119); app.use("/api/setting/fileManagement/openFolder", route119);
app.use("/api/setting/dev/getSwitchAiDevTool", route120); app.use("/api/setting/getTextModel", route120);
app.use("/api/setting/dev/updateSwitchAiDevTool", route121); app.use("/api/setting/loginConfig/getUser", route121);
app.use("/api/setting/fileManagement/openFolder", route122); app.use("/api/setting/loginConfig/updateUserPwd", route122);
app.use("/api/setting/getTextModel", route123); app.use("/api/setting/memoryConfig/delAllMemory", route123);
app.use("/api/setting/loginConfig/getUser", route124); app.use("/api/setting/memoryConfig/getMemory", route124);
app.use("/api/setting/loginConfig/updateUserPwd", route125); app.use("/api/setting/memoryConfig/sureMemory", route125);
app.use("/api/setting/memoryConfig/delAllMemory", route126); app.use("/api/setting/modelMap/bindingPrompt", route126);
app.use("/api/setting/memoryConfig/getMemory", route127); app.use("/api/setting/modelMap/getImageAndVideoModel", route127);
app.use("/api/setting/memoryConfig/sureMemory", route128); app.use("/api/setting/promptManage/getPrompt", route128);
app.use("/api/setting/modelMap/bindingPrompt", route129); app.use("/api/setting/promptManage/updatePrompt", route129);
app.use("/api/setting/modelMap/getImageAndVideoModel", route130); app.use("/api/setting/skillManagement/getSkillContent", route130);
app.use("/api/setting/promptManage/getPrompt", route131); app.use("/api/setting/skillManagement/getSkillList", route131);
app.use("/api/setting/promptManage/updatePrompt", route132); app.use("/api/setting/skillManagement/saveSkillContent", route132);
app.use("/api/setting/skillManagement/getSkillContent", route133); app.use("/api/setting/vendorConfig/addVendor", route133);
app.use("/api/setting/skillManagement/getSkillList", route134); app.use("/api/setting/vendorConfig/addVendorModel", route134);
app.use("/api/setting/skillManagement/saveSkillContent", route135); app.use("/api/setting/vendorConfig/deleteVendor", route135);
app.use("/api/setting/vendorConfig/addVendor", route136); app.use("/api/setting/vendorConfig/delVendorModel", route136);
app.use("/api/setting/vendorConfig/addVendorModel", route137); app.use("/api/setting/vendorConfig/enableVendor", route137);
app.use("/api/setting/vendorConfig/deleteVendor", route138); app.use("/api/setting/vendorConfig/getCodeByLink", route138);
app.use("/api/setting/vendorConfig/delVendorModel", route139); app.use("/api/setting/vendorConfig/getVendorList", route139);
app.use("/api/setting/vendorConfig/enableVendor", route140); app.use("/api/setting/vendorConfig/modelTest", route140);
app.use("/api/setting/vendorConfig/getCodeByLink", route141); app.use("/api/setting/vendorConfig/updateCode", route141);
app.use("/api/setting/vendorConfig/getVendorList", route142); app.use("/api/setting/vendorConfig/updateVendorInputs", route142);
app.use("/api/setting/vendorConfig/modelTest", route143); app.use("/api/setting/vendorConfig/upVendorModel", route143);
app.use("/api/setting/vendorConfig/updateCode", route144); app.use("/api/task/getProject", route144);
app.use("/api/setting/vendorConfig/updateVendorInputs", route145); app.use("/api/task/getTaskApi", route145);
app.use("/api/setting/vendorConfig/upVendorModel", route146); app.use("/api/task/getTaskCategories", route146);
app.use("/api/task/getProject", route147); app.use("/api/task/taskDetails", route147);
app.use("/api/task/getTaskApi", route148); app.use("/api/test/test", route148);
app.use("/api/task/getTaskCategories", route149);
app.use("/api/task/taskDetails", route150);
app.use("/api/test/test", route151);
} }

View File

@ -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; const imageBase64 = imageUrlRecord[item.assetsId!] ? await u.oss.getImageBase64(imageUrlRecord[item.assetsId!]) : null;
try { try {
@ -104,7 +105,6 @@ export default router.post(
); );
const savePath = `/${projectId}/assets/${scriptId}/${item.type}/${u.uuid()}.jpg`; const savePath = `/${projectId}/assets/${scriptId}/${item.type}/${u.uuid()}.jpg`;
await imageCls.save(savePath); 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 }); await u.db("o_image").where({ id: imageId }).update({ state: "已完成", filePath: savePath });
return { return {
id: item.id!, id: item.id!,

View File

@ -21,6 +21,11 @@ export default router.post(
node.data.image = node.data.image ? await u.oss.getFileUrl(node.data.image) : ""; node.data.image = node.data.image ? await u.oss.getFileUrl(node.data.image) : "";
} else if (node.type === "generated") { } else if (node.type === "generated") {
node.data.generatedImage = node.data.generatedImage ? await u.oss.getFileUrl(node.data.generatedImage) : ""; 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)
}
});
} }
}), }),
); );

View File

@ -14,12 +14,16 @@ export default router.post(
async (req, res) => { async (req, res) => {
const { edges, nodes } = req.body; const { edges, nodes } = req.body;
nodes.forEach((node: any) => { nodes.forEach((node: any) => {
console.log("%c Line:17 🌮 node", "background:#465975", node);
if (node.type == "upload") { if (node.type == "upload") {
node.data.image = node.data.image ? u.replaceUrl(node.data.image) : ""; node.data.image = node.data.image ? u.replaceUrl(node.data.image) : "";
} }
if (node.type == "generated") { if (node.type == "generated") {
node.data.generatedImage = node.data.generatedImage ? u.replaceUrl(node.data.generatedImage) : ""; 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({ const [insertFlowId] = await u.db("o_imageFlow").insert({

View File

@ -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<string, string> = {};
await Promise.all(
paths.map(async (path: string) => {
result[path] = await u.oss.getFileUrl(path.replace(/^\/oss/, ''));
}))
res.status(200).send(success({ data: result }));
},
);