mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-08 12:39:05 +08:00
refactor(common-job): 执行器access-token 字段属性变更,保持和官方配置一致
This commit is contained in:
1 parent
62d0271af5
commit
f4e0455376
3 files changed
+11
-5
No files matched your search
+1
-1
@@ -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());
|
||||
|
||||
|
||||
+1
@@ -35,6 +35,7 @@ public class XxlExecutorProperties {
|
||||
/**
|
||||
* 执行器通讯TOKEN [选填]:非空时启用;
|
||||
*/
|
||||
@Deprecated
|
||||
private String accessToken;
|
||||
|
||||
/**
|
||||
|
||||
+9
-4
@@ -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();
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user