Преглед изворни кода

升级开发分支:v1.9.1

xuxueli пре 7 година
родитељ
комит
1a724dc215

+ 2 - 0
doc/XXL-JOB官方文档.md Прегледај датотеку

1115
 - 30、任务列表新增筛选条件 "任务描述",快速检索任务;
1115
 - 30、任务列表新增筛选条件 "任务描述",快速检索任务;
1116
 - 31、执行器Log文件定期清理功能:执行器新增配置项("xxl.job.executor.logretentiondays")日志保存天数,日志文件过期自动删除。限制至少保持3天;
1116
 - 31、执行器Log文件定期清理功能:执行器新增配置项("xxl.job.executor.logretentiondays")日志保存天数,日志文件过期自动删除。限制至少保持3天;
1117
 
1117
 
1118
+### 6.21 版本 V1.9.1 特性[迭代中]
1119
+
1118
 ### TODO LIST
1120
 ### TODO LIST
1119
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1121
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1120
 - 2、任务分片路由:分片采用一致性Hash算法计算出尽量稳定的分片顺序,即使注册机器存在波动也不会引起分批分片顺序大的波动;目前采用IP自然排序,可以满足需求,待定;
1122
 - 2、任务分片路由:分片采用一致性Hash算法计算出尽量稳定的分片顺序,即使注册机器存在波动也不会引起分批分片顺序大的波动;目前采用IP自然排序,可以满足需求,待定;

+ 1 - 1
pom.xml Прегледај датотеку

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>1.9.0</version>
6
+	<version>1.9.1-SNAPSHOT</version>
7
 	<packaging>pom</packaging>
7
 	<packaging>pom</packaging>
8
 
8
 
9
 	<name>${project.artifactId}</name>
9
 	<name>${project.artifactId}</name>

+ 1 - 1
xxl-job-admin/pom.xml Прегледај датотеку

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>1.9.0</version>
7
+		<version>1.9.1-SNAPSHOT</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-admin</artifactId>
9
 	<artifactId>xxl-job-admin</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl Прегледај датотеку

175
 
175
 
176
 <#macro commonFooter >
176
 <#macro commonFooter >
177
 	<footer class="main-footer">
177
 	<footer class="main-footer">
178
-        Powered by <b>XXL-JOB</b> 1.9.0
178
+        Powered by <b>XXL-JOB</b> 1.9.1(快照版本)
179
 		<div class="pull-right hidden-xs">
179
 		<div class="pull-right hidden-xs">
180
             <strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
180
             <strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
181
                 <a href="http://www.xuxueli.com/" target="_blank" >xuxueli</a>
181
                 <a href="http://www.xuxueli.com/" target="_blank" >xuxueli</a>

+ 1 - 1
xxl-job-core/pom.xml Прегледај датотеку

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>1.9.0</version>
7
+		<version>1.9.1-SNAPSHOT</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 Прегледај датотеку

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>1.9.0</version>
8
+        <version>1.9.1-SNAPSHOT</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-jfinal/pom.xml Прегледај датотеку

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>1.9.0</version>
8
+        <version>1.9.1-SNAPSHOT</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 Прегледај датотеку

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>1.9.0</version>
8
+        <version>1.9.1-SNAPSHOT</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 Прегледај датотеку

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>1.9.0</version>
7
+		<version>1.9.1-SNAPSHOT</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 Прегледај датотеку

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>1.9.0</version>
9
+        <version>1.9.1-SNAPSHOT</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>