Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
3d72c73e
提交
3d72c73e
authored
1月 20, 2018
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
后端代码国际化定制
上级
60fccc8b
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
56 行增加
和
56 行删除
+56
-56
XxlJobTrigger.java
...in/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
+2
-2
message_en.properties
xxl-job-admin/src/main/resources/i18n/message_en.properties
+53
-53
joblog.index.ftl
.../src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
+1
-1
没有找到文件。
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
浏览文件 @
3d72c73e
...
...
@@ -114,7 +114,7 @@ public class XxlJobTrigger {
jobLog
.
setTriggerMsg
(
triggerMsgSb
.
toString
());
XxlJobDynamicScheduler
.
xxlJobLogDao
.
updateTriggerInfo
(
jobLog
);
// 6、monitor triger
// 6、monitor trig
g
er
JobFailMonitorHelper
.
monitor
(
jobLog
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job trigger end, jobId:{}"
,
jobLog
.
getId
());
...
...
@@ -182,7 +182,7 @@ public class XxlJobTrigger {
jobLog
.
setTriggerMsg
(
triggerMsgSb
.
toString
());
XxlJobDynamicScheduler
.
xxlJobLogDao
.
updateTriggerInfo
(
jobLog
);
// 6、monitor triger
// 6、monitor trig
g
er
JobFailMonitorHelper
.
monitor
(
jobLog
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job trigger end, jobId:{}"
,
jobLog
.
getId
());
}
...
...
xxl-job-admin/src/main/resources/i18n/message_en.properties
浏览文件 @
3d72c73e
...
...
@@ -171,59 +171,59 @@ joblog_rolling_log_failoften=The request for the Rolling log is terminated, the
joblog_logid_unvalid
=
Log ID is illegal
## job group
jobgroup_name
=
执行器管理
jobgroup_list
=
执行器列表
jobgroup_add
=
新增执行器
jobgroup_edit
=
编辑执行器
jobgroup_del
=
删除执行器
jobgroup_field_order
=
排序
jobgroup_field_title
=
名称
jobgroup_field_addressType
=
注册方式
jobgroup_field_addressType_0
=
自动注册
jobgroup_field_addressType_1
=
手动录入
jobgroup_field_addressType_limit
=
手动录入注册方式,机器地址不可为空
jobgroup_field_registryList
=
机器地址
jobgroup_field_registryList_unvalid
=
机器地址格式非法
jobgroup_field_registryList_placeholder
=
请输入执行器地址列表,多地址逗号分隔
jobgroup_field_appName_limit
=
限制以小写字母开头,由小写字母、数字和中划线组成
jobgroup_field_appName_length
=
AppName
长度限制为
4~64
jobgroup_field_title_length
=
名称长度限制为
4~12
jobgroup_field_order_digits
=
请输入整数
jobgroup_field_orderrange
=
取值范围为
1~1000
jobgroup_del_limit_0
=
拒绝删除,该执行器使用中
jobgroup_del_limit_1
=
拒绝删除, 系统至少保留一个执行器
jobgroup_name
=
Executor Manage
jobgroup_list
=
Executor List
jobgroup_add
=
Add Executor
jobgroup_edit
=
Edit Executor
jobgroup_del
=
Delete Executor
jobgroup_field_order
=
Order
jobgroup_field_title
=
Title
jobgroup_field_addressType
=
Registry Type
jobgroup_field_addressType_0
=
Automatic registration
jobgroup_field_addressType_1
=
Manual registration
jobgroup_field_addressType_limit
=
Manually registration type, the machine address must not be empty
jobgroup_field_registryList
=
machine address
jobgroup_field_registryList_unvalid
=
registry machine address is illegal
jobgroup_field_registryList_placeholder
=
Please enter the machine address, if there are more than one comma separated
jobgroup_field_appName_limit
=
Limit the beginning of a lowercase letter, consists of lowercase letters、number and underscores.
jobgroup_field_appName_length
=
AppName
length is limited to
4~64
jobgroup_field_title_length
=
Title length is limited to
4~12
jobgroup_field_order_digits
=
Please enter a positive integer
jobgroup_field_orderrange
=
Order is limited to
1~1000
jobgroup_del_limit_0
=
Refuse to delete, the executor is being used
jobgroup_del_limit_1
=
Refuses to delete, the system retains at least one executor
## job conf
jobconf_fail_alarm
=
失败告警
jobconf_fail_retry
=
失败重试
jobconf_route_first
=
第一个
jobconf_route_last
=
最后一个
jobconf_route_round
=
轮询
jobconf_route_random
=
随机
jobconf_route_consistenthash
=
一致性HASH
jobconf_route_lfu
=
最不经常使用
jobconf_route_lru
=
最近最久未使用
jobconf_route_failover
=
故障转移
jobconf_route_busyover
=
忙碌转移
jobconf_route_shard
=
分片广播
jobconf_idleBeat
=
空闲检测
jobconf_beat
=
心跳检测
jobconf_monitor
=
调度中心监控报警
jobconf_monitor_detail
=
监控告警明细
jobconf_monitor_alarm_title
=
告警类型
jobconf_monitor_alarm_type
=
调度失败
jobconf_trigger_admin_adress
=
调度机器
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>
jobconf_fail_alarm
=
Fail Alarm
jobconf_fail_retry
=
Fail Retry
jobconf_route_first
=
First
jobconf_route_last
=
Last
jobconf_route_round
=
Round
jobconf_route_random
=
Random
jobconf_route_consistenthash
=
Consistent Hash
jobconf_route_lfu
=
Least Frequently Used
jobconf_route_lru
=
Least Recently Used
jobconf_route_failover
=
Failover
jobconf_route_busyover
=
Busyover
jobconf_route_shard
=
Sharding Broadcast
jobconf_idleBeat
=
Idle check
jobconf_beat
=
Heartbeats
jobconf_monitor
=
Scheduling Center monitor alarm
jobconf_monitor_detail
=
monitor alarm details
jobconf_monitor_alarm_title
=
Alarm Type
jobconf_monitor_alarm_type
=
Trigger Fail
jobconf_trigger_admin_adress
=
Trigger machine address
jobconf_trigger_exe_regtype
=
Execotor-Registry Type
jobconf_trigger_exe_regaddress
=
Execotor-Registry Address
jobconf_trigger_address_empty
=
Trigger Fail:registry address is empty
jobconf_trigger_run
=
Trigger Job
jobconf_trigger_child_run
=
Trigger child job
jobconf_trigger_fail_retry
=
Trigger fail retry
jobconf_exe_fail_retry
=
Handle fail retry
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
=
使用教程
job_help_document
=
官方文档
\ No newline at end of file
job_help
=
Tutorial
job_help_document
=
Official Document
\ No newline at end of file
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
浏览文件 @
3d72c73e
...
...
@@ -61,7 +61,7 @@
<div
class=
"col-xs-4"
>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
调度时间
${I18n.joblog_field_triggerTime}
</span>
<input
type=
"text"
class=
"form-control"
id=
"filterTime"
readonly
>
</div>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论