Parcourir la source

Release 版本:2.0.0

xuxueli il y a 6 ans
Parent
révision
b990724e5f

+ 3 - 0
README.md Voir le fichier

10
         <a href="https://travis-ci.org/xuxueli/xxl-job">
10
         <a href="https://travis-ci.org/xuxueli/xxl-job">
11
             <img src="https://travis-ci.org/xuxueli/xxl-job.svg?branch=master" >
11
             <img src="https://travis-ci.org/xuxueli/xxl-job.svg?branch=master" >
12
         </a>
12
         </a>
13
+        <a href="https://hub.docker.com/r/xuxueli/xxl-job-admin/">
14
+            <img src="https://img.shields.io/badge/docker-passing-brightgreen.svg" >
15
+        </a>
13
         <a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
16
         <a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
14
             <img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
17
             <img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
15
         </a>
18
         </a>

+ 3 - 2
doc/XXL-JOB官方文档.md Voir le fichier

1
 ## 《分布式任务调度平台XXL-JOB》
1
 ## 《分布式任务调度平台XXL-JOB》
2
 
2
 
3
 [![Build Status](https://travis-ci.org/xuxueli/xxl-job.svg?branch=master)](https://travis-ci.org/xuxueli/xxl-job)
3
 [![Build Status](https://travis-ci.org/xuxueli/xxl-job.svg?branch=master)](https://travis-ci.org/xuxueli/xxl-job)
4
+[![Docker Status](https://img.shields.io/badge/docker-passing-brightgreen.svg)](https://hub.docker.com/r/xuxueli/xxl-job-admin/)
4
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/)
5
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/)
5
 [![GitHub release](https://img.shields.io/github/release/xuxueli/xxl-job.svg)](https://github.com/xuxueli/xxl-job/releases)
6
 [![GitHub release](https://img.shields.io/github/release/xuxueli/xxl-job.svg)](https://github.com/xuxueli/xxl-job/releases)
6
 [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
7
 [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html)
1330
 - 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
1331
 - 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
1331
 - 41、docker支持:调度中心提供 Dockerfile 方便快速构建docker镜像; 
1332
 - 41、docker支持:调度中心提供 Dockerfile 方便快速构建docker镜像; 
1332
 
1333
 
1333
-### 6.23 版本 V2.0.0 特性[迭代中]
1334
+### 6.23 版本 V2.0.0 特性[2018-11-04]
1334
 - 1、调度中心迁移到 springboot;
1335
 - 1、调度中心迁移到 springboot;
1335
 - 2、底层通讯组件迁移至 xxl-rpc;
1336
 - 2、底层通讯组件迁移至 xxl-rpc;
1336
 - 3、IP获取逻辑优化,优先遍历网卡来获取可用IP;
1337
 - 3、IP获取逻辑优化,优先遍历网卡来获取可用IP;
1344
 - 11、项目依赖升级 groovy 至较新稳定版本;pom清理;
1345
 - 11、项目依赖升级 groovy 至较新稳定版本;pom清理;
1345
 - 12、子任务失败重试重试逻辑优化,子任务失败时将会按照其预设的失败重试次数主动进行重试
1346
 - 12、子任务失败重试重试逻辑优化,子任务失败时将会按照其预设的失败重试次数主动进行重试
1346
 - 13、多项UI组件升级到最新版本,如:CodeMirror、Echarts、Jquery 等;
1347
 - 13、多项UI组件升级到最新版本,如:CodeMirror、Echarts、Jquery 等;
1347
-- 14、[迭代中]docker镜像,并且推送docker镜像到中央仓库,更进一步实现产品开箱即用;
1348
+- 14、提供官方docker镜像,并推送至中央仓库,更进一步实现产品开箱即用;
1348
 
1349
 
1349
 
1350
 
1350
 ### TODO LIST
1351
 ### TODO LIST

+ 1 - 1
pom.xml Voir le fichier

3
 	<modelVersion>4.0.0</modelVersion>
3
 	<modelVersion>4.0.0</modelVersion>
4
 	<groupId>com.xuxueli</groupId>
4
 	<groupId>com.xuxueli</groupId>
5
 	<artifactId>xxl-job</artifactId>
5
 	<artifactId>xxl-job</artifactId>
6
-	<version>2.0.0-SNAPSHOT</version>
6
+	<version>2.0.0</version>
7
 	<packaging>pom</packaging>
7
 	<packaging>pom</packaging>
8
 
8
 
9
 	<name>${project.artifactId}</name>
9
 	<name>${project.artifactId}</name>

+ 1 - 6
xxl-job-admin/pom.xml Voir le fichier

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job</artifactId>
6
 		<artifactId>xxl-job</artifactId>
7
-		<version>2.0.0-SNAPSHOT</version>
7
+		<version>2.0.0</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-admin</artifactId>
9
 	<artifactId>xxl-job-admin</artifactId>
10
 	<packaging>jar</packaging>
10
 	<packaging>jar</packaging>
69
 			<artifactId>spring-boot-starter-freemarker</artifactId>
69
 			<artifactId>spring-boot-starter-freemarker</artifactId>
70
 		</dependency>
70
 		</dependency>
71
 
71
 
72
-
73
 		<!-- mybatis-starter:mybatis + mybatis-spring + tomcat-jdbc(default) -->
72
 		<!-- mybatis-starter:mybatis + mybatis-spring + tomcat-jdbc(default) -->
74
 		<dependency>
73
 		<dependency>
75
 			<groupId>org.mybatis.spring.boot</groupId>
74
 			<groupId>org.mybatis.spring.boot</groupId>
76
 			<artifactId>mybatis-spring-boot-starter</artifactId>
75
 			<artifactId>mybatis-spring-boot-starter</artifactId>
77
 			<version>${mybatis-spring-boot-starter.version}</version>
76
 			<version>${mybatis-spring-boot-starter.version}</version>
78
 		</dependency>
77
 		</dependency>
79
-
80
 		<!-- mysql -->
78
 		<!-- mysql -->
81
 		<dependency>
79
 		<dependency>
82
 			<groupId>mysql</groupId>
80
 			<groupId>mysql</groupId>
84
 			<version>${mysql-connector-java.version}</version>
82
 			<version>${mysql-connector-java.version}</version>
85
 		</dependency>
83
 		</dependency>
86
 
84
 
87
-
88
 		<!-- commons-collections4 -->
85
 		<!-- commons-collections4 -->
89
 		<dependency>
86
 		<dependency>
90
 			<groupId>org.apache.commons</groupId>
87
 			<groupId>org.apache.commons</groupId>
104
 			<version>${commons-email.version}</version>
101
 			<version>${commons-email.version}</version>
105
 		</dependency>
102
 		</dependency>
106
 
103
 
107
-
108
 		<!-- quartz :quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
104
 		<!-- quartz :quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
109
 		<dependency>
105
 		<dependency>
110
 			<groupId>org.quartz-scheduler</groupId>
106
 			<groupId>org.quartz-scheduler</groupId>
112
 			<version>${quartz.version}</version>
108
 			<version>${quartz.version}</version>
113
 		</dependency>
109
 		</dependency>
114
 
110
 
115
-
116
 		<!-- xxl-job-core -->
111
 		<!-- xxl-job-core -->
117
 		<dependency>
112
 		<dependency>
118
 			<groupId>com.xuxueli</groupId>
113
 			<groupId>com.xuxueli</groupId>

+ 1 - 1
xxl-job-admin/src/main/resources/i18n/message.properties Voir le fichier

1
 admin_name=任务调度中心
1
 admin_name=任务调度中心
2
 admin_name_full=分布式任务调度平台XXL-JOB
2
 admin_name_full=分布式任务调度平台XXL-JOB
3
-admin_version=2.0.0-SNAPSHOT
3
+admin_version=2.0.0
4
 
4
 
5
 ## system
5
 ## system
6
 system_tips=系统提示
6
 system_tips=系统提示

+ 1 - 1
xxl-job-admin/src/main/resources/i18n/message_en.properties Voir le fichier

1
 admin_name=Scheduling Center
1
 admin_name=Scheduling Center
2
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
2
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
3
-admin_version=2.0.0-SNAPSHOT
3
+admin_version=2.0.0
4
 
4
 
5
 ## system
5
 ## system
6
 system_tips=System message
6
 system_tips=System message

+ 1 - 1
xxl-job-core/pom.xml Voir le fichier

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job</artifactId>
6
 		<artifactId>xxl-job</artifactId>
7
-		<version>2.0.0-SNAPSHOT</version>
7
+		<version>2.0.0</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-core</artifactId>
9
 	<artifactId>xxl-job-core</artifactId>
10
 	<packaging>jar</packaging>
10
 	<packaging>jar</packaging>

+ 1 - 1
xxl-job-executor-samples/pom.xml Voir le fichier

5
     <parent>
5
     <parent>
6
         <groupId>com.xuxueli</groupId>
6
         <groupId>com.xuxueli</groupId>
7
         <artifactId>xxl-job</artifactId>
7
         <artifactId>xxl-job</artifactId>
8
-        <version>2.0.0-SNAPSHOT</version>
8
+        <version>2.0.0</version>
9
     </parent>
9
     </parent>
10
     <artifactId>xxl-job-executor-samples</artifactId>
10
     <artifactId>xxl-job-executor-samples</artifactId>
11
     <packaging>pom</packaging>
11
     <packaging>pom</packaging>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml Voir le fichier

6
     <parent>
6
     <parent>
7
         <groupId>com.xuxueli</groupId>
7
         <groupId>com.xuxueli</groupId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
9
-        <version>2.0.0-SNAPSHOT</version>
9
+        <version>2.0.0</version>
10
     </parent>
10
     </parent>
11
     <artifactId>xxl-job-executor-sample-frameless</artifactId>
11
     <artifactId>xxl-job-executor-sample-frameless</artifactId>
12
     <packaging>jar</packaging>
12
     <packaging>jar</packaging>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml Voir le fichier

5
     <parent>
5
     <parent>
6
         <artifactId>xxl-job-executor-samples</artifactId>
6
         <artifactId>xxl-job-executor-samples</artifactId>
7
         <groupId>com.xuxueli</groupId>
7
         <groupId>com.xuxueli</groupId>
8
-        <version>2.0.0-SNAPSHOT</version>
8
+        <version>2.0.0</version>
9
     </parent>
9
     </parent>
10
     <modelVersion>4.0.0</modelVersion>
10
     <modelVersion>4.0.0</modelVersion>
11
     <artifactId>xxl-job-executor-sample-jfinal</artifactId>
11
     <artifactId>xxl-job-executor-sample-jfinal</artifactId>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml Voir le fichier

5
     <parent>
5
     <parent>
6
         <groupId>com.xuxueli</groupId>
6
         <groupId>com.xuxueli</groupId>
7
         <artifactId>xxl-job-executor-samples</artifactId>
7
         <artifactId>xxl-job-executor-samples</artifactId>
8
-        <version>2.0.0-SNAPSHOT</version>
8
+        <version>2.0.0</version>
9
     </parent>
9
     </parent>
10
     <modelVersion>4.0.0</modelVersion>
10
     <modelVersion>4.0.0</modelVersion>
11
     <artifactId>xxl-job-executor-sample-nutz</artifactId>
11
     <artifactId>xxl-job-executor-sample-nutz</artifactId>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml Voir le fichier

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job-executor-samples</artifactId>
6
 		<artifactId>xxl-job-executor-samples</artifactId>
7
-		<version>2.0.0-SNAPSHOT</version>
7
+		<version>2.0.0</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-executor-sample-spring</artifactId>
9
 	<artifactId>xxl-job-executor-sample-spring</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml Voir le fichier

6
     <parent>
6
     <parent>
7
         <groupId>com.xuxueli</groupId>
7
         <groupId>com.xuxueli</groupId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
9
-        <version>2.0.0-SNAPSHOT</version>
9
+        <version>2.0.0</version>
10
     </parent>
10
     </parent>
11
     <artifactId>xxl-job-executor-sample-springboot</artifactId>
11
     <artifactId>xxl-job-executor-sample-springboot</artifactId>
12
     <packaging>jar</packaging>
12
     <packaging>jar</packaging>