diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 413024e2..96c06391 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1016,8 +1016,6 @@ xuxueli/xxl-job-admin:{指定版本} ``` ### 调度中心部署根地址 [必填]:如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调";为空则关闭自动注册; xxl.job.admin.addresses=http://127.0.0.1:8080 -### 调度中心通讯TOKEN [必填]:安全性校验; -xxl.job.admin.accessToken=default_token ### 调度中心通讯超时时间[选填],单位秒;默认3s; xxl.job.admin.timeout=3 @@ -1025,6 +1023,8 @@ xxl.job.admin.timeout=3 xxl.job.executor.enabled=true ### 执行器AppName [必填]:执行器心跳注册分组依据;为空则关闭自动注册 xxl.job.executor.appname=xxl-job-executor-sample +### 调度中心通讯TOKEN [必填]:安全性校验; +xxl.job.executor.accessToken=default_token ### 执行器IP [选填]:默认为空表示自动获取IP,多网卡时可手动设置指定IP,该IP不会绑定Host仅作为通讯使用;地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"; xxl.job.executor.ip= ### 执行器端口号 [选填]:小于等于0则自动获取;默认端口为9999,单机部署多个执行器时,注意要配置不同执行器端口; @@ -2914,7 +2914,7 @@ alter table xxl_job_log - 2、【新增】执行器AccessToken:执行器维度隔离设置,提升安全性;线上化动态管理,提升操作效率及体验; (注意:因为AccessToken调整为执行器维度,OpenAPI通讯协议部分发生变化,调度中心与执行器需要一并升级至v3.5.0;) - 3、【调整】执行器约束规则调整,AppName限制不可重复; -- 4、【TODO】调度中心OpenAPI增强:提供任务管理能力;封装Agent Skill并推送ClawHub; +- 4、【TODO】调度中心OpenAPI增强:提供任务管理能力,包括任务基础管理、状态启停、任务触发等; - 5、【TODO】配置线上化:发送邮箱配置线上管理、线程池配置调整; - 6、【TODO】任务告警:拆分“告警类型、告警配置”属性,支持Webhook、邮箱多种方式; - 7、【TODO】任务说明:拆分“任务名称、任务备注”属性,前者用于任务检索,后者用于补充任务描述。 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java index 457a60c2..058ecab0 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java @@ -47,10 +47,10 @@ public class XxlJobExecutor { // ---------------------- field ---------------------- private String adminAddresses; // admin address list, such as "http://address" or "http://address01,http://address02" - private String accessToken; // access token private int timeout = 3; // timeout by second, default 3s private boolean enabled = true; // executor enable, default true private String appname; // executor appname + private String accessToken; // access token private String ip; // executor server-info private int port; private String address; // executor registry-address: default use address to registry , otherwise use ip:port if address is null @@ -61,9 +61,6 @@ public class XxlJobExecutor { public void setAdminAddresses(String adminAddresses) { this.adminAddresses = adminAddresses; } - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } public void setTimeout(int timeout) { this.timeout = timeout; } @@ -73,6 +70,9 @@ public class XxlJobExecutor { public void setAppname(String appname) { this.appname = appname; } + public void setAccessToken(String accessToken) { + this.accessToken = accessToken; + } public void setIp(String ip) { this.ip = ip; } @@ -92,12 +92,12 @@ public class XxlJobExecutor { this.glueEnabled = glueEnabled; } - public String getAccessToken() { - return accessToken; - } public String getAppname() { return appname; } + public String getAccessToken() { + return accessToken; + } public int getPort() { return port; } 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 c20b83ee..eaad186e 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 @@ -35,10 +35,10 @@ public class FrameLessXxlJobConfig { // init executor xxlJobExecutor = new XxlJobSimpleExecutor(); xxlJobExecutor.setAdminAddresses(xxlJobProp.getProperty("xxl.job.admin.addresses")); - xxlJobExecutor.setAccessToken(xxlJobProp.getProperty("xxl.job.admin.accessToken")); 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.setAccessToken(xxlJobProp.getProperty("xxl.job.executor.accessToken")); 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")); 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 ff9a2120..4b14c520 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,7 +1,5 @@ ### 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 access token -xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 @@ -9,6 +7,8 @@ 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 access token +xxl.job.executor.accessToken=default_token ### xxl-job executor server-info xxl.job.executor.ip= xxl.job.executor.port=9998 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 4e9dbde4..da9d1cb3 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 @@ -19,9 +19,6 @@ public class XxlJobConfig { @Value("${xxl.job.admin.addresses}") private String adminAddresses; - @Value("${xxl.job.admin.accessToken}") - private String accessToken; - @Value("${xxl.job.admin.timeout}") private int timeout; @@ -31,6 +28,9 @@ public class XxlJobConfig { @Value("${xxl.job.executor.appname}") private String appname; + @Value("${xxl.job.executor.accessToken}") + private String accessToken; + @Value("${xxl.job.executor.ip}") private String ip; @@ -57,10 +57,10 @@ 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.setAccessToken(accessToken); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setAddress(address); 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 41b4036c..8c9a535c 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 @@ -11,8 +11,6 @@ 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 access token -xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 @@ -20,6 +18,8 @@ xxl.job.admin.timeout=3 xxl.job.executor.enabled=true ### xxl-job executor appname xxl.job.executor.appname=xxl-job-executor-sample-ai +### xxl-job executor access token +xxl.job.executor.accessToken=default_token ### xxl-job executor server-info xxl.job.executor.ip= xxl.job.executor.port=9997 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 efc04a54..94f85076 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 @@ -19,9 +19,6 @@ public class XxlJobConfig { @Value("${xxl.job.admin.addresses}") private String adminAddresses; - @Value("${xxl.job.admin.accessToken}") - private String accessToken; - @Value("${xxl.job.admin.timeout}") private int timeout; @@ -31,6 +28,9 @@ public class XxlJobConfig { @Value("${xxl.job.executor.appname}") private String appname; + @Value("${xxl.job.executor.accessToken}") + private String accessToken; + @Value("${xxl.job.executor.ip}") private String ip; @@ -58,10 +58,10 @@ 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.setAccessToken(accessToken); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setAddress(address); 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 b4abad81..3d062d23 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,8 +9,6 @@ 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 access token -xxl.job.admin.accessToken=default_token ### xxl-job timeout by second, default 3s xxl.job.admin.timeout=3 @@ -18,6 +16,8 @@ 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 access token +xxl.job.executor.accessToken=default_token ### xxl-job executor server-info xxl.job.executor.ip= xxl.job.executor.port=9999