From f4e0455376d88315eed79b412a309533cb6765ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Fri, 23 Aug 2024 11:54:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(common-job):=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=99=A8access-token=20=E5=AD=97=E6=AE=B5=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=8C=E4=BF=9D=E6=8C=81=E5=92=8C=E5=AE=98?= =?UTF-8?q?=E6=96=B9=E9=85=8D=E7=BD=AE=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/job/XxlJobAutoConfiguration.java | 2 +- .../job/properties/XxlExecutorProperties.java | 1 + .../common/job/properties/XxlJobProperties.java | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java index de87f0399..fc3f5f4fb 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/XxlJobAutoConfiguration.java @@ -49,7 +49,7 @@ public class XxlJobAutoConfiguration { xxlJobSpringExecutor.setAddress(executor.getAddress()); xxlJobSpringExecutor.setIp(executor.getIp()); xxlJobSpringExecutor.setPort(executor.getPort()); - xxlJobSpringExecutor.setAccessToken(executor.getAccessToken()); + xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getAccessToken()); xxlJobSpringExecutor.setLogPath(executor.getLogPath()); xxlJobSpringExecutor.setLogRetentionDays(executor.getLogRetentionDays()); diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java index eb2e2e6b4..1b723c6f8 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java @@ -35,6 +35,7 @@ public class XxlExecutorProperties { /** * 执行器通讯TOKEN [选填]：非空时启用； */ + @Deprecated private String accessToken; /** diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java index ebaf7c66f..5727df5ef 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlJobProperties.java @@ -14,10 +14,15 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; @ConfigurationProperties(prefix = "xxl.job") public class XxlJobProperties { - @NestedConfigurationProperty - private XxlAdminProperties admin = new XxlAdminProperties(); + /** + * 执行器通讯TOKEN [选填]：非空时启用； + */ + private String accessToken; - @NestedConfigurationProperty - private XxlExecutorProperties executor = new XxlExecutorProperties(); + @NestedConfigurationProperty + private XxlAdminProperties admin = new XxlAdminProperties(); + + @NestedConfigurationProperty + private XxlExecutorProperties executor = new XxlExecutorProperties(); }