diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
index 4a8c1da..1b07577 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
@@ -1,11 +1,46 @@
package com.xxl.job.executor.core.config;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
@Configuration
-@ImportResource("classpath:applicationcontext-xxl-job.xml")
+@ComponentScan(basePackages = "com.xxl.job.executor.service.jobhandler")
public class XxlJobConfig {
+ private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+ @Value("${xxl.job.admin.addresses}")
+ private String addresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appname;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logpath;
+
+
+ @Bean(initMethod = "start", destroyMethod = "destroy")
+ public XxlJobExecutor xxlJobExecutor() {
+ logger.error("------------ xxlJobExecutor -----------");
+ XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+ xxlJobExecutor.setIp(ip);
+ xxlJobExecutor.setPort(port);
+ xxlJobExecutor.setAppName(appname);
+ xxlJobExecutor.setAdminAddresses(addresses);
+ xxlJobExecutor.setLogPath(logpath);
+ return xxlJobExecutor;
+ }
}
\ No newline at end of file
diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
index 4a8c1da..1b07577 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
@@ -1,11 +1,46 @@
package com.xxl.job.executor.core.config;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
@Configuration
-@ImportResource("classpath:applicationcontext-xxl-job.xml")
+@ComponentScan(basePackages = "com.xxl.job.executor.service.jobhandler")
public class XxlJobConfig {
+ private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+ @Value("${xxl.job.admin.addresses}")
+ private String addresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appname;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logpath;
+
+
+ @Bean(initMethod = "start", destroyMethod = "destroy")
+ public XxlJobExecutor xxlJobExecutor() {
+ logger.error("------------ xxlJobExecutor -----------");
+ XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+ xxlJobExecutor.setIp(ip);
+ xxlJobExecutor.setPort(port);
+ xxlJobExecutor.setAppName(appname);
+ xxlJobExecutor.setAdminAddresses(addresses);
+ xxlJobExecutor.setLogPath(logpath);
+ return xxlJobExecutor;
+ }
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
index eba298e..067f9c7 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
@@ -12,7 +12,7 @@
@RequestMapping("/")
@ResponseBody
String index() {
- return "xxl job is running.";
+ return "xxl job executor running.";
}
}
\ No newline at end of file
diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
index 4a8c1da..1b07577 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
@@ -1,11 +1,46 @@
package com.xxl.job.executor.core.config;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
@Configuration
-@ImportResource("classpath:applicationcontext-xxl-job.xml")
+@ComponentScan(basePackages = "com.xxl.job.executor.service.jobhandler")
public class XxlJobConfig {
+ private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+ @Value("${xxl.job.admin.addresses}")
+ private String addresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appname;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logpath;
+
+
+ @Bean(initMethod = "start", destroyMethod = "destroy")
+ public XxlJobExecutor xxlJobExecutor() {
+ logger.error("------------ xxlJobExecutor -----------");
+ XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+ xxlJobExecutor.setIp(ip);
+ xxlJobExecutor.setPort(port);
+ xxlJobExecutor.setAppName(appname);
+ xxlJobExecutor.setAdminAddresses(addresses);
+ xxlJobExecutor.setLogPath(logpath);
+ return xxlJobExecutor;
+ }
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
index eba298e..067f9c7 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
@@ -12,7 +12,7 @@
@RequestMapping("/")
@ResponseBody
String index() {
- return "xxl job is running.";
+ return "xxl job executor running.";
}
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/resources/application.properties b/xxl-job-executor-springboot-example/src/main/resources/application.properties
index 3d94453..dc2a1b0 100644
--- a/xxl-job-executor-springboot-example/src/main/resources/application.properties
+++ b/xxl-job-executor-springboot-example/src/main/resources/application.properties
@@ -4,5 +4,14 @@
# log config
logging.config=classpath:logback.xml
+# xxl-job
+### 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-example
+xxl.job.executor.ip=
+xxl.job.executor.port=9999
+### xxl-job log path
+xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler/
diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
index 4a8c1da..1b07577 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
@@ -1,11 +1,46 @@
package com.xxl.job.executor.core.config;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
@Configuration
-@ImportResource("classpath:applicationcontext-xxl-job.xml")
+@ComponentScan(basePackages = "com.xxl.job.executor.service.jobhandler")
public class XxlJobConfig {
+ private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+ @Value("${xxl.job.admin.addresses}")
+ private String addresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appname;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logpath;
+
+
+ @Bean(initMethod = "start", destroyMethod = "destroy")
+ public XxlJobExecutor xxlJobExecutor() {
+ logger.error("------------ xxlJobExecutor -----------");
+ XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+ xxlJobExecutor.setIp(ip);
+ xxlJobExecutor.setPort(port);
+ xxlJobExecutor.setAppName(appname);
+ xxlJobExecutor.setAdminAddresses(addresses);
+ xxlJobExecutor.setLogPath(logpath);
+ return xxlJobExecutor;
+ }
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
index eba298e..067f9c7 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
@@ -12,7 +12,7 @@
@RequestMapping("/")
@ResponseBody
String index() {
- return "xxl job is running.";
+ return "xxl job executor running.";
}
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/resources/application.properties b/xxl-job-executor-springboot-example/src/main/resources/application.properties
index 3d94453..dc2a1b0 100644
--- a/xxl-job-executor-springboot-example/src/main/resources/application.properties
+++ b/xxl-job-executor-springboot-example/src/main/resources/application.properties
@@ -4,5 +4,14 @@
# log config
logging.config=classpath:logback.xml
+# xxl-job
+### 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-example
+xxl.job.executor.ip=
+xxl.job.executor.port=9999
+### xxl-job log path
+xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler/
diff --git a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml b/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
deleted file mode 100644
index d72a087..0000000
--- a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
- classpath*:xxl-job-executor.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 0ff1e82..4f99c10 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -867,6 +867,7 @@
- 6、执行器重复注册问题修复;
- 7、任务线程轮空30次后自动销毁,降低低频任务的无效线程消耗。
- 8、执行器任务执行结果批量回调,降低回调频率提升执行器性能;
+- 9、springboot版本执行器,取消XML配置,改为类配置方式;
#### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
index 4a8c1da..1b07577 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/core/config/XxlJobConfig.java
@@ -1,11 +1,46 @@
package com.xxl.job.executor.core.config;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
@Configuration
-@ImportResource("classpath:applicationcontext-xxl-job.xml")
+@ComponentScan(basePackages = "com.xxl.job.executor.service.jobhandler")
public class XxlJobConfig {
+ private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+ @Value("${xxl.job.admin.addresses}")
+ private String addresses;
+
+ @Value("${xxl.job.executor.appname}")
+ private String appname;
+
+ @Value("${xxl.job.executor.ip}")
+ private String ip;
+
+ @Value("${xxl.job.executor.port}")
+ private int port;
+
+ @Value("${xxl.job.executor.logpath}")
+ private String logpath;
+
+
+ @Bean(initMethod = "start", destroyMethod = "destroy")
+ public XxlJobExecutor xxlJobExecutor() {
+ logger.error("------------ xxlJobExecutor -----------");
+ XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+ xxlJobExecutor.setIp(ip);
+ xxlJobExecutor.setPort(port);
+ xxlJobExecutor.setAppName(appname);
+ xxlJobExecutor.setAdminAddresses(addresses);
+ xxlJobExecutor.setLogPath(logpath);
+ return xxlJobExecutor;
+ }
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
index eba298e..067f9c7 100644
--- a/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
+++ b/xxl-job-executor-springboot-example/src/main/java/com/xxl/job/executor/mvc/handler/IndexController.java
@@ -12,7 +12,7 @@
@RequestMapping("/")
@ResponseBody
String index() {
- return "xxl job is running.";
+ return "xxl job executor running.";
}
}
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/resources/application.properties b/xxl-job-executor-springboot-example/src/main/resources/application.properties
index 3d94453..dc2a1b0 100644
--- a/xxl-job-executor-springboot-example/src/main/resources/application.properties
+++ b/xxl-job-executor-springboot-example/src/main/resources/application.properties
@@ -4,5 +4,14 @@
# log config
logging.config=classpath:logback.xml
+# xxl-job
+### 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-example
+xxl.job.executor.ip=
+xxl.job.executor.port=9999
+### xxl-job log path
+xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler/
diff --git a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml b/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
deleted file mode 100644
index d72a087..0000000
--- a/xxl-job-executor-springboot-example/src/main/resources/applicationcontext-xxl-job.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
- classpath*:xxl-job-executor.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties b/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties
deleted file mode 100644
index 2cd00d0..0000000
--- a/xxl-job-executor-springboot-example/src/main/resources/xxl-job-executor.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-### 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-example
-xxl.job.executor.ip=
-xxl.job.executor.port=9999
-
-### xxl-job log path
-xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler/
\ No newline at end of file