From 624e1e1c991184c7f04da7143ccf21af22a28039 Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 19:33:47 +0800 Subject: [PATCH 1/6] port 38080 --- doc/db/tables_xxl_job.sql | 2 ++ xxl-job-admin/src/main/resources/xxl-job-admin.properties | 6 +++--- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/application.properties | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 3441f147..87bb23be 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -1,3 +1,5 @@ +CREATE database if NOT EXISTS `xxl-job` default character set utf8 collate utf8_general_ci; +use `xxl-job`; CREATE TABLE XXL_JOB_QRTZ_JOB_DETAILS ( diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 9c425aba..24da5768 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -2,13 +2,13 @@ xxl.job.db.driverClass=com.mysql.jdbc.Driver xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 xxl.job.db.user=root -xxl.job.db.password=root_pwd +xxl.job.db.password=123456 ### xxl-job email xxl.job.mail.host=smtp.163.com xxl.job.mail.port=25 -xxl.job.mail.username=ovono802302@163.com -xxl.job.mail.password=asdfzxcv +xxl.job.mail.username=thinking_fioa@163.com +xxl.job.mail.password=123456 xxl.job.mail.sendNick=《任务调度平台XXL-JOB》 ### xxl-job login 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 7b363dc7..0168f531 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,5 +1,5 @@ ### 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.admin.addresses=http://127.0.0.1:38080/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample 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 ab71b92b..ea26b4b8 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,5 +1,5 @@ ### 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.admin.addresses=http://127.0.0.1:38080/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample 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 a12408ac..1e68333b 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 @@ -6,7 +6,7 @@ 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.admin.addresses=http://127.0.0.1:38080/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample From ca9dd365cc0df52c013b0df7b6b8f4f632d9cc45 Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 20:56:53 +0800 Subject: [PATCH 2/6] port 38082 --- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/xxl-job-executor.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 0168f531..d2bde99e 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38080/xxl-job-admin +xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample 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 ea26b4b8..0304c9a7 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38080/xxl-job-admin +xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample From f1e0c174a7bfeab81b82a9f4fa3edd01f52385cb Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 21:08:02 +0800 Subject: [PATCH 3/6] port 8080 --- xxl-job-admin/src/main/resources/xxl-job-admin.properties | 6 +++--- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/application.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 24da5768..9c425aba 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -2,13 +2,13 @@ xxl.job.db.driverClass=com.mysql.jdbc.Driver xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 xxl.job.db.user=root -xxl.job.db.password=123456 +xxl.job.db.password=root_pwd ### xxl-job email xxl.job.mail.host=smtp.163.com xxl.job.mail.port=25 -xxl.job.mail.username=thinking_fioa@163.com -xxl.job.mail.password=123456 +xxl.job.mail.username=ovono802302@163.com +xxl.job.mail.password=asdfzxcv xxl.job.mail.sendNick=《任务调度平台XXL-JOB》 ### xxl-job login 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 0168f531..7b363dc7 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38080/xxl-job-admin +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 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 ea26b4b8..ab71b92b 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38080/xxl-job-admin +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 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 1e68333b..a12408ac 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 @@ -6,7 +6,7 @@ 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:38080/xxl-job-admin +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 From 7a31abc6c8e779ae3d6809d883222fdfc10edda9 Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 21:15:42 +0800 Subject: [PATCH 4/6] remove conflicts --- xxl-job-admin/src/main/resources/xxl-job-admin.properties | 6 +++--- .../src/main/resources/xxl-job-executor.properties | 1 - .../src/main/resources/application.properties | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 9c425aba..24da5768 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -2,13 +2,13 @@ xxl.job.db.driverClass=com.mysql.jdbc.Driver xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 xxl.job.db.user=root -xxl.job.db.password=root_pwd +xxl.job.db.password=123456 ### xxl-job email xxl.job.mail.host=smtp.163.com xxl.job.mail.port=25 -xxl.job.mail.username=ovono802302@163.com -xxl.job.mail.password=asdfzxcv +xxl.job.mail.username=thinking_fioa@163.com +xxl.job.mail.password=123456 xxl.job.mail.sendNick=《任务调度平台XXL-JOB》 ### xxl-job login 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 c84e726e..0304c9a7 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,6 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin -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 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 a12408ac..aa838181 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 @@ -6,7 +6,7 @@ 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.admin.addresses=http://127.0.0.1:38082/xxl-job-admin ### xxl-job executor address xxl.job.executor.appname=xxl-job-executor-sample From a12d02768d73e7b093c8cea6b0e36c16501c637b Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 21:34:36 +0800 Subject: [PATCH 5/6] reback --- xxl-job-admin/src/main/resources/xxl-job-admin.properties | 4 ++-- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/xxl-job-executor.properties | 2 +- .../src/main/resources/application.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 24da5768..036b81ae 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -7,8 +7,8 @@ xxl.job.db.password=123456 ### xxl-job email xxl.job.mail.host=smtp.163.com xxl.job.mail.port=25 -xxl.job.mail.username=thinking_fioa@163.com -xxl.job.mail.password=123456 +xxl.job.mail.username=ovono802302@163.com +xxl.job.mail.password=asdfzxcv xxl.job.mail.sendNick=《任务调度平台XXL-JOB》 ### xxl-job login 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 d2bde99e..7b363dc7 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin +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 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 0304c9a7..ab71b92b 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,5 +1,5 @@ ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02" -xxl.job.admin.addresses=http://127.0.0.1:38082/xxl-job-admin +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 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 aa838181..a12408ac 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 @@ -6,7 +6,7 @@ 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:38082/xxl-job-admin +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 From d9af1883574525cc9a54c0adecb5f9b4fae3385a Mon Sep 17 00:00:00 2001 From: thinking_fioa Date: Tue, 12 Dec 2017 21:36:45 +0800 Subject: [PATCH 6/6] reback --- xxl-job-admin/src/main/resources/xxl-job-admin.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 036b81ae..9c425aba 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -2,7 +2,7 @@ xxl.job.db.driverClass=com.mysql.jdbc.Driver xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 xxl.job.db.user=root -xxl.job.db.password=123456 +xxl.job.db.password=root_pwd ### xxl-job email xxl.job.mail.host=smtp.163.com