Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
463d8fe5
authored
Apr 25, 2017
by
xueli.xue
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
升级正式版本:1.6.2
parent
ee1f4e7a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
pom.xml
xxl-job-admin/pom.xml
xxl-job-core/pom.xml
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
xxl-job-executor-example/pom.xml
pom.xml
View file @
463d8fe5
...
...
@@ -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>
...
...
xxl-job-admin/pom.xml
View file @
463d8fe5
...
...
@@ -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>
...
...
xxl-job-core/pom.xml
View file @
463d8fe5
...
...
@@ -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>
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
View file @
463d8fe5
...
...
@@ -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
));
}
}
...
...
xxl-job-executor-example/pom.xml
View file @
463d8fe5
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment