zyc/video-flow-toon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
zhishi 2026-03-20 15:04:17 +08:00
parent 08bbc001e0
commit b3f742f09f
2 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/router.ts
View File

@ -1,4 +1,4 @@
// @routes-hash dbac61c96fe5d9d9a361d24721d77197 // @routes-hash 45e23a536a13265ff62fe92b1cb71fe3
import { Express } from "express"; import { Express } from "express";
import route1 from "./routes/agents/clearMemory"; import route1 from "./routes/agents/clearMemory";
@ -36,32 +36,33 @@ import route32 from "./routes/novel/updateNovel";
import route33 from "./routes/other/deleteAllData"; import route33 from "./routes/other/deleteAllData";
import route34 from "./routes/other/getCaptcha"; import route34 from "./routes/other/getCaptcha";
import route35 from "./routes/production/getProductionData"; import route35 from "./routes/production/getProductionData";
import route36 from "./routes/project/addProject"; import route36 from "./routes/production/workbench/getVideoModelDetail";
import route37 from "./routes/project/delProject"; import route37 from "./routes/project/addProject";
import route38 from "./routes/project/editProject"; import route38 from "./routes/project/delProject";
import route39 from "./routes/project/getProject"; import route39 from "./routes/project/editProject";
import route40 from "./routes/script/addScript"; import route40 from "./routes/project/getProject";
import route41 from "./routes/script/delScript"; import route41 from "./routes/script/addScript";
import route42 from "./routes/script/getScrptApi"; import route42 from "./routes/script/delScript";
import route43 from "./routes/script/updateScript"; import route43 from "./routes/script/getScrptApi";
import route44 from "./routes/setting/agentDeploy/deployAgentModel"; import route44 from "./routes/script/updateScript";
import route45 from "./routes/setting/agentDeploy/getAgentDeploy"; import route45 from "./routes/setting/agentDeploy/deployAgentModel";
import route46 from "./routes/setting/agentDeploy/updateKey"; import route46 from "./routes/setting/agentDeploy/getAgentDeploy";
import route47 from "./routes/setting/dbConfig/clearData"; import route47 from "./routes/setting/agentDeploy/updateKey";
import route48 from "./routes/setting/getTextModel"; import route48 from "./routes/setting/dbConfig/clearData";
import route49 from "./routes/setting/loginConfig/getUser"; import route49 from "./routes/setting/getTextModel";
import route50 from "./routes/setting/loginConfig/updateUserPwd"; import route50 from "./routes/setting/loginConfig/getUser";
import route51 from "./routes/setting/memoryConfig/getMemory"; import route51 from "./routes/setting/loginConfig/updateUserPwd";
import route52 from "./routes/setting/memoryConfig/sureMemory"; import route52 from "./routes/setting/memoryConfig/getMemory";
import route53 from "./routes/setting/vendorConfig/addVendor"; import route53 from "./routes/setting/memoryConfig/sureMemory";
import route54 from "./routes/setting/vendorConfig/deleteVendor"; import route54 from "./routes/setting/vendorConfig/addVendor";
import route55 from "./routes/setting/vendorConfig/getVendorList"; import route55 from "./routes/setting/vendorConfig/deleteVendor";
import route56 from "./routes/setting/vendorConfig/modelTest"; import route56 from "./routes/setting/vendorConfig/getVendorList";
import route57 from "./routes/setting/vendorConfig/updateVendor"; import route57 from "./routes/setting/vendorConfig/modelTest";
import route58 from "./routes/task/getMyTaskApi"; import route58 from "./routes/setting/vendorConfig/updateVendor";
import route59 from "./routes/task/getTaskCategories"; import route59 from "./routes/task/getMyTaskApi";
import route60 from "./routes/task/taskDetails"; import route60 from "./routes/task/getTaskCategories";
import route61 from "./routes/test/test"; import route61 from "./routes/task/taskDetails";
import route62 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);
@ -99,30 +100,31 @@ export default async (app: Express) => {
app.use("/api/other/deleteAllData", route33); app.use("/api/other/deleteAllData", route33);
app.use("/api/other/getCaptcha", route34); app.use("/api/other/getCaptcha", route34);
app.use("/api/production/getProductionData", route35); app.use("/api/production/getProductionData", route35);
app.use("/api/project/addProject", route36); app.use("/api/production/workbench/getVideoModelDetail", route36);
app.use("/api/project/delProject", route37); app.use("/api/project/addProject", route37);
app.use("/api/project/editProject", route38); app.use("/api/project/delProject", route38);
app.use("/api/project/getProject", route39); app.use("/api/project/editProject", route39);
app.use("/api/script/addScript", route40); app.use("/api/project/getProject", route40);
app.use("/api/script/delScript", route41); app.use("/api/script/addScript", route41);
app.use("/api/script/getScrptApi", route42); app.use("/api/script/delScript", route42);
app.use("/api/script/updateScript", route43); app.use("/api/script/getScrptApi", route43);
app.use("/api/setting/agentDeploy/deployAgentModel", route44); app.use("/api/script/updateScript", route44);
app.use("/api/setting/agentDeploy/getAgentDeploy", route45); app.use("/api/setting/agentDeploy/deployAgentModel", route45);
app.use("/api/setting/agentDeploy/updateKey", route46); app.use("/api/setting/agentDeploy/getAgentDeploy", route46);
app.use("/api/setting/dbConfig/clearData", route47); app.use("/api/setting/agentDeploy/updateKey", route47);
app.use("/api/setting/getTextModel", route48); app.use("/api/setting/dbConfig/clearData", route48);
app.use("/api/setting/loginConfig/getUser", route49); app.use("/api/setting/getTextModel", route49);
app.use("/api/setting/loginConfig/updateUserPwd", route50); app.use("/api/setting/loginConfig/getUser", route50);
app.use("/api/setting/memoryConfig/getMemory", route51); app.use("/api/setting/loginConfig/updateUserPwd", route51);
app.use("/api/setting/memoryConfig/sureMemory", route52); app.use("/api/setting/memoryConfig/getMemory", route52);
app.use("/api/setting/vendorConfig/addVendor", route53); app.use("/api/setting/memoryConfig/sureMemory", route53);
app.use("/api/setting/vendorConfig/deleteVendor", route54); app.use("/api/setting/vendorConfig/addVendor", route54);
app.use("/api/setting/vendorConfig/getVendorList", route55); app.use("/api/setting/vendorConfig/deleteVendor", route55);
app.use("/api/setting/vendorConfig/modelTest", route56); app.use("/api/setting/vendorConfig/getVendorList", route56);
app.use("/api/setting/vendorConfig/updateVendor", route57); app.use("/api/setting/vendorConfig/modelTest", route57);
app.use("/api/task/getMyTaskApi", route58); app.use("/api/setting/vendorConfig/updateVendor", route58);
app.use("/api/task/getTaskCategories", route59); app.use("/api/task/getMyTaskApi", route59);
app.use("/api/task/taskDetails", route60); app.use("/api/task/getTaskCategories", route60);
app.use("/api/test/test", route61); app.use("/api/task/taskDetails", route61);
app.use("/api/test/test", route62);
} }

4
src/types/database.d.ts vendored
View File

@ -1,9 +1,9 @@
// @db-hash feca77a2c2ec5b6a2989347f982558d5 // @db-hash 2f9e6a9e9145cead00652858cafb9159
//该文件由脚本自动生成，请勿手动修改 //该文件由脚本自动生成，请勿手动修改
export interface memories { export interface memories {
'content': string; 'content': string;
'createTime': number; 'createdAt': number;
'embedding'?: string | null; 'embedding'?: string | null;
'id'?: string; 'id'?: string;
'isolationKey': string; 'isolationKey': string;