Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7b3db058
authored
Jan 19, 2018
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Rolling Log界面,完整国际化定制
parent
c2f3a827
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
xxl-job-admin/src/main/resources/i18n/message.properties
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
xxl-job-admin/src/main/resources/i18n/message.properties
View file @
7b3db058
...
@@ -149,8 +149,11 @@ joblog_clean_type_9=清理所有日志数据
...
@@ -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
=
执行器管理
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
View file @
7b3db058
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
<header
class=
"main-header"
>
<header
class=
"main-header"
>
<nav
class=
"navbar navbar-static-top"
>
<nav
class=
"navbar navbar-static-top"
>
<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 @@
...
@@ -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>
...
...
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
View file @
7b3db058
...
@@ -3,7 +3,7 @@ $(function() {
...
@@ -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() {
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment