From ac7340ca01fa67d25f0b4dc7f8481a2f11ec405c Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Tue, 9 Jan 2024 22:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++--- .../WorkflowCallbackController.java | 22 +++++++++++++++++ .../retry/job/TestAnnoJobExecutorSleep5s.java | 7 ++++-- .../job/TestWorkflowAnnoJobExecutor.java | 24 +++++++++++++++++++ .../com/example/easy/retry/util/CodeGen.java | 15 +++++------- src/main/resources/application.yml | 2 +- 6 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java create mode 100644 src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java diff --git a/pom.xml b/pom.xml index 7751f5d..63b9a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -38,17 +38,17 @@ com.aizuda easy-retry-client-starter - 2.5.0 + 2.6.0-SNAPSHOT com.aizuda easy-retry-client-core - 2.5.0 + 2.6.0-SNAPSHOT com.aizuda easy-retry-client-job-core - 2.5.0 + 2.6.0-SNAPSHOT org.freemarker diff --git a/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java b/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java new file mode 100644 index 0000000..be7eabb --- /dev/null +++ b/src/main/java/com/example/easy/retry/controller/WorkflowCallbackController.java @@ -0,0 +1,22 @@ +package com.example.easy.retry.controller; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.web.bind.annotation.*; + +/** + * @author xiaowoniu + * @date 2024-01-03 21:09:14 + * @since 2.6.0 + */ +@RestController +@RequestMapping("/workflow/callback") +@Slf4j +public class WorkflowCallbackController { + + @PostMapping + public void callback(@RequestBody Object 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/TestAnnoJobExecutorSleep5s.java b/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutorSleep5s.java index 46fea0f..fcbe664 100644 --- a/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutorSleep5s.java +++ b/src/main/java/com/example/easy/retry/job/TestAnnoJobExecutorSleep5s.java @@ -4,6 +4,7 @@ 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.core.util.JsonUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** @@ -12,12 +13,14 @@ import org.springframework.stereotype.Component; * @since 2.4.0 */ @Component +@Slf4j @JobExecutor(name = "testAnnoJobExecutorSleep5s") public class TestAnnoJobExecutorSleep5s { public ExecuteResult jobExecute(JobArgs jobArgs) { - System.out.println(JsonUtil.toJsonString(jobArgs)); - try { + log.info("testAnnoJobExecutorSleep5s. jobArgs:{}", JsonUtil.toJsonString(jobArgs)); + + try { Thread.sleep(5 * 1000); } catch (InterruptedException e) { throw new RuntimeException(e); diff --git a/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java b/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java new file mode 100644 index 0000000..a7ef97f --- /dev/null +++ b/src/main/java/com/example/easy/retry/job/TestWorkflowAnnoJobExecutor.java @@ -0,0 +1,24 @@ +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.example.easy.retry.po.FailOrderPo; +import org.springframework.stereotype.Component; + +/** + * @author www.byteblogs.com + * @date 2023-09-28 22:54:07 + * @since 2.6.0 + */ +@Component +@JobExecutor(name = "testWorkflowAnnoJobExecutor") +public class TestWorkflowAnnoJobExecutor { + + public ExecuteResult jobExecute(JobArgs jobArgs) { + FailOrderPo failOrderPo = new FailOrderPo(); + failOrderPo.setOrderId("xiaowoniu"); + return ExecuteResult.success(failOrderPo); + } + +} diff --git a/src/main/java/com/example/easy/retry/util/CodeGen.java b/src/main/java/com/example/easy/retry/util/CodeGen.java index f32fd3c..47e652c 100644 --- a/src/main/java/com/example/easy/retry/util/CodeGen.java +++ b/src/main/java/com/example/easy/retry/util/CodeGen.java @@ -10,14 +10,11 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig; public class CodeGen { - @Value("${spring.datasource.url}") - private static String dataSourceUrl; + private static String dataSourceUrl = "jdbc:mysql://localhost:3306/easy_retry_260?useSSL=false&characterEncoding=utf8&useUnicode=true"; - @Value("${spring.datasource.username}") - private static String userName; + private static String userName = "root"; - @Value("${spring.datasource.password}") - private static String password; + private static String password= "root"; public static void main(String[] args) { DataSourceConfig dataSourceConfig = new DataSourceConfig.Builder(dataSourceUrl, userName, password).build(); @@ -25,17 +22,17 @@ public class CodeGen { // 全局配置 GlobalConfig globalConfig = new GlobalConfig.Builder() .outputDir("src/main/java") - .author("maluxinyu") + .author("xiaowoniu") .build(); // 策略配置 StrategyConfig strategyConfig = new StrategyConfig.Builder() - .addInclude("fail_order") // 需要生成的表名 + .addInclude("workflow") // 需要生成的表名 .build(); // 包配置 PackageConfig packageConfig = new PackageConfig.Builder() - .parent("com.maluxinyu.easyretry") + .parent("com.aizuda.easy.retry.template.datasource.persistence.po") .moduleName("easy-retry-springboot") .build(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9b8b2cd..eaa149f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,7 +8,7 @@ spring: active: dev datasource: name: easy_retry - url: jdbc:mysql://localhost:3306/demo?useSSL=false&characterEncoding=utf8&useUnicode=true + url: jdbc:mysql://localhost:3306/easy_retry_260?useSSL=false&characterEncoding=utf8&useUnicode=true username: root password: root type: com.zaxxer.hikari.HikariDataSource