From bb0970255172eddcbb2ec20dd35f82d97ac8bcd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Sun, 29 Mar 2026 23:11:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E8=BF=94=E5=9B=9E=E5=8E=86=E5=8F=B2=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skills/art_prompts/你好/README.md | 1 - .../你好/art_prompt/art_character.md | 1 - .../art_prompt/art_character_derivative.md | 1 - .../art_prompts/你好/art_prompt/art_prop.md | 1 - .../你好/art_prompt/art_prop_derivative.md | 1 - .../art_prompts/你好/art_prompt/art_scene.md | 1 - .../你好/art_prompt/art_scene_derivative.md | 1 - .../你好/art_prompt/art_storyboard.md | 1 - .../你好/art_prompt/art_storyboard_video.md | 1 - .../你好/driector_skills/director_planning.md | 1 - .../director_storyboard_table.md | 1 - data/skills/art_prompts/你好/prefix.md | 1 - src/routes/assets/getImage.ts | 1 - src/routes/cornerScape/getAllAssets.ts | 56 +++++++++++-------- 14 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 data/skills/art_prompts/你好/README.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_character.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_character_derivative.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_prop.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_prop_derivative.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_scene.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_scene_derivative.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_storyboard.md delete mode 100644 data/skills/art_prompts/你好/art_prompt/art_storyboard_video.md delete mode 100644 data/skills/art_prompts/你好/driector_skills/director_planning.md delete mode 100644 data/skills/art_prompts/你好/driector_skills/director_storyboard_table.md delete mode 100644 data/skills/art_prompts/你好/prefix.md diff --git a/data/skills/art_prompts/你好/README.md b/data/skills/art_prompts/你好/README.md deleted file mode 100644 index 67f98b5..0000000 --- a/data/skills/art_prompts/你好/README.md +++ /dev/null @@ -1 +0,0 @@ -1212水电费水电费萨芬的水电费 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_character.md b/data/skills/art_prompts/你好/art_prompt/art_character.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_character.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_character_derivative.md b/data/skills/art_prompts/你好/art_prompt/art_character_derivative.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_character_derivative.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_prop.md b/data/skills/art_prompts/你好/art_prompt/art_prop.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_prop.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_prop_derivative.md b/data/skills/art_prompts/你好/art_prompt/art_prop_derivative.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_prop_derivative.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_scene.md b/data/skills/art_prompts/你好/art_prompt/art_scene.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_scene.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_scene_derivative.md b/data/skills/art_prompts/你好/art_prompt/art_scene_derivative.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_scene_derivative.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_storyboard.md b/data/skills/art_prompts/你好/art_prompt/art_storyboard.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_storyboard.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/art_prompt/art_storyboard_video.md b/data/skills/art_prompts/你好/art_prompt/art_storyboard_video.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/art_prompt/art_storyboard_video.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/driector_skills/director_planning.md b/data/skills/art_prompts/你好/driector_skills/director_planning.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/driector_skills/director_planning.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/driector_skills/director_storyboard_table.md b/data/skills/art_prompts/你好/driector_skills/director_storyboard_table.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/driector_skills/director_storyboard_table.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/data/skills/art_prompts/你好/prefix.md b/data/skills/art_prompts/你好/prefix.md deleted file mode 100644 index f73dd74..0000000 --- a/data/skills/art_prompts/你好/prefix.md +++ /dev/null @@ -1 +0,0 @@ -1212 \ No newline at end of file diff --git a/src/routes/assets/getImage.ts b/src/routes/assets/getImage.ts index b575e5d..56d1a4c 100644 --- a/src/routes/assets/getImage.ts +++ b/src/routes/assets/getImage.ts @@ -31,7 +31,6 @@ export default router.post( imageId: assets!.imageId ?? null, tempAssets, }; - console.log("%c Line:30 🥤 data", "background:#465975", data); res.status(200).send(success(data)); }, ); diff --git a/src/routes/cornerScape/getAllAssets.ts b/src/routes/cornerScape/getAllAssets.ts index 8db8713..0977f2e 100644 --- a/src/routes/cornerScape/getAllAssets.ts +++ b/src/routes/cornerScape/getAllAssets.ts @@ -6,28 +6,38 @@ import { validateFields } from "@/middleware/middleware"; const router = express.Router(); export default router.post( - "/", - validateFields({ - projectId: z.number(), - type: z.array(z.string()).optional(), - }), - async (req, res) => { - const { projectId, type, } = req.body; - const data = await u - .db("o_assets") - .leftJoin("o_image", "o_assets.imageId", "o_image.id") - .select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.model", "o_image.resolution") - .where("o_assets.projectId", projectId) - .andWhere("o_assets.type", "<>", "clip") - .modify((qb) => { - if (type && type.length > 0) qb.whereIn("o_assets.type", type); - }); - const result = await Promise.all( - data.map(async (parent: any) => ({ - ...parent, - filePath: parent.filePath && (await u.oss.getFileUrl(parent.filePath!)), - })), + "/", + validateFields({ + projectId: z.number(), + type: z.array(z.string()).optional(), + }), + async (req, res) => { + const { projectId, type } = req.body; + const data = await u + .db("o_assets") + .leftJoin("o_image", "o_assets.imageId", "o_image.id") + .select("o_assets.*", "o_image.filePath", "o_image.state", "o_image.model", "o_image.resolution") + .where("o_assets.projectId", projectId) + .andWhere("o_assets.type", "<>", "clip") + .modify((qb) => { + if (type && type.length > 0) qb.whereIn("o_assets.type", type); + }); + const result = await Promise.all( + data.map(async (parent: any) => { + const historyImages = await u.db("o_image").where("assetsId", parent.id).andWhere("state", "已完成").select("id", "filePath"); + const historyImagesWithUrl = await Promise.all( + historyImages.map(async (img: any) => ({ + id: img.id, + filePath: img.filePath && (await u.oss.getFileUrl(img.filePath)), + })), ); - res.status(200).send(success(result)); - }, + return { + ...parent, + filePath: parent.filePath && (await u.oss.getFileUrl(parent.filePath!)), + historyImages: historyImagesWithUrl, + }; + }), + ); + res.status(200).send(success(result)); + }, );