From 9fd8e1eb83d4105dcaf5225703ef088295600b58 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 29 Mar 2020 03:25:26 +0800
Subject: [PATCH] update rm

---
 .../config/FrameLessXxlJobConfig.java         |  3 ++-
 .../resources/xxl-job-executor.properties     | 18 +++++++++--------
 .../sample/jboot/config/JbootConfig.java      |  3 ++-
 .../src/main/resources/jboot.properties       | 20 +++++++++----------
 .../jfinal/config/JFinalCoreConfig.java       |  4 +++-
 .../resources/xxl-job-executor.properties     | 18 +++++++++--------
 .../sample/nutz/config/NutzSetup.java         |  3 ++-
 .../resources/xxl-job-executor.properties     | 18 +++++++++--------
 .../resources/applicationcontext-xxl-job.xml  |  6 ++++--
 .../resources/xxl-job-executor.properties     | 18 +++++++++--------
 .../src/main/resources/application.properties | 10 +++++-----
 11 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xuxueli/executor/sample/frameless/config/FrameLessXxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xuxueli/executor/sample/frameless/config/FrameLessXxlJobConfig.java
index 28aa06ad..78028802 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xuxueli/executor/sample/frameless/config/FrameLessXxlJobConfig.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xuxueli/executor/sample/frameless/config/FrameLessXxlJobConfig.java
@@ -45,10 +45,11 @@ public class FrameLessXxlJobConfig {
         // init executor
         xxlJobExecutor = new XxlJobExecutor();
         xxlJobExecutor.setAdminAddresses(xxlJobProp.getProperty("xxl.job.admin.addresses"));
+        xxlJobExecutor.setAccessToken(xxlJobProp.getProperty("xxl.job.accessToken"));
         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.valueOf(xxlJobProp.getProperty("xxl.job.executor.port")));
-        xxlJobExecutor.setAccessToken(xxlJobProp.getProperty("xxl.job.accessToken"));
         xxlJobExecutor.setLogPath(xxlJobProp.getProperty("xxl.job.executor.logpath"));
         xxlJobExecutor.setLogRetentionDays(Integer.valueOf(xxlJobProp.getProperty("xxl.job.executor.logretentiondays")));
 
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 72274ee0..ea7589af 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,15 +1,17 @@
 ### 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 executor address
-xxl.job.executor.appname=xxl-job-executor-sample
-xxl.job.executor.ip=
-xxl.job.executor.port=9994
-
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job log path
+### 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=9999
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
-xxl.job.executor.logretentiondays=30
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/config/JbootConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/config/JbootConfig.java
index 0f58c348..597daedd 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/config/JbootConfig.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/config/JbootConfig.java
@@ -27,10 +27,11 @@ public class JbootConfig extends JbootAppListenerBase {
         // init executor
         xxlJobExecutor = new XxlJobExecutor();
         xxlJobExecutor.setAdminAddresses(Jboot.configValue("xxl.job.admin.addresses"));
+        xxlJobExecutor.setAccessToken(Jboot.configValue("xxl.job.accessToken"));
+        xxlJobExecutor.setAddress(Jboot.configValue("xxl.job.executor.address"));
         xxlJobExecutor.setAppName(Jboot.configValue("xxl.job.executor.appname"));
         xxlJobExecutor.setIp(Jboot.configValue("xxl.job.executor.ip"));
         xxlJobExecutor.setPort(Integer.valueOf(Jboot.configValue("xxl.job.executor.port")));
-        xxlJobExecutor.setAccessToken(Jboot.configValue("xxl.job.accessToken"));
         xxlJobExecutor.setLogPath(Jboot.configValue("xxl.job.executor.logpath"));
         xxlJobExecutor.setLogRetentionDays(Integer.valueOf(Jboot.configValue("xxl.job.executor.logretentiondays")));
 
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/jboot.properties b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/jboot.properties
index 2fa683c9..ea7589af 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/jboot.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/jboot.properties
@@ -1,19 +1,17 @@
-#jboot port
-undertow.port=8082
-
-
 ### 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 executor address
-xxl.job.executor.appname=xxl-job-executor-sample
-xxl.job.executor.ip=
-xxl.job.executor.port=9995
-
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job log path
+### 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=9999
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
+### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java
index 4dff38f5..113fb72e 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/java/com/xuxueli/executor/sample/jfinal/config/JFinalCoreConfig.java
@@ -34,10 +34,12 @@ public class JFinalCoreConfig extends JFinalConfig {
 		// init executor
 		xxlJobExecutor = new XxlJobExecutor();
 		xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
+		xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
+		xxlJobExecutor.setAddress(xxlJobProp.get("xxl.job.executor.address"));
 		xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
 		xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
 		xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
-		xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
+
 		xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
 		xxlJobExecutor.setLogRetentionDays(xxlJobProp.getInt("xxl.job.executor.logretentiondays"));
 
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties
index ff8614ba..ea7589af 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/src/main/resources/xxl-job-executor.properties
@@ -1,15 +1,17 @@
 ### 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 executor address
-xxl.job.executor.appname=xxl-job-executor-sample
-xxl.job.executor.ip=
-xxl.job.executor.port=9996
-
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job log path
+### 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=9999
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
-xxl.job.executor.logretentiondays=30
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
index 00770657..ad8acb87 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/java/com/xuxueli/executor/sample/nutz/config/NutzSetup.java
@@ -36,10 +36,11 @@ public class NutzSetup implements Setup {
 		// init executor
 		xxlJobExecutor = new XxlJobExecutor();
 		xxlJobExecutor.setAdminAddresses(xxlJobProp.get("xxl.job.admin.addresses"));
+		xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
 		xxlJobExecutor.setAppName(xxlJobProp.get("xxl.job.executor.appname"));
+		xxlJobExecutor.setAddress(xxlJobProp.get("xxl.job.executor.address"));
 		xxlJobExecutor.setIp(xxlJobProp.get("xxl.job.executor.ip"));
 		xxlJobExecutor.setPort(xxlJobProp.getInt("xxl.job.executor.port"));
-		xxlJobExecutor.setAccessToken(xxlJobProp.get("xxl.job.accessToken"));
 		xxlJobExecutor.setLogPath(xxlJobProp.get("xxl.job.executor.logpath"));
 		xxlJobExecutor.setLogRetentionDays(xxlJobProp.getInt("xxl.job.executor.logretentiondays"));
 
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties
index 973b4b35..ea7589af 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/src/main/resources/xxl-job-executor.properties
@@ -1,15 +1,17 @@
 ### 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 executor address
-xxl.job.executor.appname=xxl-job-executor-sample
-xxl.job.executor.ip=
-xxl.job.executor.port=9997
-
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job log path
+### 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=9999
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
-xxl.job.executor.logretentiondays=30
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
index 0cfdfb85..a4b2dbbb 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/applicationcontext-xxl-job.xml
@@ -25,14 +25,16 @@
 	<bean id="xxlJobSpringExecutor" class="com.xxl.job.core.executor.impl.XxlJobSpringExecutor" >
 		<!-- 执行器注册中心地址[选填]，为空则关闭自动注册 -->
 		<property name="adminAddresses" value="${xxl.job.admin.addresses}" />
+		<!-- 访问令牌[选填]，非空则进行匹配校验 -->
+		<property name="accessToken" value="${xxl.job.accessToken}" />
 		<!-- 执行器AppName[选填]，为空则关闭自动注册 -->
 		<property name="appName" value="${xxl.job.executor.appname}" />
+		<!-- 注册地址[选填]，优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址 -->
+		<property name="address" value="${xxl.job.executor.address}" />
 		<!-- 执行器IP[选填]，为空则自动获取 -->
 		<property name="ip" value="${xxl.job.executor.ip}" />
 		<!-- 执行器端口号[选填]，小于等于0则自动获取 -->
 		<property name="port" value="${xxl.job.executor.port}" />
-		<!-- 访问令牌[选填]，非空则进行匹配校验 -->
-		<property name="accessToken" value="${xxl.job.accessToken}" />
 		<!-- 执行器日志路径[选填]，为空则使用默认路径 -->
 		<property name="logPath" value="${xxl.job.executor.logpath}" />
 		<!-- 日志保存天数[选填]，值大于3时生效 -->
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
index 4032e67d..ea7589af 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/src/main/resources/xxl-job-executor.properties
@@ -1,15 +1,17 @@
 ### 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 executor address
-xxl.job.executor.appname=xxl-job-executor-sample
-xxl.job.executor.ip=
-xxl.job.executor.port=9998
-
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job log path
+### 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=9999
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
-xxl.job.executor.logretentiondays=30
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
\ No newline at end of file
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 58ed4013..e067db4f 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
@@ -13,14 +13,14 @@ xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
 ### xxl-job, access token
 xxl.job.accessToken=
 
-### xxl-job executor address
+### xxl-job executor appname
 xxl.job.executor.appname=xxl-job-executor-sample
-### xxl-job registry address: default use address to registry , otherwise use ip:port if address is null
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
 xxl.job.executor.address=
-### xxl-job server info
+### xxl-job executor server-info
 xxl.job.executor.ip=
 xxl.job.executor.port=9999
-### xxl-job log path
+### xxl-job executor log-path
 xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
-### xxl-job log retention days
+### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30