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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 61fa967..0f58c34 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 @@ -10,11 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author https://github.com/souvc - */ public class JbootConfig extends JbootAppListenerBase { - private Logger logger = LoggerFactory.getLogger(JbootConfig.class); // ---------------------- xxl-job executor ---------------------- 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 61fa967..0f58c34 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 @@ -10,11 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author https://github.com/souvc - */ public class JbootConfig extends JbootAppListenerBase { - private Logger logger = LoggerFactory.getLogger(JbootConfig.class); // ---------------------- xxl-job executor ---------------------- diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java index 10f219f..f7a8597 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java @@ -3,13 +3,12 @@ import io.jboot.web.controller.JbootController; import io.jboot.web.controller.annotation.RequestMapping; -/** - * @author https://github.com/souvc - */ + @RequestMapping("/") public class IndexController extends JbootController { public void index() { renderText("xxl job executor running."); } + } \ No newline at end of file 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 61fa967..0f58c34 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 @@ -10,11 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author https://github.com/souvc - */ public class JbootConfig extends JbootAppListenerBase { - private Logger logger = LoggerFactory.getLogger(JbootConfig.class); // ---------------------- xxl-job executor ---------------------- diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java index 10f219f..f7a8597 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java @@ -3,13 +3,12 @@ import io.jboot.web.controller.JbootController; import io.jboot.web.controller.annotation.RequestMapping; -/** - * @author https://github.com/souvc - */ + @RequestMapping("/") public class IndexController extends JbootController { public void index() { renderText("xxl job executor running."); } + } \ No newline at end of file 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 3cdf1d5..d625c61 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,4 +1,4 @@ -#jboot �����˿� +#jboot port undertow.port=8082 @@ -8,7 +8,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9994 +xxl.job.executor.port=9995 ### xxl-job, access token xxl.job.accessToken= 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 61fa967..0f58c34 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 @@ -10,11 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author https://github.com/souvc - */ public class JbootConfig extends JbootAppListenerBase { - private Logger logger = LoggerFactory.getLogger(JbootConfig.class); // ---------------------- xxl-job executor ---------------------- diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java index 10f219f..f7a8597 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java @@ -3,13 +3,12 @@ import io.jboot.web.controller.JbootController; import io.jboot.web.controller.annotation.RequestMapping; -/** - * @author https://github.com/souvc - */ + @RequestMapping("/") public class IndexController extends JbootController { public void index() { renderText("xxl job executor running."); } + } \ No newline at end of file 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 3cdf1d5..d625c61 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,4 +1,4 @@ -#jboot �����˿� +#jboot port undertow.port=8082 @@ -8,7 +8,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9994 +xxl.job.executor.port=9995 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml index f374064..e560605 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml @@ -1,149 +1,29 @@ + - - - - - - - + logback + - - - - - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + ${log.path} + + ${log.path}.%d{yyyy-MM-dd}.zip + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n - - - - - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log_dir}/error/%d{yyyy-MM-dd}/logs.log - - - ${maxHistory} - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - - - - WARN - - ACCEPT - - DENY - - - - ${log_dir}/warn/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - INFO - ACCEPT - DENY - - - ${log_dir}/info/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - DEBUG - ACCEPT - DENY - - - ${log_dir}/debug/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - TRACE - ACCEPT - DENY - - - ${log_dir}/trace/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - + - - - - - - + + \ No newline at end of file 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 4ae21c7..70647fa 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 @@ -4,7 +4,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9995 +xxl.job.executor.port=9994 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f75734f..82dc820 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml @@ -1,33 +1,27 @@ - - - xxl-job-executor-samples com.xuxueli + xxl-job-executor-samples 2.1.0-SNAPSHOT 4.0.0 - xxl-job-executor-sample-jboot - - ${project.artifactId} - Example executor project for spring boot. - http://www.xuxueli.com/ + jar - UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 - + - junit - junit - 4.11 - test + io.jboot + jboot + 2.0.9 @@ -38,12 +32,12 @@ - io.jboot - jboot - 2.0.9 + junit + junit + 4.11 + test - ch.qos.logback logback-core @@ -58,72 +52,4 @@ - - - - - src/main/java - - **/*.xml - - true - - - src/main/resources - - **/* - - true - - - src/main/webapp - - **/ - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.10 - - ${project.build.directory}/app - lib - bin - webRoot - true - src/main/resources - flat - UTF-8 - logs - tmp - - - - io.jboot.Jboot - jboot - - windows - unix - - - - - - - - - - diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java deleted file mode 100644 index d4aea99..0000000 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/JbootApp.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.xuxueli; - -import io.jboot.app.JbootApplication; - -/** - * Jboot app - * - * @author https://github.com/souvc - */ -public class JbootApp { - public static void main(String[] args) { - JbootApplication.run(args); - } -} diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java new file mode 100644 index 0000000..79e2b7a --- /dev/null +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/JbootApp.java @@ -0,0 +1,12 @@ +package com.xuxueli.executor.sample.jboot; + +import io.jboot.app.JbootApplication; + +/** + * Jboot app + */ +public class JbootApp { + public static void main(String[] args) { + JbootApplication.run(args); + } +} 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 61fa967..0f58c34 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 @@ -10,11 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author https://github.com/souvc - */ public class JbootConfig extends JbootAppListenerBase { - private Logger logger = LoggerFactory.getLogger(JbootConfig.class); // ---------------------- xxl-job executor ---------------------- diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java index 10f219f..f7a8597 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/java/com/xuxueli/executor/sample/jboot/controller/IndexController.java @@ -3,13 +3,12 @@ import io.jboot.web.controller.JbootController; import io.jboot.web.controller.annotation.RequestMapping; -/** - * @author https://github.com/souvc - */ + @RequestMapping("/") public class IndexController extends JbootController { public void index() { renderText("xxl job executor running."); } + } \ No newline at end of file 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 3cdf1d5..d625c61 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,4 +1,4 @@ -#jboot �����˿� +#jboot port undertow.port=8082 @@ -8,7 +8,7 @@ ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample xxl.job.executor.ip= -xxl.job.executor.port=9994 +xxl.job.executor.port=9995 ### xxl-job, access token xxl.job.accessToken= diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml index f374064..e560605 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/main/resources/logback.xml @@ -1,149 +1,29 @@ + - - - - - - - + logback + - - - - - - - - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + ${log.path} + + ${log.path}.%d{yyyy-MM-dd}.zip + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n - - - - - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log_dir}/error/%d{yyyy-MM-dd}/logs.log - - - ${maxHistory} - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - - - - WARN - - ACCEPT - - DENY - - - - ${log_dir}/warn/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - INFO - ACCEPT - DENY - - - ${log_dir}/info/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - DEBUG - ACCEPT - DENY - - - ${log_dir}/debug/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - TRACE - ACCEPT - DENY - - - ${log_dir}/trace/%d{yyyy-MM-dd}/logs.log - ${maxHistory} - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - + - - - - - - + + \ No newline at end of file diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/test/java/com/xuxueli/AppTest.java b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/test/java/com/xuxueli/AppTest.java index beff7f6..470feac 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/test/java/com/xuxueli/AppTest.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/src/test/java/com/xuxueli/AppTest.java @@ -1,20 +1,18 @@ package com.xuxueli; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */ -public class AppTest -{ +public class AppTest { /** * Rigorous Test :-) */ @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); + public void shouldAnswerWithTrue() { + assertTrue(true); } }