ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级正式版本：1.6.2

This commit is contained in:
xueli.xue 2017-04-25 14:24:49 +08:00
parent ee1f4e7a32
commit 463d8fe5a4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version> <version>1.6.2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>xxl-job</name> <name>xxl-job</name>

4
xxl-job-admin/pom.xml
View File

@ -4,13 +4,13 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version> <version>1.6.2</version>
</parent> </parent>
<artifactId>xxl-job-admin</artifactId> <artifactId>xxl-job-admin</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version> <xxl-job.version>1.6.2</xxl-job.version>
<spring.version>3.2.17.RELEASE</spring.version> <spring.version>3.2.17.RELEASE</spring.version>
</properties> </properties>

2
xxl-job-core/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version> <version>1.6.2</version>
</parent> </parent>
<artifactId>xxl-job-core</artifactId> <artifactId>xxl-job-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

4
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
View File

@ -102,7 +102,7 @@ public class JobThread extends Thread{
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult)); TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
} else { } else {
// is killed // is killed
ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中，被强制终止]"); ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中，被强制终止]");
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult)); TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
} }
} }
@ -116,7 +116,7 @@ public class JobThread extends Thread{
TriggerParam triggerParam = triggerQueue.poll(); TriggerParam triggerParam = triggerQueue.poll();
if (triggerParam!=null) { if (triggerParam!=null) {
// is killed // is killed
ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行，在调度队列中被终止]"); ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行，在调度队列中被终止]");
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult)); TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
} }
} }

4
xxl-job-executor-example/pom.xml
View File

@ -4,13 +4,13 @@
<parent> <parent>
<groupId>com.xuxueli</groupId> <groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId> <artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version> <version>1.6.2</version>
</parent> </parent>
<artifactId>xxl-job-executor-example</artifactId> <artifactId>xxl-job-executor-example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version> <xxl-job.version>1.6.2</xxl-job.version>
<spring.version>3.2.17.RELEASE</spring.version> <spring.version>3.2.17.RELEASE</spring.version>
</properties> </properties>