Browse Source

升级正式版本:1.6.2

xueli.xue 8 years ago
parent
commit
463d8fe5a4

+ 1 - 1
pom.xml View File

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.6.2-SNAPSHOT</version>
6
+	<version>1.6.2</version>
7
 	<packaging>pom</packaging>
7
 	<packaging>pom</packaging>
8
 
8
 
9
 	<name>xxl-job</name>
9
 	<name>xxl-job</name>

+ 2 - 2
xxl-job-admin/pom.xml View File

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.6.2-SNAPSHOT</version>
7
+		<version>1.6.2</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>
11
 
11
 
12
 	<properties>
12
 	<properties>
13
-		<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version>
13
+		<xxl-job.version>1.6.2</xxl-job.version>
14
 		<spring.version>3.2.17.RELEASE</spring.version>
14
 		<spring.version>3.2.17.RELEASE</spring.version>
15
 	</properties>
15
 	</properties>
16
 
16
 

+ 1 - 1
xxl-job-core/pom.xml View File

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.6.2-SNAPSHOT</version>
7
+		<version>1.6.2</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>

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

102
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
102
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
103
 					} else {
103
 					} else {
104
 						// is killed
104
 						// is killed
105
-						ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中,被强制终止]");
105
+						ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中,被强制终止]");
106
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
106
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
107
 					}
107
 					}
108
 				}
108
 				}
116
 			TriggerParam triggerParam = triggerQueue.poll();
116
 			TriggerParam triggerParam = triggerQueue.poll();
117
 			if (triggerParam!=null) {
117
 			if (triggerParam!=null) {
118
 				// is killed
118
 				// is killed
119
-				ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行,在调度队列中被终止]");
119
+				ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行,在调度队列中被终止]");
120
 				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
120
 				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
121
 			}
121
 			}
122
 		}
122
 		}

+ 2 - 2
xxl-job-executor-example/pom.xml View File

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.6.2-SNAPSHOT</version>
7
+		<version>1.6.2</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-executor-example</artifactId>
9
 	<artifactId>xxl-job-executor-example</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>
11
 
11
 
12
 	<properties>
12
 	<properties>
13
-		<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version>
13
+		<xxl-job.version>1.6.2</xxl-job.version>
14
 		<spring.version>3.2.17.RELEASE</spring.version>
14
 		<spring.version>3.2.17.RELEASE</spring.version>
15
 	</properties>
15
 	</properties>
16
 
16