升级正式版本:1.6.2

master
xueli.xue 8 years ago
parent ee1f4e7a32
commit 463d8fe5a4
  1. 2
      pom.xml
  2. 4
      xxl-job-admin/pom.xml
  3. 2
      xxl-job-core/pom.xml
  4. 4
      xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
  5. 4
      xxl-job-executor-example/pom.xml

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

@ -4,13 +4,13 @@
<parent>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.6.2</version>
</parent>
<artifactId>xxl-job-admin</artifactId>
<packaging>war</packaging>
<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>
</properties>

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

@ -102,7 +102,7 @@ public class JobThread extends Thread{
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
} else {
// 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));
}
}
@ -116,7 +116,7 @@ public class JobThread extends Thread{
TriggerParam triggerParam = triggerQueue.poll();
if (triggerParam!=null) {
// 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));
}
}

@ -4,13 +4,13 @@
<parent>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.6.2</version>
</parent>
<artifactId>xxl-job-executor-example</artifactId>
<packaging>war</packaging>
<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>
</properties>

Loading…
Cancel
Save