diff --git a/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java b/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java index be7eabb..92cbbbe 100644 --- a/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java +++ b/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java @@ -1,10 +1,13 @@ package com.example.easy.retry.controller; +import com.aizuda.easy.retry.server.model.dto.CallbackParamsDTO; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author xiaowoniu * @date 2024-01-03 21:09:14 @@ -16,7 +19,7 @@ import org.springframework.web.bind.annotation.*; public class WorkflowCallbackController { @PostMapping - public void callback(@RequestBody Object object, @RequestHeader HttpHeaders headers) { + public void callback(@RequestBody List object, @RequestHeader HttpHeaders headers) { log.info("callback: {}, secret:{} secret:{}", object, "secret", headers.getFirst("secret")); } } diff --git a/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutor.java b/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutor.java index 1309ea3..e701c9e 100644 --- a/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutor.java +++ b/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutor.java @@ -2,9 +2,7 @@ package com.example.easy.retry.job; import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor; import com.aizuda.easy.retry.client.job.core.dto.JobArgs; -import com.aizuda.easy.retry.client.job.core.dto.JobContext; import com.aizuda.easy.retry.client.model.ExecuteResult; -import com.aizuda.easy.retry.common.core.util.JsonUtil; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java b/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java index a7ef97f..7979f21 100644 --- a/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java +++ b/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java @@ -3,6 +3,7 @@ package com.example.easy.retry.job; import com.aizuda.easy.retry.client.job.core.annotation.JobExecutor; import com.aizuda.easy.retry.client.job.core.dto.JobArgs; import com.aizuda.easy.retry.client.model.ExecuteResult; +import com.aizuda.easy.retry.common.log.EasyRetryLog; import com.example.easy.retry.po.FailOrderPo; import org.springframework.stereotype.Component; @@ -16,8 +17,10 @@ import org.springframework.stereotype.Component; public class TestWorkflowAnnoJobExecutor { public ExecuteResult jobExecute(JobArgs jobArgs) { + EasyRetryLog.REMOTE.info("任务执行开始. [{}]", jobArgs); FailOrderPo failOrderPo = new FailOrderPo(); failOrderPo.setOrderId("xiaowoniu"); + EasyRetryLog.REMOTE.info("任务执行结束. [{}]", jobArgs); return ExecuteResult.success(failOrderPo); } diff --git a/src/main/resources/logback-boot.xml b/src/main/resources/logback-boot.xml index ebb1737..990914a 100644 --- a/src/main/resources/logback-boot.xml +++ b/src/main/resources/logback-boot.xml @@ -78,11 +78,16 @@ + + + + +