修复生成视频失败问题
This commit is contained in:
parent
248dc724d4
commit
0d3958eb0c
128
src/router.ts
128
src/router.ts
@ -1,4 +1,4 @@
|
|||||||
// @routes-hash 758e343e27eb25780faf00eeab306216
|
// @routes-hash 8097a5206252be753261d3f059243260
|
||||||
import { Express } from "express";
|
import { Express } from "express";
|
||||||
|
|
||||||
import route1 from "./routes/agents/clearMemory";
|
import route1 from "./routes/agents/clearMemory";
|
||||||
@ -66,37 +66,38 @@ import route62 from "./routes/project/getProject";
|
|||||||
import route63 from "./routes/script/addScript";
|
import route63 from "./routes/script/addScript";
|
||||||
import route64 from "./routes/script/delScript";
|
import route64 from "./routes/script/delScript";
|
||||||
import route65 from "./routes/script/exportScript";
|
import route65 from "./routes/script/exportScript";
|
||||||
import route66 from "./routes/script/getScrptApi";
|
import route66 from "./routes/script/extractAssets";
|
||||||
import route67 from "./routes/script/updateScript";
|
import route67 from "./routes/script/getScrptApi";
|
||||||
import route68 from "./routes/scriptAgent/getPlanData";
|
import route68 from "./routes/script/updateScript";
|
||||||
import route69 from "./routes/scriptAgent/setPlanData";
|
import route69 from "./routes/scriptAgent/getPlanData";
|
||||||
import route70 from "./routes/setting/agentDeploy/agentSetKey";
|
import route70 from "./routes/scriptAgent/setPlanData";
|
||||||
import route71 from "./routes/setting/agentDeploy/deployAgentModel";
|
import route71 from "./routes/setting/agentDeploy/agentSetKey";
|
||||||
import route72 from "./routes/setting/agentDeploy/getAgentDeploy";
|
import route72 from "./routes/setting/agentDeploy/deployAgentModel";
|
||||||
import route73 from "./routes/setting/dbConfig/clearData";
|
import route73 from "./routes/setting/agentDeploy/getAgentDeploy";
|
||||||
import route74 from "./routes/setting/fileManagement/openFolder";
|
import route74 from "./routes/setting/dbConfig/clearData";
|
||||||
import route75 from "./routes/setting/getTextModel";
|
import route75 from "./routes/setting/fileManagement/openFolder";
|
||||||
import route76 from "./routes/setting/loginConfig/getUser";
|
import route76 from "./routes/setting/getTextModel";
|
||||||
import route77 from "./routes/setting/loginConfig/updateUserPwd";
|
import route77 from "./routes/setting/loginConfig/getUser";
|
||||||
import route78 from "./routes/setting/memoryConfig/delAllMemory";
|
import route78 from "./routes/setting/loginConfig/updateUserPwd";
|
||||||
import route79 from "./routes/setting/memoryConfig/getMemory";
|
import route79 from "./routes/setting/memoryConfig/delAllMemory";
|
||||||
import route80 from "./routes/setting/memoryConfig/sureMemory";
|
import route80 from "./routes/setting/memoryConfig/getMemory";
|
||||||
import route81 from "./routes/setting/skillManagement/addSkill";
|
import route81 from "./routes/setting/memoryConfig/sureMemory";
|
||||||
import route82 from "./routes/setting/skillManagement/deleteSkill";
|
import route82 from "./routes/setting/skillManagement/addSkill";
|
||||||
import route83 from "./routes/setting/skillManagement/embeddingSkill";
|
import route83 from "./routes/setting/skillManagement/deleteSkill";
|
||||||
import route84 from "./routes/setting/skillManagement/generateDescription";
|
import route84 from "./routes/setting/skillManagement/embeddingSkill";
|
||||||
import route85 from "./routes/setting/skillManagement/getSkillList";
|
import route85 from "./routes/setting/skillManagement/generateDescription";
|
||||||
import route86 from "./routes/setting/skillManagement/scanSkills";
|
import route86 from "./routes/setting/skillManagement/getSkillList";
|
||||||
import route87 from "./routes/setting/skillManagement/updateSkill";
|
import route87 from "./routes/setting/skillManagement/scanSkills";
|
||||||
import route88 from "./routes/setting/vendorConfig/addVendor";
|
import route88 from "./routes/setting/skillManagement/updateSkill";
|
||||||
import route89 from "./routes/setting/vendorConfig/deleteVendor";
|
import route89 from "./routes/setting/vendorConfig/addVendor";
|
||||||
import route90 from "./routes/setting/vendorConfig/getVendorList";
|
import route90 from "./routes/setting/vendorConfig/deleteVendor";
|
||||||
import route91 from "./routes/setting/vendorConfig/modelTest";
|
import route91 from "./routes/setting/vendorConfig/getVendorList";
|
||||||
import route92 from "./routes/setting/vendorConfig/updateVendor";
|
import route92 from "./routes/setting/vendorConfig/modelTest";
|
||||||
import route93 from "./routes/task/getTaskApi";
|
import route93 from "./routes/setting/vendorConfig/updateVendor";
|
||||||
import route94 from "./routes/task/getTaskCategories";
|
import route94 from "./routes/task/getTaskApi";
|
||||||
import route95 from "./routes/task/taskDetails";
|
import route95 from "./routes/task/getTaskCategories";
|
||||||
import route96 from "./routes/test/test";
|
import route96 from "./routes/task/taskDetails";
|
||||||
|
import route97 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);
|
||||||
@ -164,35 +165,36 @@ export default async (app: Express) => {
|
|||||||
app.use("/api/script/addScript", route63);
|
app.use("/api/script/addScript", route63);
|
||||||
app.use("/api/script/delScript", route64);
|
app.use("/api/script/delScript", route64);
|
||||||
app.use("/api/script/exportScript", route65);
|
app.use("/api/script/exportScript", route65);
|
||||||
app.use("/api/script/getScrptApi", route66);
|
app.use("/api/script/extractAssets", route66);
|
||||||
app.use("/api/script/updateScript", route67);
|
app.use("/api/script/getScrptApi", route67);
|
||||||
app.use("/api/scriptAgent/getPlanData", route68);
|
app.use("/api/script/updateScript", route68);
|
||||||
app.use("/api/scriptAgent/setPlanData", route69);
|
app.use("/api/scriptAgent/getPlanData", route69);
|
||||||
app.use("/api/setting/agentDeploy/agentSetKey", route70);
|
app.use("/api/scriptAgent/setPlanData", route70);
|
||||||
app.use("/api/setting/agentDeploy/deployAgentModel", route71);
|
app.use("/api/setting/agentDeploy/agentSetKey", route71);
|
||||||
app.use("/api/setting/agentDeploy/getAgentDeploy", route72);
|
app.use("/api/setting/agentDeploy/deployAgentModel", route72);
|
||||||
app.use("/api/setting/dbConfig/clearData", route73);
|
app.use("/api/setting/agentDeploy/getAgentDeploy", route73);
|
||||||
app.use("/api/setting/fileManagement/openFolder", route74);
|
app.use("/api/setting/dbConfig/clearData", route74);
|
||||||
app.use("/api/setting/getTextModel", route75);
|
app.use("/api/setting/fileManagement/openFolder", route75);
|
||||||
app.use("/api/setting/loginConfig/getUser", route76);
|
app.use("/api/setting/getTextModel", route76);
|
||||||
app.use("/api/setting/loginConfig/updateUserPwd", route77);
|
app.use("/api/setting/loginConfig/getUser", route77);
|
||||||
app.use("/api/setting/memoryConfig/delAllMemory", route78);
|
app.use("/api/setting/loginConfig/updateUserPwd", route78);
|
||||||
app.use("/api/setting/memoryConfig/getMemory", route79);
|
app.use("/api/setting/memoryConfig/delAllMemory", route79);
|
||||||
app.use("/api/setting/memoryConfig/sureMemory", route80);
|
app.use("/api/setting/memoryConfig/getMemory", route80);
|
||||||
app.use("/api/setting/skillManagement/addSkill", route81);
|
app.use("/api/setting/memoryConfig/sureMemory", route81);
|
||||||
app.use("/api/setting/skillManagement/deleteSkill", route82);
|
app.use("/api/setting/skillManagement/addSkill", route82);
|
||||||
app.use("/api/setting/skillManagement/embeddingSkill", route83);
|
app.use("/api/setting/skillManagement/deleteSkill", route83);
|
||||||
app.use("/api/setting/skillManagement/generateDescription", route84);
|
app.use("/api/setting/skillManagement/embeddingSkill", route84);
|
||||||
app.use("/api/setting/skillManagement/getSkillList", route85);
|
app.use("/api/setting/skillManagement/generateDescription", route85);
|
||||||
app.use("/api/setting/skillManagement/scanSkills", route86);
|
app.use("/api/setting/skillManagement/getSkillList", route86);
|
||||||
app.use("/api/setting/skillManagement/updateSkill", route87);
|
app.use("/api/setting/skillManagement/scanSkills", route87);
|
||||||
app.use("/api/setting/vendorConfig/addVendor", route88);
|
app.use("/api/setting/skillManagement/updateSkill", route88);
|
||||||
app.use("/api/setting/vendorConfig/deleteVendor", route89);
|
app.use("/api/setting/vendorConfig/addVendor", route89);
|
||||||
app.use("/api/setting/vendorConfig/getVendorList", route90);
|
app.use("/api/setting/vendorConfig/deleteVendor", route90);
|
||||||
app.use("/api/setting/vendorConfig/modelTest", route91);
|
app.use("/api/setting/vendorConfig/getVendorList", route91);
|
||||||
app.use("/api/setting/vendorConfig/updateVendor", route92);
|
app.use("/api/setting/vendorConfig/modelTest", route92);
|
||||||
app.use("/api/task/getTaskApi", route93);
|
app.use("/api/setting/vendorConfig/updateVendor", route93);
|
||||||
app.use("/api/task/getTaskCategories", route94);
|
app.use("/api/task/getTaskApi", route94);
|
||||||
app.use("/api/task/taskDetails", route95);
|
app.use("/api/task/getTaskCategories", route95);
|
||||||
app.use("/api/test/test", route96);
|
app.use("/api/task/taskDetails", route96);
|
||||||
|
app.use("/api/test/test", route97);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,7 +29,8 @@ export default router.post(
|
|||||||
}),
|
}),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, mode } = req.body;
|
const { scriptId, projectId, storyboardId, prompt, data, model, duration, resolution, audio, mode } = req.body;
|
||||||
|
//获取生成视频比例
|
||||||
|
const ratio = await u.db("o_project").select("videoRatio").where("id", projectId).first();
|
||||||
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
|
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
|
||||||
//新增
|
//新增
|
||||||
const videoData = {
|
const videoData = {
|
||||||
@ -109,6 +110,7 @@ export default router.post(
|
|||||||
imageBase64: base64.filter((item) => item !== null) as string[],
|
imageBase64: base64.filter((item) => item !== null) as string[],
|
||||||
mode,
|
mode,
|
||||||
duration,
|
duration,
|
||||||
|
aspectRatio: (ratio?.videoRatio as `${number}:${number}`) || "16:9",
|
||||||
resolution,
|
resolution,
|
||||||
audio,
|
audio,
|
||||||
taskClass: "视频生成",
|
taskClass: "视频生成",
|
||||||
|
|||||||
@ -14,7 +14,6 @@ export default router.post(
|
|||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
const { scriptId, specifyIds } = req.body;
|
const { scriptId, specifyIds } = req.body;
|
||||||
const data = await u.db("o_video").where("scriptId", scriptId).whereIn("id", specifyIds).andWhere("state", "生成中").select("*");
|
const data = await u.db("o_video").where("scriptId", scriptId).whereIn("id", specifyIds).andWhere("state", "生成中").select("*");
|
||||||
console.log("%c Line:17 🧀 data", "background:#93c0a4", data.length);
|
|
||||||
res.status(200).send(success(data));
|
res.status(200).send(success(data));
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@ -30,6 +30,7 @@ export default function runCode(code: string) {
|
|||||||
urlToBase64,
|
urlToBase64,
|
||||||
mergeImages,
|
mergeImages,
|
||||||
pollTask,
|
pollTask,
|
||||||
|
fetch,
|
||||||
exports,
|
exports,
|
||||||
axios,
|
axios,
|
||||||
FormData,
|
FormData,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user