Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
021daa0d
提交
021daa0d
authored
7月 19, 2021
作者:
zhengxin.ren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix XxlJobContext CODE spell error
上级
ff73b1a5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
14 行增加
和
14 行删除
+14
-14
XxlJobCompleter.java
...java/com/xxl/job/admin/core/complete/XxlJobCompleter.java
+1
-1
AdminBizTest.java
...dmin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
+1
-1
XxlJobContext.java
...src/main/java/com/xxl/job/core/context/XxlJobContext.java
+4
-4
XxlJobHelper.java
.../src/main/java/com/xxl/job/core/context/XxlJobHelper.java
+6
-6
JobThread.java
...core/src/main/java/com/xxl/job/core/thread/JobThread.java
+2
-2
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java
浏览文件 @
021daa0d
...
@@ -47,7 +47,7 @@ public class XxlJobCompleter {
...
@@ -47,7 +47,7 @@ public class XxlJobCompleter {
// 1、handle success, to trigger child job
// 1、handle success, to trigger child job
String
triggerChildMsg
=
null
;
String
triggerChildMsg
=
null
;
if
(
XxlJobContext
.
HANDLE_CO
C
E_SUCCESS
==
xxlJobLog
.
getHandleCode
())
{
if
(
XxlJobContext
.
HANDLE_CO
D
E_SUCCESS
==
xxlJobLog
.
getHandleCode
())
{
XxlJobInfo
xxlJobInfo
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
loadById
(
xxlJobLog
.
getJobId
());
XxlJobInfo
xxlJobInfo
=
XxlJobAdminConfig
.
getAdminConfig
().
getXxlJobInfoDao
().
loadById
(
xxlJobLog
.
getJobId
());
if
(
xxlJobInfo
!=
null
&&
xxlJobInfo
.
getChildJobId
()!=
null
&&
xxlJobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
if
(
xxlJobInfo
!=
null
&&
xxlJobInfo
.
getChildJobId
()!=
null
&&
xxlJobInfo
.
getChildJobId
().
trim
().
length
()>
0
)
{
triggerChildMsg
=
"<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_trigger_child_run"
)
+
"<<<<<<<<<<< </span><br>"
;
triggerChildMsg
=
"<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_trigger_child_run"
)
+
"<<<<<<<<<<< </span><br>"
;
...
...
xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
浏览文件 @
021daa0d
...
@@ -32,7 +32,7 @@ public class AdminBizTest {
...
@@ -32,7 +32,7 @@ public class AdminBizTest {
HandleCallbackParam
param
=
new
HandleCallbackParam
();
HandleCallbackParam
param
=
new
HandleCallbackParam
();
param
.
setLogId
(
1
);
param
.
setLogId
(
1
);
param
.
setHandleCode
(
XxlJobContext
.
HANDLE_CO
C
E_SUCCESS
);
param
.
setHandleCode
(
XxlJobContext
.
HANDLE_CO
D
E_SUCCESS
);
List
<
HandleCallbackParam
>
callbackParamList
=
Arrays
.
asList
(
param
);
List
<
HandleCallbackParam
>
callbackParamList
=
Arrays
.
asList
(
param
);
...
...
xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
浏览文件 @
021daa0d
...
@@ -8,9 +8,9 @@ package com.xxl.job.core.context;
...
@@ -8,9 +8,9 @@ package com.xxl.job.core.context;
*/
*/
public
class
XxlJobContext
{
public
class
XxlJobContext
{
public
static
final
int
HANDLE_CO
C
E_SUCCESS
=
200
;
public
static
final
int
HANDLE_CO
D
E_SUCCESS
=
200
;
public
static
final
int
HANDLE_CO
C
E_FAIL
=
500
;
public
static
final
int
HANDLE_CO
D
E_FAIL
=
500
;
public
static
final
int
HANDLE_CO
C
E_TIMEOUT
=
502
;
public
static
final
int
HANDLE_CO
D
E_TIMEOUT
=
502
;
// ---------------------- base info ----------------------
// ---------------------- base info ----------------------
...
@@ -68,7 +68,7 @@ public class XxlJobContext {
...
@@ -68,7 +68,7 @@ public class XxlJobContext {
this
.
shardIndex
=
shardIndex
;
this
.
shardIndex
=
shardIndex
;
this
.
shardTotal
=
shardTotal
;
this
.
shardTotal
=
shardTotal
;
this
.
handleCode
=
HANDLE_CO
C
E_SUCCESS
;
// default success
this
.
handleCode
=
HANDLE_CO
D
E_SUCCESS
;
// default success
}
}
public
long
getJobId
()
{
public
long
getJobId
()
{
...
...
xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java
浏览文件 @
021daa0d
...
@@ -177,7 +177,7 @@ public class XxlJobHelper {
...
@@ -177,7 +177,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleSuccess
(){
public
static
boolean
handleSuccess
(){
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_SUCCESS
,
null
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_SUCCESS
,
null
);
}
}
/**
/**
...
@@ -187,7 +187,7 @@ public class XxlJobHelper {
...
@@ -187,7 +187,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleSuccess
(
String
handleMsg
)
{
public
static
boolean
handleSuccess
(
String
handleMsg
)
{
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_SUCCESS
,
handleMsg
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_SUCCESS
,
handleMsg
);
}
}
/**
/**
...
@@ -196,7 +196,7 @@ public class XxlJobHelper {
...
@@ -196,7 +196,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleFail
(){
public
static
boolean
handleFail
(){
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_FAIL
,
null
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_FAIL
,
null
);
}
}
/**
/**
...
@@ -206,7 +206,7 @@ public class XxlJobHelper {
...
@@ -206,7 +206,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleFail
(
String
handleMsg
)
{
public
static
boolean
handleFail
(
String
handleMsg
)
{
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_FAIL
,
handleMsg
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_FAIL
,
handleMsg
);
}
}
/**
/**
...
@@ -215,7 +215,7 @@ public class XxlJobHelper {
...
@@ -215,7 +215,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleTimeout
(){
public
static
boolean
handleTimeout
(){
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_TIMEOUT
,
null
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_TIMEOUT
,
null
);
}
}
/**
/**
...
@@ -225,7 +225,7 @@ public class XxlJobHelper {
...
@@ -225,7 +225,7 @@ public class XxlJobHelper {
* @return
* @return
*/
*/
public
static
boolean
handleTimeout
(
String
handleMsg
){
public
static
boolean
handleTimeout
(
String
handleMsg
){
return
handleResult
(
XxlJobContext
.
HANDLE_CO
C
E_TIMEOUT
,
handleMsg
);
return
handleResult
(
XxlJobContext
.
HANDLE_CO
D
E_TIMEOUT
,
handleMsg
);
}
}
/**
/**
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
浏览文件 @
021daa0d
...
@@ -215,7 +215,7 @@ public class JobThread extends Thread{
...
@@ -215,7 +215,7 @@ public class JobThread extends Thread{
TriggerCallbackThread
.
pushCallBack
(
new
HandleCallbackParam
(
TriggerCallbackThread
.
pushCallBack
(
new
HandleCallbackParam
(
triggerParam
.
getLogId
(),
triggerParam
.
getLogId
(),
triggerParam
.
getLogDateTime
(),
triggerParam
.
getLogDateTime
(),
XxlJobContext
.
HANDLE_CO
C
E_FAIL
,
XxlJobContext
.
HANDLE_CO
D
E_FAIL
,
stopReason
+
" [job running, killed]"
)
stopReason
+
" [job running, killed]"
)
);
);
}
}
...
@@ -231,7 +231,7 @@ public class JobThread extends Thread{
...
@@ -231,7 +231,7 @@ public class JobThread extends Thread{
TriggerCallbackThread
.
pushCallBack
(
new
HandleCallbackParam
(
TriggerCallbackThread
.
pushCallBack
(
new
HandleCallbackParam
(
triggerParam
.
getLogId
(),
triggerParam
.
getLogId
(),
triggerParam
.
getLogDateTime
(),
triggerParam
.
getLogDateTime
(),
XxlJobContext
.
HANDLE_CO
C
E_FAIL
,
XxlJobContext
.
HANDLE_CO
D
E_FAIL
,
stopReason
+
" [job not executed, in the job queue, killed.]"
)
stopReason
+
" [job not executed, in the job queue, killed.]"
)
);
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论