From 3fafe4d24dd455cbffd0af75cc7ebc05c6216858 Mon Sep 17 00:00:00 2001 From: whyour Date: Tue, 13 May 2025 02:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=88=A0=E9=99=A4=E6=9C=AA=E7=A7=BB=E9=99=A4=E9=98=9F?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/api/dependence.ts | 6 ------ back/services/dependence.ts | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/back/api/dependence.ts b/back/api/dependence.ts index 8c9c59fa..26c4d15c 100644 --- a/back/api/dependence.ts +++ b/back/api/dependence.ts @@ -32,7 +32,6 @@ export default (app: Router) => { ), }), async (req: Request, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.create(req.body); @@ -54,7 +53,6 @@ export default (app: Router) => { }), }), async (req: Request, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.update(req.body); @@ -71,7 +69,6 @@ export default (app: Router) => { body: Joi.array().items(Joi.number().required()), }), async (req: Request, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.remove(req.body); @@ -88,7 +85,6 @@ export default (app: Router) => { body: Joi.array().items(Joi.number().required()), }), async (req: Request, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.remove(req.body, true); @@ -107,7 +103,6 @@ export default (app: Router) => { }), }), async (req: Request<{ id: number }>, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.getDb({ id: req.params.id }); @@ -124,7 +119,6 @@ export default (app: Router) => { body: Joi.array().items(Joi.number().required()), }), async (req: Request, res: Response, next: NextFunction) => { - const logger: Logger = Container.get('logger'); try { const dependenceService = Container.get(DependenceService); const data = await dependenceService.reInstall(req.body); diff --git a/back/services/dependence.ts b/back/services/dependence.ts index 01fdaba7..09434288 100644 --- a/back/services/dependence.ts +++ b/back/services/dependence.ts @@ -67,6 +67,9 @@ export default class DependenceService { public async remove(ids: number[], force = false): Promise { const docs = await DependenceModel.findAll({ where: { id: ids } }); + for (const doc of docs) { + taskLimit.removeQueuedDependency(doc); + } const unInstalledDeps = docs.filter( (x) => x.status !== DependenceStatus.installed, ); @@ -147,6 +150,9 @@ export default class DependenceService { ); const docs = await DependenceModel.findAll({ where: { id: ids } }); + for (const doc of docs) { + taskLimit.removeQueuedDependency(doc); + } this.installDependenceOneByOne(docs, true, true); return docs; }