diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java index facbb5c7..c20b83ee 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java @@ -1,12 +1,12 @@ package com.xxl.job.executor.sample.frameless.config; -import com.xxl.job.executor.sample.frameless.jobhandler.SampleXxlJob; import com.xxl.job.core.executor.impl.XxlJobSimpleExecutor; +import com.xxl.job.executor.sample.frameless.jobhandler.SampleXxlJob; import com.xxl.tool.core.PropTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; +import java.util.List; import java.util.Properties; /** @@ -36,17 +36,18 @@ public class FrameLessXxlJobConfig { xxlJobExecutor = new XxlJobSimpleExecutor(); xxlJobExecutor.setAdminAddresses(xxlJobProp.getProperty("xxl.job.admin.addresses")); xxlJobExecutor.setAccessToken(xxlJobProp.getProperty("xxl.job.admin.accessToken")); - xxlJobExecutor.setTimeout(Integer.valueOf(xxlJobProp.getProperty("xxl.job.admin.timeout"))); - xxlJobExecutor.setEnabled(Boolean.valueOf(xxlJobProp.getProperty("xxl.job.executor.enabled"))); + xxlJobExecutor.setTimeout(Integer.parseInt(xxlJobProp.getProperty("xxl.job.admin.timeout"))); + xxlJobExecutor.setEnabled(Boolean.parseBoolean(xxlJobProp.getProperty("xxl.job.executor.enabled"))); xxlJobExecutor.setAppname(xxlJobProp.getProperty("xxl.job.executor.appname")); - xxlJobExecutor.setAddress(xxlJobProp.getProperty("xxl.job.executor.address")); xxlJobExecutor.setIp(xxlJobProp.getProperty("xxl.job.executor.ip")); xxlJobExecutor.setPort(Integer.parseInt(xxlJobProp.getProperty("xxl.job.executor.port"))); + xxlJobExecutor.setAddress(xxlJobProp.getProperty("xxl.job.executor.address")); xxlJobExecutor.setLogPath(xxlJobProp.getProperty("xxl.job.executor.logpath")); xxlJobExecutor.setLogRetentionDays(Integer.parseInt(xxlJobProp.getProperty("xxl.job.executor.logretentiondays"))); + xxlJobExecutor.setGlueEnabled(Boolean.parseBoolean(xxlJobProp.getProperty("xxl.job.executor.glueenabled"))); // registry job bean - xxlJobExecutor.setXxlJobBeanList(Arrays.asList(new SampleXxlJob())); + xxlJobExecutor.setXxlJobBeanList(List.of(new SampleXxlJob())); // start executor try { diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/resources/xxl-job-executor.properties index af4f070f..ff9a2120 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/resources/xxl-job-executor.properties +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/resources/xxl-job-executor.properties @@ -9,12 +9,14 @@ xxl.job.admin.timeout=3 xxl.job.executor.enabled=true ### xxl-job executor appname xxl.job.executor.appname=xxl-job-executor-sample -### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null -xxl.job.executor.address= ### xxl-job executor server-info xxl.job.executor.ip= xxl.job.executor.port=9998 +### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null +xxl.job.executor.address= ### xxl-job executor log-path xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler ### xxl-job executor log-retention-days -xxl.job.executor.logretentiondays=30 \ No newline at end of file +xxl.job.executor.logretentiondays=30 +### xxl-job executor glue (non-BEAN) task enable, default true +xxl.job.executor.glueenabled=true \ No newline at end of file diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java index cf836f0e..4e9dbde4 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java @@ -31,15 +31,15 @@ public class XxlJobConfig { @Value("${xxl.job.executor.appname}") private String appname; - @Value("${xxl.job.executor.address}") - private String address; - @Value("${xxl.job.executor.ip}") private String ip; @Value("${xxl.job.executor.port}") private int port; + @Value("${xxl.job.executor.address}") + private String address; + @Value("${xxl.job.executor.logpath}") private String logPath; @@ -49,6 +49,8 @@ public class XxlJobConfig { @Value("${xxl.job.executor.excludedpackage}") private String excludedPackage; + @Value("${xxl.job.executor.glueenabled:true}") + private Boolean glueEnabled; @Bean public XxlJobSpringExecutor xxlJobExecutor() { @@ -59,12 +61,13 @@ public class XxlJobConfig { xxlJobSpringExecutor.setTimeout(timeout); xxlJobSpringExecutor.setEnabled(enabled); xxlJobSpringExecutor.setAppname(appname); - xxlJobSpringExecutor.setAddress(address); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); + xxlJobSpringExecutor.setAddress(address); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); xxlJobSpringExecutor.setExcludedPackage(excludedPackage); + xxlJobSpringExecutor.setGlueEnabled(glueEnabled); return xxlJobSpringExecutor; } diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/resources/application.properties b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/resources/application.properties index c4b66c76..41b4036c 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/resources/application.properties +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/resources/application.properties @@ -18,33 +18,31 @@ xxl.job.admin.timeout=3 ### xxl-job executor enable, default true xxl.job.executor.enabled=true -### xxl-job executor glue (non-BEAN) task enable, default true -xxl.job.executor.glueenabled=true ### xxl-job executor appname xxl.job.executor.appname=xxl-job-executor-sample-ai -### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null -xxl.job.executor.address= ### xxl-job executor server-info xxl.job.executor.ip= xxl.job.executor.port=9997 +### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null +xxl.job.executor.address= ### xxl-job executor log-path xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler ### xxl-job executor log-retention-days xxl.job.executor.logretentiondays=30 ### xxl-job executor excluded package, will skip scan job. such as "org.package01" or "org.package01,org.package02" xxl.job.executor.excludedpackage= +### xxl-job executor glue (non-BEAN) task enable, default true +xxl.job.executor.glueenabled=true ### http timeout spring.http.clients.connect-timeout=10000 spring.http.clients.read-timeout=180000 -### spring-ai retry +### spring-ai: retry spring.ai.retry.max-attempts=2 - -### ollama +### spring-ai: ollama spring.ai.ollama.base-url=http://localhost:11434 - -### openai (for openclaw) +### spring-ai: openai (for openclaw) spring.ai.openai.base-url=http://127.0.0.1:18789 spring.ai.openai.api-key=xxxxxx diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java index 123741e5..efc04a54 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/config/XxlJobConfig.java @@ -28,21 +28,18 @@ public class XxlJobConfig { @Value("${xxl.job.executor.enabled}") private Boolean enabled; - @Value("${xxl.job.executor.glueenabled:true}") - private Boolean glueEnabled; - @Value("${xxl.job.executor.appname}") private String appname; - @Value("${xxl.job.executor.address}") - private String address; - @Value("${xxl.job.executor.ip}") private String ip; @Value("${xxl.job.executor.port}") private int port; + @Value("${xxl.job.executor.address}") + private String address; + @Value("${xxl.job.executor.logpath}") private String logPath; @@ -52,6 +49,9 @@ public class XxlJobConfig { @Value("${xxl.job.executor.excludedpackage}") private String excludedPackage; + @Value("${xxl.job.executor.glueenabled:true}") + private Boolean glueEnabled; + @Bean public XxlJobSpringExecutor xxlJobExecutor() {