Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenDocCN
xxl-job
提交
231f4b86
X
xxl-job
项目概览
OpenDocCN
/
xxl-job
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
xxl-job
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
231f4b86
编写于
1月 20, 2018
作者:
许雪里
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
后端代码国际化定制
上级
54f6c050
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
10 deletion
+23
-10
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
...in/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
+2
-2
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
...ain/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
+15
-8
xxl-job-admin/src/main/resources/i18n/message.properties
xxl-job-admin/src/main/resources/i18n/message.properties
+6
-0
未找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
浏览文件 @
231f4b86
...
...
@@ -104,7 +104,7 @@ public class XxlJobTrigger {
// 4.3、trigger (fail retry)
if
(
triggerResult
.
getCode
()!=
ReturnT
.
SUCCESS_CODE
&&
failStrategy
==
ExecutorFailStrategyEnum
.
FAIL_RETRY
)
{
triggerResult
=
runExecutor
(
triggerParam
,
address
);
// update04
triggerMsgSb
.
append
(
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_fail_retry"
)
+
"<<<<<<<<<<< </span><br>"
).
append
(
triggerResult
.
getMsg
());
triggerMsgSb
.
append
(
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_
trigger_
fail_retry"
)
+
"<<<<<<<<<<< </span><br>"
).
append
(
triggerResult
.
getMsg
());
}
}
...
...
@@ -172,7 +172,7 @@ public class XxlJobTrigger {
// 4.3、trigger (fail retry)
if
(
triggerResult
.
getCode
()!=
ReturnT
.
SUCCESS_CODE
&&
failStrategy
==
ExecutorFailStrategyEnum
.
FAIL_RETRY
)
{
triggerResult
=
executorRouteStrategyEnum
.
getRouter
().
routeRun
(
triggerParam
,
addressList
);
triggerMsgSb
.
append
(
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_fail_retry"
)
+
"<<<<<<<<<<< </span><br>"
).
append
(
triggerResult
.
getMsg
());
triggerMsgSb
.
append
(
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_
trigger_
fail_retry"
)
+
"<<<<<<<<<<< </span><br>"
).
append
(
triggerResult
.
getMsg
());
}
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
浏览文件 @
231f4b86
...
...
@@ -2,6 +2,7 @@ package com.xxl.job.admin.service.impl;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.util.I18nUtil
;
import
com.xxl.job.admin.dao.XxlJobInfoDao
;
import
com.xxl.job.admin.dao.XxlJobLogDao
;
import
com.xxl.job.admin.dao.XxlJobRegistryDao
;
...
...
@@ -64,7 +65,7 @@ public class AdminBizImpl implements AdminBiz {
if
(
IJobHandler
.
SUCCESS
.
getCode
()
==
handleCallbackParam
.
getExecuteResult
().
getCode
())
{
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
log
.
getJobId
());
if
(
xxlJobInfo
!=
null
&&
StringUtils
.
isNotBlank
(
xxlJobInfo
.
getChildJobId
()))
{
callbackMsg
=
"<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>
触发子任务
<<<<<<<<<<< </span><br>"
;
callbackMsg
=
"<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>
"
+
I18nUtil
.
getString
(
"jobconf_trigger_child_run"
)
+
"
<<<<<<<<<<< </span><br>"
;
String
[]
childJobIds
=
xxlJobInfo
.
getChildJobId
().
split
(
","
);
for
(
int
i
=
0
;
i
<
childJobIds
.
length
;
i
++)
{
...
...
@@ -73,21 +74,27 @@ public class AdminBizImpl implements AdminBiz {
ReturnT
<
String
>
triggerChildResult
=
xxlJobService
.
triggerJob
(
childJobId
);
// add msg
callbackMsg
+=
MessageFormat
.
format
(
"{0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>"
,
(
i
+
1
),
childJobIds
.
length
,
childJobIds
[
i
],
(
triggerChildResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
?
"成功"
:
"失败"
),
triggerChildResult
.
getMsg
());
callbackMsg
+=
MessageFormat
.
format
(
I18nUtil
.
getString
(
"jobconf_callback_child_msg1"
),
(
i
+
1
),
childJobIds
.
length
,
childJobIds
[
i
],
(
triggerChildResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
?
I18nUtil
.
getString
(
"system_success"
):
I18nUtil
.
getString
(
"system_fail"
)),
triggerChildResult
.
getMsg
());
}
else
{
callbackMsg
+=
MessageFormat
.
format
(
" {0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>"
,
(
i
+
1
),
childJobIds
.
length
,
childJobIds
[
i
]);
callbackMsg
+=
MessageFormat
.
format
(
I18nUtil
.
getString
(
"jobconf_callback_child_msg2"
),
(
i
+
1
),
childJobIds
.
length
,
childJobIds
[
i
]);
}
}
}
}
else
if
(
IJobHandler
.
FAIL_RETRY
.
getCode
()
==
handleCallbackParam
.
getExecuteResult
().
getCode
()){
ReturnT
<
String
>
retryTriggerResult
=
xxlJobService
.
triggerJob
(
log
.
getJobId
());
callbackMsg
=
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>
执行失败重试
<<<<<<<<<<< </span><br>"
;
callbackMsg
=
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>
"
+
I18nUtil
.
getString
(
"jobconf_exe_fail_retry"
)
+
"
<<<<<<<<<<< </span><br>"
;
callbackMsg
+=
MessageFormat
.
format
(
"触发{0}, 触发备注: {1}"
,
(
retryTriggerResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
?
"成功"
:
"失败"
),
retryTriggerResult
.
getMsg
());
callbackMsg
+=
MessageFormat
.
format
(
I18nUtil
.
getString
(
"jobconf_callback_msg1"
)
,
(
retryTriggerResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
?
I18nUtil
.
getString
(
"system_success"
):
I18nUtil
.
getString
(
"system_fail"
)
),
retryTriggerResult
.
getMsg
());
}
// handle msg
...
...
xxl-job-admin/src/main/resources/i18n/message.properties
浏览文件 @
231f4b86
...
...
@@ -217,6 +217,12 @@ jobconf_trigger_exe_regtype=执行器-注册方式
jobconf_trigger_exe_regaddress
=
执行器-地址列表
jobconf_trigger_address_empty
=
调度失败:执行器地址为空
jobconf_trigger_run
=
触发调度
jobconf_trigger_child_run
=
触发子任务
jobconf_trigger_fail_retry
=
调度失败重试
jobconf_exe_fail_retry
=
执行失败重试
jobconf_callback_child_msg1
=
{0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>
jobconf_callback_child_msg2
=
{0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>
jobconf_callback_msg1
=
触发{0}, 触发备注: {1} <br>
## help
job_help
=
使用教程
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录