diff --git a/pom.xml b/pom.xml
index 66311e9..b768199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
1.8
- 1.3.0-beta1.1-jdk8
+ 1.5.0-beta1-jdk8
@@ -67,6 +67,11 @@
QLExpress
3.3.1
+
+ com.baomidou
+ mybatis-plus-spring-boot3-starter
+ 3.5.7
+
com.baomidou
mybatis-plus-generator
@@ -80,12 +85,17 @@
cn.hutool
hutool-all
- 5.8.23
+ 5.8.19
- com.mysql
- mysql-connector-j
- 8.4.0
+ mysql
+ mysql-connector-java
+ 8.0.30
+
+
+ org.springdoc
+ springdoc-openapi-starter-webmvc-ui
+ 2.2.0
com.alibaba
@@ -112,19 +122,6 @@
fastjson
1.2.83
-
-
-
- org.springdoc
- springdoc-openapi-ui
- 1.8.0
-
-
- com.baomidou
- mybatis-plus-boot-starter
- 3.5.7
-
-
diff --git a/src/main/java/com/example/snailjob/customized/OrderCompleteCallback.java b/src/main/java/com/example/snailjob/customized/OrderCompleteCallback.java
index 024b5fd..318f427 100644
--- a/src/main/java/com/example/snailjob/customized/OrderCompleteCallback.java
+++ b/src/main/java/com/example/snailjob/customized/OrderCompleteCallback.java
@@ -1,7 +1,7 @@
package com.example.snailjob.customized;
import cn.hutool.json.JSONUtil;
-import com.aizuda.snailjob.client.core.callback.RetryCompleteCallback;
+import com.aizuda.snailjob.client.core.callback.complete.RetryCompleteCallback;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.example.snailjob.dao.FailOrderBaseMapper;
diff --git a/src/main/java/com/example/snailjob/handler/OnlyRemoteRetryHandler.java b/src/main/java/com/example/snailjob/handler/OnlyRemoteRetryHandler.java
index 9ccb979..beb0b14 100644
--- a/src/main/java/com/example/snailjob/handler/OnlyRemoteRetryHandler.java
+++ b/src/main/java/com/example/snailjob/handler/OnlyRemoteRetryHandler.java
@@ -45,13 +45,13 @@ public class OnlyRemoteRetryHandler {
}
}
- @Retryable(scene = "localRetryWithRequires", retryStrategy = RetryType.ONLY_LOCAL)
+ @Retryable(scene = "localRetryWithRequires", retryStrategy = RetryType.ONLY_REMOTE)
public void localRetryWithRequires(String params) {
System.out.println("local retry 方法开始执行");
double i = 1 / 0;
}
- @Retryable(scene = "localRetryWithRequiresNew", retryStrategy = RetryType.ONLY_LOCAL, propagation = Propagation.REQUIRES_NEW)
+ @Retryable(scene = "localRetryWithRequiresNew", retryStrategy = RetryType.ONLY_REMOTE, propagation = Propagation.REQUIRES_NEW)
public void localRetryWithRequiresNew(String params) {
System.out.println("local retry 方法开始执行");
double i = 1 / 0;
diff --git a/src/main/java/com/example/snailjob/handler/TestAddJobHandler.java b/src/main/java/com/example/snailjob/handler/TestAddJobHandler.java
index 8f184f4..10d0858 100644
--- a/src/main/java/com/example/snailjob/handler/TestAddJobHandler.java
+++ b/src/main/java/com/example/snailjob/handler/TestAddJobHandler.java
@@ -3,7 +3,7 @@ package com.example.snailjob.handler;
import com.aizuda.snailjob.client.job.core.enums.AllocationAlgorithmEnum;
import com.aizuda.snailjob.client.job.core.enums.TriggerTypeEnum;
import com.aizuda.snailjob.client.job.core.openapi.SnailJobOpenApi;
-import com.aizuda.snailjob.common.core.enums.BlockStrategyEnum;
+import com.aizuda.snailjob.common.core.enums.JobBlockStrategyEnum;
import org.springframework.stereotype.Component;
@Component
@@ -22,7 +22,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
- .setBlockStrategy(BlockStrategyEnum.DISCARD)
+ .setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(String.valueOf(60))
@@ -45,7 +45,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
- .setBlockStrategy(BlockStrategyEnum.DISCARD)
+ .setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.CRON)
.setTriggerInterval("afas")
@@ -68,7 +68,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
- .setBlockStrategy(BlockStrategyEnum.DISCARD)
+ .setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(60)
@@ -91,7 +91,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
- .setBlockStrategy(BlockStrategyEnum.DISCARD)
+ .setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(String.valueOf(60))
@@ -113,7 +113,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
- .setBlockStrategy(BlockStrategyEnum.DISCARD)
+ .setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(String.valueOf(60))
diff --git a/src/main/java/com/example/snailjob/handler/TestTriggerJobHandler.java b/src/main/java/com/example/snailjob/handler/TestTriggerJobHandler.java
index 1d22f47..4f7f432 100644
--- a/src/main/java/com/example/snailjob/handler/TestTriggerJobHandler.java
+++ b/src/main/java/com/example/snailjob/handler/TestTriggerJobHandler.java
@@ -12,8 +12,8 @@ public class TestTriggerJobHandler {
* @param jobId 任务ID
* @return
*/
- public Boolean triggerJob(Long jobId){
- return SnailJobOpenApi.triggerJob(jobId).execute();
+ public Boolean triggerJob(Long jobId) {
+ return SnailJobOpenApi.triggerClusterJob(jobId).execute();
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aefdee7..0f6139f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -58,4 +58,4 @@ snail-job:
# 客户端通讯端口,默认 17889
port: 17889
# rpc通讯方式: netty, grpc
- rpc-type: netty
+ rpc-type: grpc