From 7f626e8b7cb6eb08ca70f9b0439732ff18d893de Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Tue, 14 Apr 2020 17:29:12 +0800 Subject: [PATCH 1/7] upgrade version --- ...30\346\226\271\346\226\207\346\241\243.md" | 3 + doc/db/tables_xxl_job.sql | 2 +- pom.xml | 2 +- xxl-job-admin/pom.xml | 2 +- .../main/resources/i18n/message_en.properties | 2 +- .../resources/i18n/message_zh_CN.properties | 2 +- .../resources/i18n/message_zh_TC.properties | 2 +- xxl-job-core/pom.xml | 152 +++++++++--------- xxl-job-executor-samples/pom.xml | 2 +- .../xxl-job-executor-sample-frameless/pom.xml | 2 +- .../xxl-job-executor-sample-jboot/pom.xml | 2 +- .../xxl-job-executor-sample-jfinal/pom.xml | 2 +- .../xxl-job-executor-sample-nutz/pom.xml | 2 +- .../xxl-job-executor-sample-spring/pom.xml | 2 +- .../pom.xml | 2 +- 15 files changed, 92 insertions(+), 89 deletions(-) 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 22e5bda5..c166bf27 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" @@ -1960,6 +1960,9 @@ data: post-data - 22、执行备注消息长度限制，修复数据超长无法存储导致导致回调失败的问题； 注意：XxlJobSpringExecutor组件个别字段调整：“appName” 调整为 “appname” ，升级时该组件时需要注意； +### 7.31 版本 v2.2.1 Release Notes[迭代中] + + ### TODO LIST - 1、任务分片路由：分片采用一致性Hash算法计算出尽量稳定的分片顺序，即使注册机器存在波动也不会引起分批分片顺序大的波动；目前采用IP自然排序，可以满足需求，待定； - 2、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 52e015c4..f465bb60 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -1,5 +1,5 @@ # -# XXL-JOB v2.2.0 +# XXL-JOB v2.2.1-SNAPSHOT # Copyright (c) 2015-present, xuxueli. CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_unicode_ci; diff --git a/pom.xml b/pom.xml index 565a93c4..9520005c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 2.2.0 + 2.2.1-SNAPSHOT pom ${project.artifactId} diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index f1646528..6ac10f33 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-admin jar diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index 43634999..ab9f9ea9 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -1,6 +1,6 @@ admin_name=Scheduling Center admin_name_full=Distributed Task Scheduling Platform XXL-JOB -admin_version=2.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n=en ## system diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index 1b9f0035..1fe8d230 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -1,6 +1,6 @@ admin_name=任务调度中心 admin_name_full=分布式任务调度平台XXL-JOB -admin_version=2.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n= ## system diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index 4558e4dc..9aaccf9d 100755 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -1,6 +1,6 @@ admin_name=任務調度中心 admin_name_full=分布式任務調度平臺XXL-JOB -admin_version=2.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n= ## system diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 79e8944b..8b36206b 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -1,77 +1,77 @@ - - 4.0.0 - - com.xuxueli - xxl-job - 2.2.0 - - xxl-job-core - jar - - ${project.artifactId} - A distributed task scheduling framework. - https://www.xuxueli.com/ - - - - - - io.netty - netty-all - ${netty-all.version} - - - com.google.code.gson - gson - ${gson.version} - - - - - - org.codehaus.groovy - groovy - ${groovy.version} - - - - - org.springframework - spring-context - ${spring.version} - provided - - - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j-api.version} - test - - - - junit - junit - ${junit.version} - test - - - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - provided - - - - + + 4.0.0 + + com.xuxueli + xxl-job + 2.2.1-SNAPSHOT + + xxl-job-core + jar + + ${project.artifactId} + A distributed task scheduling framework. + https://www.xuxueli.com/ + + + + + + io.netty + netty-all + ${netty-all.version} + + + com.google.code.gson + gson + ${gson.version} + + + + + + org.codehaus.groovy + groovy + ${groovy.version} + + + + + org.springframework + spring-context + ${spring.version} + provided + + + + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j-api.version} + test + + + + junit + junit + ${junit.version} + test + + + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + provided + + + + \ No newline at end of file diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml index c9392637..e7d86458 100644 --- a/xxl-job-executor-samples/pom.xml +++ b/xxl-job-executor-samples/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-executor-samples pom diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml index bc99aec1..025d9cce 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml @@ -6,7 +6,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-executor-sample-frameless jar 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 96c6ec9d..b1e7967b 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 @@ -5,7 +5,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT 4.0.0 xxl-job-executor-sample-jboot diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml index a4c0a52d..435d284f 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT 4.0.0 xxl-job-executor-sample-jfinal diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml index 7422344a..8b8e2b75 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT 4.0.0 xxl-job-executor-sample-nutz diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml index b0c9eaa6..e5386cad 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-executor-sample-spring war diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml index 6978742d..6a67d421 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml @@ -6,7 +6,7 @@ com.xuxueli xxl-job-executor-samples - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-executor-sample-springboot jar -- Gitee From a85aa0312fa750f8c673b821434549472d8a1f74 Mon Sep 17 00:00:00 2001 From: LockiJiang Date: Thu, 16 Apr 2020 12:44:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?mysql=E8=BF=9E=E6=8E=A5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0serverTimezone=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB-English-Documentation.md | 2 +- .../XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/XXL-JOB-English-Documentation.md b/doc/XXL-JOB-English-Documentation.md index af68f6d0..48629272 100644 --- a/doc/XXL-JOB-English-Documentation.md +++ b/doc/XXL-JOB-English-Documentation.md @@ -416,7 +416,7 @@ The concrete contet describe as follows: ### JDBC connection info of schedule center：keep Consistent with chapter 2.1 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.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8&serverTimezon=Asia/Shanghai xxl.job.db.user=root xxl.job.db.password=root_pwd 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 c166bf27..639f9e0d 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" @@ -563,7 +563,7 @@ docker run -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/x * 配置项参考文件：/xxl-job/xxl-job-admin/src/main/resources/application.properties * 如需自定义 JVM内存参数 等配置，可通过 "-e JAVA_OPTS" 指定，参数格式 JAVA_OPTS="-Xmx512m" ； */ -docker run -e PARAMS="--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8" -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/xxl-job-admin:{指定版本} +docker run -e PARAMS="--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezon=PRC" -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/xxl-job-admin:{指定版本} ``` -- Gitee From 663a75247f101a5d78b769f9acd0d3aed909d91d Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Thu, 16 Apr 2020 17:26:03 +0800 Subject: [PATCH 3/7] update document --- doc/XXL-JOB-English-Documentation.md | 2 +- ...XL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/XXL-JOB-English-Documentation.md b/doc/XXL-JOB-English-Documentation.md index 48629272..ceeb239d 100644 --- a/doc/XXL-JOB-English-Documentation.md +++ b/doc/XXL-JOB-English-Documentation.md @@ -416,7 +416,7 @@ The concrete contet describe as follows: ### JDBC connection info of schedule center：keep Consistent with chapter 2.1 xxl.job.db.driverClass=com.mysql.jdbc.Driver - xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8&serverTimezon=Asia/Shanghai + xxl.job.db.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai xxl.job.db.user=root xxl.job.db.password=root_pwd 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 639f9e0d..798a1185 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" @@ -494,7 +494,7 @@ XXL-JOB是一个分布式任务调度平台，其核心设计目标是开发迅 调度中心配置内容说明： ### 调度中心JDBC链接：链接地址请保持和 2.1章节 所创建的调度数据库的地址一致 - spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8 + spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai spring.datasource.username=root spring.datasource.password=root_pwd spring.datasource.driver-class-name=com.mysql.jdbc.Driver @@ -563,7 +563,7 @@ docker run -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/x * 配置项参考文件：/xxl-job/xxl-job-admin/src/main/resources/application.properties * 如需自定义 JVM内存参数 等配置，可通过 "-e JAVA_OPTS" 指定，参数格式 JAVA_OPTS="-Xmx512m" ； */ -docker run -e PARAMS="--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezon=PRC" -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/xxl-job-admin:{指定版本} +docker run -e PARAMS="--spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai" -p 8080:8080 -v /tmp:/data/applogs --name xxl-job-admin -d xuxueli/xxl-job-admin:{指定版本} ``` -- Gitee From ac9d0e0676fed6900f0c2b16d6683078b65d3e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E9=9B=AA=E9=87=8C?= <931591021@qq.com> Date: Thu, 16 Apr 2020 17:56:31 +0800 Subject: [PATCH 4/7] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..34f65b14 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: xuxueli # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: ['https://www.xuxueli.com/page/donate.html'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] -- Gitee From fa510941fd3d8d1d864fbfbd98b73edcc305a736 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Thu, 16 Apr 2020 17:58:59 +0800 Subject: [PATCH 5/7] update document --- .github/FUNDING.yml | 2 +- .../XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 34f65b14..0589f3d3 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: xuxueli # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +github: [xuxueli] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: # Replace with a single Patreon username open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username 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 798a1185..db22d091 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" @@ -1961,6 +1961,7 @@ data: post-data 注意：XxlJobSpringExecutor组件个别字段调整：“appName” 调整为 “appname” ，升级时该组件时需要注意； ### 7.31 版本 v2.2.1 Release Notes[迭代中] +- 1、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息； ### TODO LIST -- Gitee From 14ed77383c479ceab67752ea8bafaab182fa1723 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Thu, 16 Apr 2020 18:00:22 +0800 Subject: [PATCH 6/7] update document --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 0589f3d3..22cdaff4 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: [xuxueli] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: # Replace with a single Patreon username open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username -- Gitee From 74055a5390c7b942fc0309ac8f1bc974d72d6d67 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Thu, 16 Apr 2020 20:08:45 +0800 Subject: [PATCH 7/7] update document --- xxl-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java | 1 - 1 file changed, 1 deletion(-) diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java index a6f3ca15..85682a6d 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java @@ -3,7 +3,6 @@ package com.xxl.job.core.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -- Gitee