From 75c88c32ed267283ec5fecd4f2628a4d76877f94 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Wed, 31 Aug 2022 23:12:10 +0800 Subject: [PATCH] fix: bug #324 * fix: bug #324 Fail to cancel delay job instance by id via API * style: correct log * style: update log Co-authored-by: Echo009 --- .../tech/powerjob/server/core/instance/InstanceService.java | 4 ++-- .../powerjob/server/web/controller/OpenAPIController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java index 9efa068a..275ec1df 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/instance/InstanceService.java @@ -191,8 +191,8 @@ public class InstanceService { * @param instanceId 任务实例 */ @DesignateServer - public void cancelInstance(Long instanceId) { - log.info("[Instance-{}] try to cancel the instance.", instanceId); + public void cancelInstance(Long appId, Long instanceId) { + log.info("[Instance-{}] try to cancel the instance with appId {}.", instanceId, appId); try { InstanceInfoDO instanceInfo = fetchInstanceInfo(instanceId); diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java index 836e06f6..cc5f67d0 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/OpenAPIController.java @@ -126,7 +126,7 @@ public class OpenAPIController { @PostMapping(OpenAPIConstant.CANCEL_INSTANCE) public ResultDTO cancelInstance(Long instanceId, Long appId) { checkInstanceIdValid(instanceId, appId); - instanceService.cancelInstance(instanceId); + instanceService.cancelInstance(appId, instanceId); return ResultDTO.success(null); }