ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rolling Log界面，完整国际化定制

This commit is contained in:
xuxueli 2018-01-19 21:19:30 +08:00
parent c2f3a827b0
commit 7b3db058be
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xxl-job-admin/src/main/resources/i18n/message.properties
View File

@ -149,8 +149,11 @@ joblog_clean_type_9=清理所有日志数据
joblog_handleCode_200=成功 joblog_handleCode_200=成功
joblog_handleCode_500=失败 joblog_handleCode_500=失败
joblog_handleCode_501=失败重试 joblog_handleCode_501=失败重试
joblog_rolling_log=执行日志
joblog_kill_log=终止任务 joblog_kill_log=终止任务
joblog_rolling_log=执行日志
joblog_rolling_log_refresh=刷新
joblog_rolling_log_triggerfail=任务发起调度失败，无法查看执行日志
joblog_rolling_log_failoften=终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志
## job group ## job group
jobgroup_name=执行器管理 jobgroup_name=执行器管理

4
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
View File

@ -14,7 +14,7 @@
<div class="container"> <div class="container">
<#-- icon --> <#-- icon -->
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand"><b>执行日志</b>Console</a> <a class="navbar-brand"><b>${I18n.joblog_rolling_log}</b> Console</a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
<i class="fa fa-bars"></i> <i class="fa fa-bars"></i>
</button> </button>
@ -33,7 +33,7 @@
<li> <li>
<a href="javascript:window.location.reload();" > <a href="javascript:window.location.reload();" >
<i class="fa fa-fw fa-refresh" ></i> <i class="fa fa-fw fa-refresh" ></i>
刷新 ${I18n.joblog_rolling_log_refresh}
</a> </a>
</li> </li>
</ul> </ul>

4
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
View File

@ -3,7 +3,7 @@ $(function() {
// trigger fail, end // trigger fail, end
if (triggerCode != 200) { if (triggerCode != 200) {
$('#logConsoleRunning').hide(); $('#logConsoleRunning').hide();
$('#logConsole').append('<span style="color: red;">任务发起调度失败，无法查看执行日志</span>'); $('#logConsole').append('<span style="color: red;">'+ I18n.joblog_rolling_log_triggerfail +'</span>');
return; return;
} }
@ -13,7 +13,7 @@ $(function() {
function pullLog() { function pullLog() {
// pullFailCount, max=20 // pullFailCount, max=20
if (pullFailCount++ > 20) { if (pullFailCount++ > 20) {
logRunStop('<span style="color: red;">终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志</span>'); logRunStop('<span style="color: red;">'+ I18n.joblog_rolling_log_failoften +'</span>');
return; return;
} }