From 7658de528bdd2fc51e718a6a7030d309d833ccc8 Mon Sep 17 00:00:00 2001 From: zhishi <1951671751@qq.com> Date: Sun, 12 Apr 2026 21:39:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/version.txt | 2 +- src/router.ts | 88 ++++++++++--------- .../production/assets/deleteAssetsDireve.ts | 5 ++ .../production/storyboard/removeFrame.ts | 3 +- .../setting/modelMap/getImageAndVideoModel.ts | 38 ++++++++ src/types/database.d.ts | 3 +- 6 files changed, 93 insertions(+), 46 deletions(-) create mode 100644 src/routes/setting/modelMap/getImageAndVideoModel.ts diff --git a/data/version.txt b/data/version.txt index 9c1218c..1b87bcd 100644 --- a/data/version.txt +++ b/data/version.txt @@ -1 +1 @@ -1.1.3 \ No newline at end of file +1.1.4 \ No newline at end of file diff --git a/src/router.ts b/src/router.ts index 731c1e7..d5b8c73 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,4 +1,4 @@ -// @routes-hash 62534cff632db5d31442f1bca1932925 +// @routes-hash e4baae699964f90e2e79664131c1c486 import { Express } from "express"; import route1 from "./routes/agents/clearMemory"; @@ -123,27 +123,28 @@ import route119 from "./routes/setting/loginConfig/updateUserPwd"; import route120 from "./routes/setting/memoryConfig/delAllMemory"; import route121 from "./routes/setting/memoryConfig/getMemory"; import route122 from "./routes/setting/memoryConfig/sureMemory"; -import route123 from "./routes/setting/promptManage/getPrompt"; -import route124 from "./routes/setting/promptManage/updatePrompt"; -import route125 from "./routes/setting/skillManagement/getSkillContent"; -import route126 from "./routes/setting/skillManagement/getSkillList"; -import route127 from "./routes/setting/skillManagement/saveSkillContent"; -import route128 from "./routes/setting/vendorConfig/addVendor"; -import route129 from "./routes/setting/vendorConfig/addVendorModel"; -import route130 from "./routes/setting/vendorConfig/deleteVendor"; -import route131 from "./routes/setting/vendorConfig/delVendorModel"; -import route132 from "./routes/setting/vendorConfig/enableVendor"; -import route133 from "./routes/setting/vendorConfig/getCodeByLink"; -import route134 from "./routes/setting/vendorConfig/getVendorList"; -import route135 from "./routes/setting/vendorConfig/modelTest"; -import route136 from "./routes/setting/vendorConfig/updateCode"; -import route137 from "./routes/setting/vendorConfig/updateVendorInputs"; -import route138 from "./routes/setting/vendorConfig/upVendorModel"; -import route139 from "./routes/task/getProject"; -import route140 from "./routes/task/getTaskApi"; -import route141 from "./routes/task/getTaskCategories"; -import route142 from "./routes/task/taskDetails"; -import route143 from "./routes/test/test"; +import route123 from "./routes/setting/modelMap/getImageAndVideoModel"; +import route124 from "./routes/setting/promptManage/getPrompt"; +import route125 from "./routes/setting/promptManage/updatePrompt"; +import route126 from "./routes/setting/skillManagement/getSkillContent"; +import route127 from "./routes/setting/skillManagement/getSkillList"; +import route128 from "./routes/setting/skillManagement/saveSkillContent"; +import route129 from "./routes/setting/vendorConfig/addVendor"; +import route130 from "./routes/setting/vendorConfig/addVendorModel"; +import route131 from "./routes/setting/vendorConfig/deleteVendor"; +import route132 from "./routes/setting/vendorConfig/delVendorModel"; +import route133 from "./routes/setting/vendorConfig/enableVendor"; +import route134 from "./routes/setting/vendorConfig/getCodeByLink"; +import route135 from "./routes/setting/vendorConfig/getVendorList"; +import route136 from "./routes/setting/vendorConfig/modelTest"; +import route137 from "./routes/setting/vendorConfig/updateCode"; +import route138 from "./routes/setting/vendorConfig/updateVendorInputs"; +import route139 from "./routes/setting/vendorConfig/upVendorModel"; +import route140 from "./routes/task/getProject"; +import route141 from "./routes/task/getTaskApi"; +import route142 from "./routes/task/getTaskCategories"; +import route143 from "./routes/task/taskDetails"; +import route144 from "./routes/test/test"; export default async (app: Express) => { app.use("/api/agents/clearMemory", route1); @@ -268,25 +269,26 @@ export default async (app: Express) => { app.use("/api/setting/memoryConfig/delAllMemory", route120); app.use("/api/setting/memoryConfig/getMemory", route121); app.use("/api/setting/memoryConfig/sureMemory", route122); - app.use("/api/setting/promptManage/getPrompt", route123); - app.use("/api/setting/promptManage/updatePrompt", route124); - app.use("/api/setting/skillManagement/getSkillContent", route125); - app.use("/api/setting/skillManagement/getSkillList", route126); - app.use("/api/setting/skillManagement/saveSkillContent", route127); - app.use("/api/setting/vendorConfig/addVendor", route128); - app.use("/api/setting/vendorConfig/addVendorModel", route129); - app.use("/api/setting/vendorConfig/deleteVendor", route130); - app.use("/api/setting/vendorConfig/delVendorModel", route131); - app.use("/api/setting/vendorConfig/enableVendor", route132); - app.use("/api/setting/vendorConfig/getCodeByLink", route133); - app.use("/api/setting/vendorConfig/getVendorList", route134); - app.use("/api/setting/vendorConfig/modelTest", route135); - app.use("/api/setting/vendorConfig/updateCode", route136); - app.use("/api/setting/vendorConfig/updateVendorInputs", route137); - app.use("/api/setting/vendorConfig/upVendorModel", route138); - app.use("/api/task/getProject", route139); - app.use("/api/task/getTaskApi", route140); - app.use("/api/task/getTaskCategories", route141); - app.use("/api/task/taskDetails", route142); - app.use("/api/test/test", route143); + app.use("/api/setting/modelMap/getImageAndVideoModel", route123); + app.use("/api/setting/promptManage/getPrompt", route124); + app.use("/api/setting/promptManage/updatePrompt", route125); + app.use("/api/setting/skillManagement/getSkillContent", route126); + app.use("/api/setting/skillManagement/getSkillList", route127); + app.use("/api/setting/skillManagement/saveSkillContent", route128); + app.use("/api/setting/vendorConfig/addVendor", route129); + app.use("/api/setting/vendorConfig/addVendorModel", route130); + app.use("/api/setting/vendorConfig/deleteVendor", route131); + app.use("/api/setting/vendorConfig/delVendorModel", route132); + app.use("/api/setting/vendorConfig/enableVendor", route133); + app.use("/api/setting/vendorConfig/getCodeByLink", route134); + app.use("/api/setting/vendorConfig/getVendorList", route135); + app.use("/api/setting/vendorConfig/modelTest", route136); + app.use("/api/setting/vendorConfig/updateCode", route137); + app.use("/api/setting/vendorConfig/updateVendorInputs", route138); + app.use("/api/setting/vendorConfig/upVendorModel", route139); + app.use("/api/task/getProject", route140); + app.use("/api/task/getTaskApi", route141); + app.use("/api/task/getTaskCategories", route142); + app.use("/api/task/taskDetails", route143); + app.use("/api/test/test", route144); } diff --git a/src/routes/production/assets/deleteAssetsDireve.ts b/src/routes/production/assets/deleteAssetsDireve.ts index ce3099f..332ed10 100644 --- a/src/routes/production/assets/deleteAssetsDireve.ts +++ b/src/routes/production/assets/deleteAssetsDireve.ts @@ -13,6 +13,11 @@ export default router.post( }), async (req, res) => { const { id, projectId } = req.body; + const assetsFirstData = await u.db("o_assets").where("id", id).first(); + if (!assetsFirstData) { + return res.status(404).send({ error: "资源未找到" }); + } + if (assetsFirstData?.flowId) await u.db("o_imageFlow").where("id", assetsFirstData?.flowId).delete(); await u.db("o_assets").where("id", id).delete(); await u.db("o_assets2Storyboard").where("assetId", id).delete(); res.status(200).send(success({ message: "视频删除成功" })); diff --git a/src/routes/production/storyboard/removeFrame.ts b/src/routes/production/storyboard/removeFrame.ts index 74250fe..246344b 100644 --- a/src/routes/production/storyboard/removeFrame.ts +++ b/src/routes/production/storyboard/removeFrame.ts @@ -12,8 +12,9 @@ export default router.post( }), async (req, res) => { const { id } = req.body; - const storyboardData = await u.db("o_storyboard").where("id", id).select("id", "track", "trackId").first(); + const storyboardData = await u.db("o_storyboard").where("id", id).select("id", "track", "trackId", "flowId").first(); if (!storyboardData) return res.status(400).send(error("未找到该分镜")); + if (storyboardData?.flowId) await u.db("o_imageFlow").where("id", storyboardData?.flowId).delete(); const trackData = await u.db("o_storyboard").where("track", storyboardData.track).select("id"); if (trackData.length == 1) await u.db("o_videoTrack").where("id", storyboardData.trackId).delete(); await u.db("o_storyboard").where("id", id).delete(); diff --git a/src/routes/setting/modelMap/getImageAndVideoModel.ts b/src/routes/setting/modelMap/getImageAndVideoModel.ts new file mode 100644 index 0000000..95f0156 --- /dev/null +++ b/src/routes/setting/modelMap/getImageAndVideoModel.ts @@ -0,0 +1,38 @@ +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( + "/", + async (req, res) => { + const dataList = await u.db("o_vendorConfig").select("id").where("enable", 1); + if (!dataList || dataList.length === 0) { + return res.status(404).send({ error: "模型未找到" }); + } + const types = ['image', 'video']; + const modelList = await Promise.all(dataList.map((i) => u.vendor.getModelList(i.id!))); + const result = await Promise.all( + dataList.map(async (data, index) => { + const vendorData = await u.vendor.getVendor(data.id!); + console.log("%c Line:20 🌶 vendorData", "background:#42b983", vendorData); + const models = modelList[index]; + const filtered = + models.filter((item: { type: string }) => types.includes(item.type)); + console.log("%c Line:30 🍺 vendorData.mode", "background:#42b983", vendorData.mode); + + return filtered.map((item: { name: string; modelName: string; type: string }) => ({ + id: data.id, + label: item.name, + value: item.modelName, + type: item.type, + name: vendorData.name, + mode: item.mode + })); + }), + ); + res.status(200).send(success(result.flat())); + }, +); diff --git a/src/types/database.d.ts b/src/types/database.d.ts index 0c85ca3..09889b1 100644 --- a/src/types/database.d.ts +++ b/src/types/database.d.ts @@ -1,4 +1,4 @@ -// @db-hash 3296433eb24314b094ac5d3839c049c5 +// @db-hash 8669d907d827a8f55da1f1724d7ece06 //该文件由脚本自动生成，请勿手动修改 export interface memories { @@ -201,6 +201,7 @@ export interface o_user { 'password'?: string | null; } export interface o_vendorConfig { + 'code'?: string | null; 'enable'?: number | null; 'id'?: string; 'inputValues'?: string | null;