Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LFFZC
xxl-job
提交
0af73afa
X
xxl-job
项目概览
LFFZC
/
xxl-job
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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 搜索 >>
提交
0af73afa
编写于
8月 18, 2018
作者:
许雪里
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
问题优化
上级
50b1c679
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
4 addition
and
11 deletion
+4
-11
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
+2
-7
xxl-job-admin/src/main/resources/i18n/message.properties
xxl-job-admin/src/main/resources/i18n/message.properties
+0
-1
xxl-job-admin/src/main/resources/i18n/message_en.properties
xxl-job-admin/src/main/resources/i18n/message_en.properties
+0
-1
未找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
浏览文件 @
0af73afa
...
...
@@ -83,8 +83,8 @@ public class XxlJobTrigger {
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regaddress"
)).
append
(
":"
).
append
(
group
.
getRegistryList
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorRouteStrategy"
)).
append
(
":"
).
append
(
executorRouteStrategyEnum
.
getTitle
()).
append
(
"("
+
i
+
"/"
+
addressList
.
size
()+
")"
);
// update01
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorBlockStrategy"
)).
append
(
":"
).
append
(
blockStrategy
.
getTitle
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorFailRetryCount"
)).
append
(
":"
).
append
(
finalFailRetryCount
);
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_timeout"
)).
append
(
":"
).
append
(
jobInfo
.
getExecutorTimeout
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorFailRetryCount"
)).
append
(
":"
).
append
(
finalFailRetryCount
);
// 3、trigger-valid
if
(
triggerResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
&&
CollectionUtils
.
isEmpty
(
addressList
))
{
...
...
@@ -154,8 +154,8 @@ public class XxlJobTrigger {
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regaddress"
)).
append
(
":"
).
append
(
group
.
getRegistryList
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorRouteStrategy"
)).
append
(
":"
).
append
(
executorRouteStrategyEnum
.
getTitle
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorBlockStrategy"
)).
append
(
":"
).
append
(
blockStrategy
.
getTitle
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorFailRetryCount"
)).
append
(
":"
).
append
(
finalFailRetryCount
);
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_timeout"
)).
append
(
":"
).
append
(
jobInfo
.
getExecutorTimeout
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobinfo_field_executorFailRetryCount"
)).
append
(
":"
).
append
(
finalFailRetryCount
);
// 3、trigger-valid
if
(
triggerResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
&&
CollectionUtils
.
isEmpty
(
addressList
))
{
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java
浏览文件 @
0af73afa
...
...
@@ -93,17 +93,12 @@ public class AdminBizImpl implements AdminBiz {
}
}
else
{
XxlJobInfo
xxlJobInfo
=
xxlJobInfoDao
.
loadById
(
log
.
getJobId
());
if
(
xxlJobInfo
.
getExecutorFailRetryCount
()
>
0
)
{
int
nextFailRetryCount
=
xxlJobInfo
.
getExecutorFailRetryCount
()-
1
;
if
(
log
.
getExecutorFailRetryCount
()
>
0
)
{
int
nextFailRetryCount
=
log
.
getExecutorFailRetryCount
()-
1
;
JobTriggerPoolHelper
.
trigger
(
log
.
getJobId
(),
nextFailRetryCount
);
ReturnT
<
String
>
retryTriggerResult
=
ReturnT
.
SUCCESS
;
callbackMsg
=
"<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"
+
I18nUtil
.
getString
(
"jobconf_fail_handle_retry"
)
+
"<<<<<<<<<<< </span><br>"
;
callbackMsg
+=
MessageFormat
.
format
(
I18nUtil
.
getString
(
"jobconf_callback_msg1"
),
(
retryTriggerResult
.
getCode
()==
ReturnT
.
SUCCESS_CODE
?
I18nUtil
.
getString
(
"system_success"
):
I18nUtil
.
getString
(
"system_fail"
)),
retryTriggerResult
.
getMsg
());
}
}
...
...
xxl-job-admin/src/main/resources/i18n/message.properties
浏览文件 @
0af73afa
...
...
@@ -224,7 +224,6 @@ jobconf_trigger_run=触发调度
jobconf_trigger_child_run
=
触发子任务
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
=
使用教程
...
...
xxl-job-admin/src/main/resources/i18n/message_en.properties
浏览文件 @
0af73afa
...
...
@@ -224,7 +224,6 @@ jobconf_trigger_run=Trigger Job
jobconf_trigger_child_run
=
Trigger child job
jobconf_callback_child_msg1
=
{0}/{1} [Job ID={2}], Trigger {3}, Trigger msg: {4} <br>
jobconf_callback_child_msg2
=
{0}/{1} [Job ID={2}], Trigger Fail, Trigger msg: Job ID is illegal <br>
jobconf_callback_msg1
=
Trigger {0}, Trigger msg: {1} <br>
## help
job_help
=
Tutorial
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录