提交 a5938fb2 编写于 作者: X xueli.xue

1、升级版本1.5.1-SNAPSHOT版本;

2、代码优化,POM清理;
3、Spring升级至3.2.17.RELEASE版本;
上级 13361ace
......@@ -685,9 +685,13 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 7、表结构调整,底层重构优化;
- 8、"调度中心"自动注册和发现,failover: 调度中心周期性自动注册, 任务回调时可以感知在线的所有调度中心地址, 通过failover的方式进行任务回调,避免回调单点风险。
#### 6.10 版本 V1.5.1 特性
- 1、代码优化,POM清理;
- 2、Spring升级至3.2.17.RELEASE版本;
- 3、Jetty升级新版本;
- 4、集群执行器选择规则自定义:单点=选择第一个,随机=随机选择一个;
#### 规划中
- 1、集群执行器选择规则自定义:选择第一个,或者随机等;
- 2、升级jetty,spring等版本;
- 3、任务执行规则自定义:假如前一个任务正在执行,后续调度执行规则支持自定义;
串行(默认,当前逻辑):后续调度入调度队列;
并行:后续调度并行执行;
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.5.0</version>
<version>1.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>xxl-job</name>
......
......@@ -4,14 +4,14 @@
<parent>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.5.0</version>
<version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>xxl-job-admin</artifactId>
<packaging>war</packaging>
<properties>
<xxl-job.version>1.5.0</xxl-job.version>
<spring.version>3.2.14.RELEASE</spring.version>
<xxl-job.version>1.5.1-SNAPSHOT</xxl-job.version>
<spring.version>3.2.17.RELEASE</spring.version>
</properties>
<dependencies>
......@@ -82,13 +82,12 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
<!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<!-- junit -->
......
......@@ -31,7 +31,7 @@ public class XxlJobRegistryDaoImpl implements IXxlJobRegistryDao {
@Override
public int registryUpdate(String registryGroup, String registryKey, String registryValue) {
Map<String, Object> params = new HashMap();
Map<String, Object> params = new HashMap<String, Object>();
params.put("registryGroup", registryGroup);
params.put("registryKey", registryKey);
params.put("registryValue", registryValue);
......@@ -41,7 +41,7 @@ public class XxlJobRegistryDaoImpl implements IXxlJobRegistryDao {
@Override
public int registrySave(String registryGroup, String registryKey, String registryValue) {
Map<String, Object> params = new HashMap();
Map<String, Object> params = new HashMap<String, Object>();
params.put("registryGroup", registryGroup);
params.put("registryKey", registryKey);
params.put("registryValue", registryValue);
......
......@@ -4,13 +4,13 @@
<parent>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.5.0</version>
<version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>xxl-job-core</artifactId>
<packaging>jar</packaging>
<properties>
<spring.version>3.2.14.RELEASE</spring.version>
<spring.version>3.2.17.RELEASE</spring.version>
</properties>
<dependencies>
......@@ -19,13 +19,11 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<!-- jetty -->
......@@ -61,7 +59,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<!-- groovy-all -->
......
......@@ -78,7 +78,7 @@ public class DBUtil {
private static List<Map<String, Object>> resultSetToList(ResultSet resultSet) throws SQLException {
if (resultSet == null) {
return Collections.EMPTY_LIST;
return new ArrayList<Map<String, Object>>();
}
ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); // 得到结果集(rs)的结构信息,比如字段数、字段名等
......
......@@ -4,14 +4,14 @@
<parent>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.5.0</version>
<version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>xxl-job-executor-example</artifactId>
<packaging>war</packaging>
<properties>
<xxl-job.version>1.5.0</xxl-job.version>
<spring.version>3.2.14.RELEASE</spring.version>
<xxl-job.version>1.5.1-SNAPSHOT</xxl-job.version>
<spring.version>3.2.17.RELEASE</spring.version>
</properties>
<dependencies>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册