From c4831bc4f4bb27f200089c442fb8985e0dd11dde Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 6 Dec 2025 22:56:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(xxl-job):=20=E6=B7=BB=E5=8A=A0=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E5=90=AF=E7=94=A8=E9=85=8D=E7=BD=AE=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 FrameLessXxlJobConfig 中添加执行器启用配置选项 - 在 SpringBoot 配置中增加 enabled 属性注入 - 调整 XxlJobSpringExecutor 属性设置顺序以提高可读性 - 更新 application.properties 和 xxl-job-executor.properties 配置文件注释及默认值 - 修复排除包配置属性名称拼写错误 - 在 AI 示例项目中同步支持 excludedPackage 配置 --- .../sample/frameless/config/FrameLessXxlJobConfig.java | 1 + .../src/main/resources/xxl-job-executor.properties | 4 +++- .../java/com/xxl/job/executor/config/XxlJobConfig.java | 4 ++++ .../src/main/resources/application.properties | 4 +++- .../java/com/xxl/job/executor/config/XxlJobConfig.java | 8 ++++++-- .../src/main/resources/application.properties | 8 +++++--- 6 files changed, 22 insertions(+), 7 deletions(-) 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 834b658c..80248163 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 @@ -37,6 +37,7 @@ public class FrameLessXxlJobConfig { 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.setAppname(xxlJobProp.getProperty("xxl.job.executor.appname")); xxlJobExecutor.setAddress(xxlJobProp.getProperty("xxl.job.executor.address")); xxlJobExecutor.setIp(xxlJobProp.getProperty("xxl.job.executor.ip")); 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 5c66d2c8..5d987e2e 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 @@ -1,10 +1,12 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin -### xxl-job access-token +### xxl-job access token xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 +### xxl-job executor enable, default true +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 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 36a362f8..cf836f0e 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 @@ -46,6 +46,9 @@ public class XxlJobConfig { @Value("${xxl.job.executor.logretentiondays}") private int logRetentionDays; + @Value("${xxl.job.executor.excludedpackage}") + private String excludedPackage; + @Bean public XxlJobSpringExecutor xxlJobExecutor() { @@ -61,6 +64,7 @@ public class XxlJobConfig { xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); + xxlJobSpringExecutor.setExcludedPackage(excludedPackage); 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 09edb29c..2a95e692 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 @@ -12,7 +12,7 @@ logging.config=classpath:logback.xml ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin -### xxl-job, access token +### xxl-job access token xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 @@ -30,6 +30,8 @@ xxl.job.executor.port=9997 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= ### ollama 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 cb5c8b41..e2381b19 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 @@ -25,6 +25,9 @@ public class XxlJobConfig { @Value("${xxl.job.admin.timeout}") private int timeout; + @Value("${xxl.job.executor.enabled}") + private Boolean enabled; + @Value("${xxl.job.executor.appname}") private String appname; @@ -52,12 +55,13 @@ public class XxlJobConfig { logger.info(">>>>>>>>>>> xxl-job config init."); XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); xxlJobSpringExecutor.setAdminAddresses(adminAddresses); + xxlJobSpringExecutor.setAccessToken(accessToken); + xxlJobSpringExecutor.setTimeout(timeout); + xxlJobSpringExecutor.setEnabled(enabled); xxlJobSpringExecutor.setAppname(appname); xxlJobSpringExecutor.setAddress(address); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); - xxlJobSpringExecutor.setAccessToken(accessToken); - xxlJobSpringExecutor.setTimeout(timeout); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); xxlJobSpringExecutor.setExcludedPackage(excludedPackage); diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties index 7489c94c..3067097c 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties @@ -9,11 +9,13 @@ logging.config=classpath:logback.xml ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin -### xxl-job, access token +### xxl-job access token xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 +### xxl-job executor enable, default true +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 @@ -25,5 +27,5 @@ xxl.job.executor.port=9999 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.xxx01" or "org.xxx01,org.xxx02" -xxl.job.executor.excludedpackage=org.springframework,spring +### xxl-job executor excluded package, will skip scan job. such as "org.package01" or "org.package01,org.package02" +xxl.job.executor.excludedpackage=