diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java index 729ccfab..794b989e 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java @@ -180,7 +180,9 @@ public class DispatchService { req.setProcessorType(ProcessorType.of(jobInfo.getProcessorType()).name()); req.setTimeExpressionType(TimeExpressionType.of(jobInfo.getTimeExpressionType()).name()); - req.setInstanceTimeoutMS(jobInfo.getInstanceTimeLimit()); + if (jobInfo.getInstanceTimeLimit() != null) { + req.setInstanceTimeoutMS(jobInfo.getInstanceTimeLimit()); + } req.setThreadConcurrency(jobInfo.getConcurrency()); return req; } diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index d99fa81a..bb286003 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -3,7 +3,7 @@ logging.config=classpath:logback-dev.xml ####### Database properties(Configure according to the the environment) ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3307/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai spring.datasource.core.username=root spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.hikari.maximum-pool-size=20