Compare commits

..

No commits in common. "8ac38bef71f5691b4395719374fc1697156ae465" and "b04a938372bd7857c84929874d83382a1ddee326" have entirely different histories.

6 changed files with 22 additions and 23 deletions

18
pom.xml
View File

@ -5,19 +5,19 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.5</version>
<version>3.2.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.opensnail</groupId>
<artifactId>snailjob-demo</artifactId>
<groupId>com.example</groupId>
<artifactId>example1</artifactId>
<version>1.0.0</version>
<name>SnailJob-Demo</name>
<description>Demo project for SnailJob</description>
<name>example</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>17</java.version>
<snailjob.version>1.5.0-beta1</snailjob.version>
<snailjob.version>1.2.0-beta2</snailjob.version>
</properties>
<dependencies>
@ -88,9 +88,9 @@
<version>5.8.19</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.4.0</version>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.30</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>

View File

@ -1,7 +1,7 @@
package com.example.snailjob.customized;
import cn.hutool.json.JSONUtil;
import com.aizuda.snailjob.client.core.callback.complete.RetryCompleteCallback;
import com.aizuda.snailjob.client.core.callback.RetryCompleteCallback;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.example.snailjob.dao.FailOrderBaseMapper;

View File

@ -45,13 +45,13 @@ public class OnlyRemoteRetryHandler {
}
}
@Retryable(scene = "localRetryWithRequires", retryStrategy = RetryType.ONLY_REMOTE)
@Retryable(scene = "localRetryWithRequires", retryStrategy = RetryType.ONLY_LOCAL)
public void localRetryWithRequires(String params) {
System.out.println("local retry 方法开始执行");
double i = 1 / 0;
}
@Retryable(scene = "localRetryWithRequiresNew", retryStrategy = RetryType.ONLY_REMOTE, propagation = Propagation.REQUIRES_NEW)
@Retryable(scene = "localRetryWithRequiresNew", retryStrategy = RetryType.ONLY_LOCAL, propagation = Propagation.REQUIRES_NEW)
public void localRetryWithRequiresNew(String params) {
System.out.println("local retry 方法开始执行");
double i = 1 / 0;

View File

@ -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.JobBlockStrategyEnum;
import com.aizuda.snailjob.common.core.enums.BlockStrategyEnum;
import org.springframework.stereotype.Component;
@Component
@ -22,7 +22,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
.setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setBlockStrategy(BlockStrategyEnum.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(JobBlockStrategyEnum.DISCARD)
.setBlockStrategy(BlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.CRON)
.setTriggerInterval("afas")
@ -68,7 +68,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
.setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setBlockStrategy(BlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(60)
@ -91,7 +91,7 @@ public class TestAddJobHandler {
.setExecutorInfo("testJobExecutor")
.setExecutorTimeout(30)
.setDescription("add")
.setBlockStrategy(JobBlockStrategyEnum.DISCARD)
.setBlockStrategy(BlockStrategyEnum.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(JobBlockStrategyEnum.DISCARD)
.setBlockStrategy(BlockStrategyEnum.DISCARD)
.setMaxRetryTimes(1)
.setTriggerType(TriggerTypeEnum.SCHEDULED_TIME)
.setTriggerInterval(String.valueOf(60))

View File

@ -12,8 +12,8 @@ public class TestTriggerJobHandler {
* @param jobId 任务ID
* @return
*/
public Boolean triggerJob(Long jobId) {
return SnailJobOpenApi.triggerClusterJob(jobId).execute();
public Boolean triggerJob(Long jobId){
return SnailJobOpenApi.triggerJob(jobId).execute();
}
/**

View File

@ -46,7 +46,7 @@ snail-job:
# 服务器IP地址或域名集群时建议通过 nginx 做负载均衡
host: 127.0.0.1
# 服务器通讯端口(不是后台管理页面服务端口)
port: 17888
port: 1788
# 命名空间
namespace: 764d604ec6fc45f68cd92514c40e9e1a
# 接入组名
@ -56,5 +56,4 @@ snail-job:
# 客户端绑定IP必须服务器可以访问到默认自动推断在服务器无法调度客户端时需要手动配置
host: 127.0.0.1
# 客户端通讯端口,默认 1789
port: 17889
rpc-type: grpc
port: 1789