From 1b7d2b9f8e9d3b9da530d2102942b0dcc59cc330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Sat, 28 Feb 2026 16:36:38 +0800 Subject: [PATCH 1/2] no message --- src/router.ts | 56 ++++++++++--------- .../storyboard/generateStoryboardApi.ts | 4 +- src/utils/editImage.ts | 4 +- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/router.ts b/src/router.ts index 5830e05..cd4946e 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash e13311bd461bd8de8701383106557048 +// @routes-hash c97cf72361299980ea4b0c43549a0de8 import { Express } from "express"; import route1 from "./routes/assets/addAssets"; @@ -69,19 +69,20 @@ import route65 from "./routes/storyboard/uploadImage"; import route66 from "./routes/task/getTaskApi"; import route67 from "./routes/task/taskDetails"; import route68 from "./routes/user/getUser"; -import route69 from "./routes/video/addVideo"; -import route70 from "./routes/video/addVideoConfig"; -import route71 from "./routes/video/deleteVideoConfig"; -import route72 from "./routes/video/generatePrompt"; -import route73 from "./routes/video/generateVideo"; -import route74 from "./routes/video/getManufacturer"; -import route75 from "./routes/video/getVideo"; -import route76 from "./routes/video/getVideoConfigs"; -import route77 from "./routes/video/getVideoModel"; -import route78 from "./routes/video/getVideoStoryboards"; -import route79 from "./routes/video/reviseVideoStoryboards"; -import route80 from "./routes/video/saveVideo"; -import route81 from "./routes/video/upDateVideoConfig"; +import route69 from "./routes/user/saveUser"; +import route70 from "./routes/video/addVideo"; +import route71 from "./routes/video/addVideoConfig"; +import route72 from "./routes/video/deleteVideoConfig"; +import route73 from "./routes/video/generatePrompt"; +import route74 from "./routes/video/generateVideo"; +import route75 from "./routes/video/getManufacturer"; +import route76 from "./routes/video/getVideo"; +import route77 from "./routes/video/getVideoConfigs"; +import route78 from "./routes/video/getVideoModel"; +import route79 from "./routes/video/getVideoStoryboards"; +import route80 from "./routes/video/reviseVideoStoryboards"; +import route81 from "./routes/video/saveVideo"; +import route82 from "./routes/video/upDateVideoConfig"; export default async (app: Express) => { app.use("/assets/addAssets", route1); @@ -152,17 +153,18 @@ export default async (app: Express) => { app.use("/task/getTaskApi", route66); app.use("/task/taskDetails", route67); app.use("/user/getUser", route68); - app.use("/video/addVideo", route69); - app.use("/video/addVideoConfig", route70); - app.use("/video/deleteVideoConfig", route71); - app.use("/video/generatePrompt", route72); - app.use("/video/generateVideo", route73); - app.use("/video/getManufacturer", route74); - app.use("/video/getVideo", route75); - app.use("/video/getVideoConfigs", route76); - app.use("/video/getVideoModel", route77); - app.use("/video/getVideoStoryboards", route78); - app.use("/video/reviseVideoStoryboards", route79); - app.use("/video/saveVideo", route80); - app.use("/video/upDateVideoConfig", route81); + app.use("/user/saveUser", route69); + app.use("/video/addVideo", route70); + app.use("/video/addVideoConfig", route71); + app.use("/video/deleteVideoConfig", route72); + app.use("/video/generatePrompt", route73); + app.use("/video/generateVideo", route74); + app.use("/video/getManufacturer", route75); + app.use("/video/getVideo", route76); + app.use("/video/getVideoConfigs", route77); + app.use("/video/getVideoModel", route78); + app.use("/video/getVideoStoryboards", route79); + app.use("/video/reviseVideoStoryboards", route80); + app.use("/video/saveVideo", route81); + app.use("/video/upDateVideoConfig", route82); } diff --git a/src/routes/storyboard/generateStoryboardApi.ts b/src/routes/storyboard/generateStoryboardApi.ts index 1ce5e2c..2c946de 100644 --- a/src/routes/storyboard/generateStoryboardApi.ts +++ b/src/routes/storyboard/generateStoryboardApi.ts @@ -16,8 +16,10 @@ export default router.post( }), async (req, res) => { const { filePath, prompt, projectId, assetsId } = req.body; + //拿到图片尺寸 + const projectInfo = await u.db("t_project").where({ id: projectId }).first(); - let data = await u.editImage(filePath, prompt, projectId); + let data = await u.editImage(filePath, prompt, projectId,projectInfo?.videoRatio!); const returnData: { id: number | null; url: string | null; diff --git a/src/utils/editImage.ts b/src/utils/editImage.ts index 1139621..2de8f6d 100644 --- a/src/utils/editImage.ts +++ b/src/utils/editImage.ts @@ -77,7 +77,7 @@ async function convertDirectiveAndImages(images: Record, directi * "将@图10中圈起来的部分换成@图8" * ); */ -export default async (images: Record, directive: string, projectId: number) => { +export default async (images: Record, directive: string, projectId: number, aspectRatio: string | null) => { const { prompt, images: base64Images } = await convertDirectiveAndImages(images, directive); const apiConfig = await u.getPromptAi("editImage"); @@ -86,7 +86,7 @@ export default async (images: Record, directive: string, project systemPrompt: "根据用户提供的具体修改指令，对上传的图片进行智能编辑。", prompt: prompt, imageBase64: base64Images, - aspectRatio: "16:9", + aspectRatio: aspectRatio!, size: "1K", }, apiConfig, From e82b032b49639db1d9a6ae79010184c5d3b38a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Sat, 28 Feb 2026 16:37:20 +0800 Subject: [PATCH 2/2] no message --- src/utils/editImage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/editImage.ts b/src/utils/editImage.ts index 2de8f6d..175bc0e 100644 --- a/src/utils/editImage.ts +++ b/src/utils/editImage.ts @@ -86,7 +86,7 @@ export default async (images: Record, directive: string, project systemPrompt: "根据用户提供的具体修改指令，对上传的图片进行智能编辑。", prompt: prompt, imageBase64: base64Images, - aspectRatio: aspectRatio!, + aspectRatio: aspectRatio ? aspectRatio : "16:9", size: "1K", }, apiConfig,