Merge branch '108' of https://github.com/HBAI-Ltd/Toonflow-app into 108
# Conflicts: # src/types/database.d.ts
This commit is contained in:
commit
0d75548cb1
@ -1,4 +1,4 @@
|
|||||||
// @routes-hash 060ac05250962088b128ef8200ab0471
|
// @routes-hash a1ebcce277ce90155e2edf126144b986
|
||||||
import { Express } from "express";
|
import { Express } from "express";
|
||||||
|
|
||||||
import route1 from "./routes/agents/clearMemory";
|
import route1 from "./routes/agents/clearMemory";
|
||||||
@ -65,22 +65,21 @@ import route61 from "./routes/scriptAgent/getPlanData";
|
|||||||
import route62 from "./routes/scriptAgent/setPlanData";
|
import route62 from "./routes/scriptAgent/setPlanData";
|
||||||
import route63 from "./routes/setting/agentDeploy/deployAgentModel";
|
import route63 from "./routes/setting/agentDeploy/deployAgentModel";
|
||||||
import route64 from "./routes/setting/agentDeploy/getAgentDeploy";
|
import route64 from "./routes/setting/agentDeploy/getAgentDeploy";
|
||||||
import route65 from "./routes/setting/agentDeploy/oneClickToFillIn";
|
import route65 from "./routes/setting/dbConfig/clearData";
|
||||||
import route66 from "./routes/setting/dbConfig/clearData";
|
import route66 from "./routes/setting/getTextModel";
|
||||||
import route67 from "./routes/setting/getTextModel";
|
import route67 from "./routes/setting/loginConfig/getUser";
|
||||||
import route68 from "./routes/setting/loginConfig/getUser";
|
import route68 from "./routes/setting/loginConfig/updateUserPwd";
|
||||||
import route69 from "./routes/setting/loginConfig/updateUserPwd";
|
import route69 from "./routes/setting/memoryConfig/getMemory";
|
||||||
import route70 from "./routes/setting/memoryConfig/getMemory";
|
import route70 from "./routes/setting/memoryConfig/sureMemory";
|
||||||
import route71 from "./routes/setting/memoryConfig/sureMemory";
|
import route71 from "./routes/setting/vendorConfig/addVendor";
|
||||||
import route72 from "./routes/setting/vendorConfig/addVendor";
|
import route72 from "./routes/setting/vendorConfig/deleteVendor";
|
||||||
import route73 from "./routes/setting/vendorConfig/deleteVendor";
|
import route73 from "./routes/setting/vendorConfig/getVendorList";
|
||||||
import route74 from "./routes/setting/vendorConfig/getVendorList";
|
import route74 from "./routes/setting/vendorConfig/modelTest";
|
||||||
import route75 from "./routes/setting/vendorConfig/modelTest";
|
import route75 from "./routes/setting/vendorConfig/updateVendor";
|
||||||
import route76 from "./routes/setting/vendorConfig/updateVendor";
|
import route76 from "./routes/task/getTaskApi";
|
||||||
import route77 from "./routes/task/getTaskApi";
|
import route77 from "./routes/task/getTaskCategories";
|
||||||
import route78 from "./routes/task/getTaskCategories";
|
import route78 from "./routes/task/taskDetails";
|
||||||
import route79 from "./routes/task/taskDetails";
|
import route79 from "./routes/test/test";
|
||||||
import route80 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);
|
||||||
@ -147,20 +146,19 @@ export default async (app: Express) => {
|
|||||||
app.use("/api/scriptAgent/setPlanData", route62);
|
app.use("/api/scriptAgent/setPlanData", route62);
|
||||||
app.use("/api/setting/agentDeploy/deployAgentModel", route63);
|
app.use("/api/setting/agentDeploy/deployAgentModel", route63);
|
||||||
app.use("/api/setting/agentDeploy/getAgentDeploy", route64);
|
app.use("/api/setting/agentDeploy/getAgentDeploy", route64);
|
||||||
app.use("/api/setting/agentDeploy/oneClickToFillIn", route65);
|
app.use("/api/setting/dbConfig/clearData", route65);
|
||||||
app.use("/api/setting/dbConfig/clearData", route66);
|
app.use("/api/setting/getTextModel", route66);
|
||||||
app.use("/api/setting/getTextModel", route67);
|
app.use("/api/setting/loginConfig/getUser", route67);
|
||||||
app.use("/api/setting/loginConfig/getUser", route68);
|
app.use("/api/setting/loginConfig/updateUserPwd", route68);
|
||||||
app.use("/api/setting/loginConfig/updateUserPwd", route69);
|
app.use("/api/setting/memoryConfig/getMemory", route69);
|
||||||
app.use("/api/setting/memoryConfig/getMemory", route70);
|
app.use("/api/setting/memoryConfig/sureMemory", route70);
|
||||||
app.use("/api/setting/memoryConfig/sureMemory", route71);
|
app.use("/api/setting/vendorConfig/addVendor", route71);
|
||||||
app.use("/api/setting/vendorConfig/addVendor", route72);
|
app.use("/api/setting/vendorConfig/deleteVendor", route72);
|
||||||
app.use("/api/setting/vendorConfig/deleteVendor", route73);
|
app.use("/api/setting/vendorConfig/getVendorList", route73);
|
||||||
app.use("/api/setting/vendorConfig/getVendorList", route74);
|
app.use("/api/setting/vendorConfig/modelTest", route74);
|
||||||
app.use("/api/setting/vendorConfig/modelTest", route75);
|
app.use("/api/setting/vendorConfig/updateVendor", route75);
|
||||||
app.use("/api/setting/vendorConfig/updateVendor", route76);
|
app.use("/api/task/getTaskApi", route76);
|
||||||
app.use("/api/task/getTaskApi", route77);
|
app.use("/api/task/getTaskCategories", route77);
|
||||||
app.use("/api/task/getTaskCategories", route78);
|
app.use("/api/task/taskDetails", route78);
|
||||||
app.use("/api/task/taskDetails", route79);
|
app.use("/api/test/test", route79);
|
||||||
app.use("/api/test/test", route80);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,7 +29,6 @@ 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;
|
||||||
console.log("%c Line:32 🥤 req.body", "background:#465975", req.body);
|
|
||||||
|
|
||||||
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
|
const videoPath = `/${projectId}/video/${uuidv4()}.mp4`; //视频保存路径
|
||||||
//新增
|
//新增
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
import express from "express";
|
|
||||||
import { success } from "@/lib/responseFormat";
|
|
||||||
import u from "@/utils";
|
|
||||||
const router = express.Router();
|
|
||||||
|
|
||||||
export default router.post("/", async (req, res) => {
|
|
||||||
const data = await u.db("o_agentDeploy").leftJoin("o_vendorConfig", "o_vendorConfig.id", "o_agentDeploy.vendorId").select("o_agentDeploy.*", "o_vendorConfig.icon");
|
|
||||||
res.status(200).send(success(data));
|
|
||||||
});
|
|
||||||
57
src/types/database.d.ts
vendored
57
src/types/database.d.ts
vendored
@ -1,45 +1,6 @@
|
|||||||
// @db-hash 25c88b2cb37f9deac8b2bb8354113537
|
// @db-hash 83c8dadf13c2aee689597b709a690870
|
||||||
//该文件由脚本自动生成,请勿手动修改
|
//该文件由脚本自动生成,请勿手动修改
|
||||||
|
|
||||||
export interface _o_assets_old_20260324 {
|
|
||||||
'describe'?: string | null;
|
|
||||||
'id'?: number;
|
|
||||||
'imageId'?: number | null;
|
|
||||||
'name'?: string | null;
|
|
||||||
'projectId'?: number | null;
|
|
||||||
'prompt'?: string | null;
|
|
||||||
'remark'?: string | null;
|
|
||||||
'scriptId'?: number | null;
|
|
||||||
'sonId'?: number | null;
|
|
||||||
'startTime'?: number | null;
|
|
||||||
'state'?: string | null;
|
|
||||||
'type'?: string | null;
|
|
||||||
}
|
|
||||||
export interface _o_assets_old_20260324_1 {
|
|
||||||
'assetId'?: number | null;
|
|
||||||
'describe'?: string | null;
|
|
||||||
'id'?: number;
|
|
||||||
'imageId'?: number | null;
|
|
||||||
'name'?: string | null;
|
|
||||||
'projectId'?: number | null;
|
|
||||||
'prompt'?: string | null;
|
|
||||||
'remark'?: string | null;
|
|
||||||
'scriptId'?: number | null;
|
|
||||||
'startTime'?: number | null;
|
|
||||||
'state'?: string | null;
|
|
||||||
'type'?: string | null;
|
|
||||||
}
|
|
||||||
export interface _o_novel_old_20260323 {
|
|
||||||
'chapter'?: string | null;
|
|
||||||
'chapterData'?: string | null;
|
|
||||||
'chapterIndex'?: number | null;
|
|
||||||
'createTime'?: number | null;
|
|
||||||
'event'?: string | null;
|
|
||||||
'eventState'?: number | null;
|
|
||||||
'id'?: number;
|
|
||||||
'projectId'?: number | null;
|
|
||||||
'reel'?: string | null;
|
|
||||||
}
|
|
||||||
export interface memories {
|
export interface memories {
|
||||||
'content': string;
|
'content': string;
|
||||||
'createTime': number;
|
'createTime': number;
|
||||||
@ -64,7 +25,7 @@ export interface o_agentDeploy {
|
|||||||
export interface o_agentWorkData {
|
export interface o_agentWorkData {
|
||||||
'createTime'?: number | null;
|
'createTime'?: number | null;
|
||||||
'data'?: string | null;
|
'data'?: string | null;
|
||||||
'espisodeId'?: number | null;
|
'episodesId'?: number | null;
|
||||||
'id'?: number;
|
'id'?: number;
|
||||||
'key'?: string | null;
|
'key'?: string | null;
|
||||||
'projectId'?: number | null;
|
'projectId'?: number | null;
|
||||||
@ -86,7 +47,6 @@ export interface o_assets {
|
|||||||
'remark'?: string | null;
|
'remark'?: string | null;
|
||||||
'scriptId'?: number | null;
|
'scriptId'?: number | null;
|
||||||
'startTime'?: number | null;
|
'startTime'?: number | null;
|
||||||
'state'?: string | null;
|
|
||||||
'type'?: string | null;
|
'type'?: string | null;
|
||||||
}
|
}
|
||||||
export interface o_assets2Storyboard {
|
export interface o_assets2Storyboard {
|
||||||
@ -104,15 +64,6 @@ export interface o_eventChapter {
|
|||||||
'id'?: number;
|
'id'?: number;
|
||||||
'novelId'?: number | null;
|
'novelId'?: number | null;
|
||||||
}
|
}
|
||||||
export interface o_flowData {
|
|
||||||
'createTime'?: number | null;
|
|
||||||
'data'?: string | null;
|
|
||||||
'espisodeId'?: number | null;
|
|
||||||
'id'?: number;
|
|
||||||
'key'?: string | null;
|
|
||||||
'projectId'?: number | null;
|
|
||||||
'updateTime'?: number | null;
|
|
||||||
}
|
|
||||||
export interface o_image {
|
export interface o_image {
|
||||||
'assetsId'?: number | null;
|
'assetsId'?: number | null;
|
||||||
'filePath'?: string | null;
|
'filePath'?: string | null;
|
||||||
@ -244,9 +195,6 @@ export interface o_videoConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface DB {
|
export interface DB {
|
||||||
"_o_assets_old_20260324": _o_assets_old_20260324;
|
|
||||||
"_o_assets_old_20260324_1": _o_assets_old_20260324_1;
|
|
||||||
"_o_novel_old_20260323": _o_novel_old_20260323;
|
|
||||||
"memories": memories;
|
"memories": memories;
|
||||||
"o_agentDeploy": o_agentDeploy;
|
"o_agentDeploy": o_agentDeploy;
|
||||||
"o_agentWorkData": o_agentWorkData;
|
"o_agentWorkData": o_agentWorkData;
|
||||||
@ -255,7 +203,6 @@ export interface DB {
|
|||||||
"o_assets2Storyboard": o_assets2Storyboard;
|
"o_assets2Storyboard": o_assets2Storyboard;
|
||||||
"o_event": o_event;
|
"o_event": o_event;
|
||||||
"o_eventChapter": o_eventChapter;
|
"o_eventChapter": o_eventChapter;
|
||||||
"o_flowData": o_flowData;
|
|
||||||
"o_image": o_image;
|
"o_image": o_image;
|
||||||
"o_novel": o_novel;
|
"o_novel": o_novel;
|
||||||
"o_outline": o_outline;
|
"o_outline": o_outline;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user