Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
6f2a5d6c
提交
6f2a5d6c
authored
1月 17, 2018
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
国际化
上级
d24b7a30
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
55 行增加
和
27 行删除
+55
-27
message.properties
xxl-job-admin/src/main/resources/i18n/message.properties
+28
-4
common.macro.ftl
.../src/main/webapp/WEB-INF/template/common/common.macro.ftl
+5
-5
help.ftl
xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
+3
-3
index.ftl
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
+11
-8
jobgroup.index.ftl
.../main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
+1
-1
jobinfo.index.ftl
...rc/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+1
-1
joblog.index.ftl
.../src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
+2
-2
login.ftl
xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
+3
-2
index.js
xxl-job-admin/src/main/webapp/static/js/index.js
+1
-1
没有找到文件。
xxl-job-admin/src/main/resources/i18n/message.properties
浏览文件 @
6f2a5d6c
admin_name
=
任务调度中心
admin_name
=
任务调度中心
admin_name_full
=
分布式任务调度平台XXL-JOB
## system
system_tips
=
系统提示
system_ok
=
确定
system_close
=
关闭
## login
login_btn
=
登录
login_btn
=
登录
login_remember_me
=
记住密码
login_remember_me
=
记住密码
login_username_placeholder
=
请输入登录账号
login_username_placeholder
=
请输入登录账号
...
@@ -11,11 +18,29 @@ login_password_lt_5=登录密码不应低于5位
...
@@ -11,11 +18,29 @@ login_password_lt_5=登录密码不应低于5位
login_success
=
登录成功
login_success
=
登录成功
login_fail
=
登录失败
login_fail
=
登录失败
## logout
logout_btn
=
注销
logout_btn
=
注销
logout_confirm
=
确认注销登录?
logout_confirm
=
确认注销登录?
logout_success
=
注销成功
logout_success
=
注销成功
logout_fail
=
注销失败
logout_fail
=
注销失败
system_tips
=
系统提示
## dashboard
system_ok
=
确定2
job_dashboard_name
=
运行报表
system_close
=
关闭2
job_dashboard_job_num
=
任务数量
\ No newline at end of file
job_dashboard_job_num_tip
=
调度中心运行的任务数量
job_dashboard_trigger_num
=
调度次数
job_dashboard_trigger_num_tip
=
调度中心触发的调度次数
job_dashboard_jobgroup_num
=
执行器数量
job_dashboard_jobgroup_num_tip
=
调度中心在线的执行器机器数量
job_dashboard_report
=
调度报表
## job info
jobinfo_name
=
任务管理
joblog_name
=
调度日志
jobgroup_name
=
执行器管理
## help
job_help
=
使用教程
job_help_document
=
官方文档
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
浏览文件 @
6f2a5d6c
...
@@ -95,11 +95,11 @@
...
@@ -95,11 +95,11 @@
<section class="sidebar">
<section class="sidebar">
<!-- sidebar menu: : style can be found in sidebar.less -->
<!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="sidebar-menu">
<ul class="sidebar-menu">
<
li class="header">常用模块</li
>
<
#--<li class="header">常用模块</li>--
>
<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-aqua"></i><span>
任务管理
</span></a></li>
<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-aqua"></i><span>
${I18nUtil.getString("jobinfo_name")}
</span></a></li>
<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-yellow"></i><span>
调度日志
</span></a></li>
<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-yellow"></i><span>
${I18nUtil.getString("joblog_name")}
</span></a></li>
<li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-green"></i><span>
执行器管理
</span></a></li>
<li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-green"></i><span>
${I18nUtil.getString("jobgroup_name")}
</span></a></li>
<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>
使用教程
</span></a></li>
<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>
${I18nUtil.getString("job_help")}
</span></a></li>
</ul>
</ul>
</section>
</section>
<!-- /.sidebar -->
<!-- /.sidebar -->
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/help.ftl
浏览文件 @
6f2a5d6c
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<div
class=
"content-wrapper"
>
<div
class=
"content-wrapper"
>
<!-- Content Header (Page header) -->
<!-- Content Header (Page header) -->
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
使用教程
</h1>
<h1>
${I18nUtil.getString("job_help")}
</h1>
<!--
<!--
<ol class="breadcrumb">
<ol class="breadcrumb">
<li><a><i class="fa fa-dashboard"></i>调度中心</a></li>
<li><a><i class="fa fa-dashboard"></i>调度中心</a></li>
...
@@ -28,13 +28,13 @@
...
@@ -28,13 +28,13 @@
<!-- Main content -->
<!-- Main content -->
<section
class=
"content"
>
<section
class=
"content"
>
<div
class=
"callout callout-info"
>
<div
class=
"callout callout-info"
>
<h4>
分布式任务调度平台XXL-JOB
</h4>
<h4>
${I18nUtil.getString("admin_name_full")}
</h4>
<br>
<br>
<p>
<p>
<a
target=
"_blank"
href=
"https://github.com/xuxueli/xxl-job"
>
github
</a>
<a
target=
"_blank"
href=
"https://github.com/xuxueli/xxl-job"
>
github
</a>
<iframe
src=
"https://ghbtns.com/github-btn.html?user=xuxueli&repo=xxl-job&type=star&count=true"
frameborder=
"0"
scrolling=
"0"
width=
"170px"
height=
"20px"
style=
"margin-bottom:-5px;"
></iframe>
<iframe
src=
"https://ghbtns.com/github-btn.html?user=xuxueli&repo=xxl-job&type=star&count=true"
frameborder=
"0"
scrolling=
"0"
width=
"170px"
height=
"20px"
style=
"margin-bottom:-5px;"
></iframe>
<br><br>
<br><br>
<a
target=
"_blank"
href=
"http://www.xuxueli.com/xxl-job/"
>
文档地址
</a>
<a
target=
"_blank"
href=
"http://www.xuxueli.com/xxl-job/"
>
${I18nUtil.getString("job_help_document")}
</a>
<br><br>
<br><br>
</p>
</p>
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/index.ftl
浏览文件 @
6f2a5d6c
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<div
class=
"content-wrapper"
>
<div
class=
"content-wrapper"
>
<!-- Content Header (Page header) -->
<!-- Content Header (Page header) -->
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
运行报表
</h1>
<h1>
${I18nUtil.getString("job_dashboard_name")}
</h1>
<!--
<!--
<h1>运行报表<small>任务调度中心</small></h1>
<h1>运行报表<small>任务调度中心</small></h1>
<ol class="breadcrumb">
<ol class="breadcrumb">
...
@@ -40,13 +40,13 @@
...
@@ -40,13 +40,13 @@
<span
class=
"info-box-icon"
><i
class=
"fa fa-flag-o"
></i></span>
<span
class=
"info-box-icon"
><i
class=
"fa fa-flag-o"
></i></span>
<div
class=
"info-box-content"
>
<div
class=
"info-box-content"
>
<span
class=
"info-box-text"
>
任务数量
</span>
<span
class=
"info-box-text"
>
${I18nUtil.getString("job_dashboard_job_num")}
</span>
<span
class=
"info-box-number"
>
${jobInfoCount}
</span>
<span
class=
"info-box-number"
>
${jobInfoCount}
</span>
<div
class=
"progress"
>
<div
class=
"progress"
>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
</div>
</div>
<span
class=
"progress-description"
>
调度中心运行的任务数量
</span>
<span
class=
"progress-description"
>
${I18nUtil.getString("job_dashboard_job_num_tip")}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -57,14 +57,14 @@
...
@@ -57,14 +57,14 @@
<span
class=
"info-box-icon"
><i
class=
"fa fa-calendar"
></i></span>
<span
class=
"info-box-icon"
><i
class=
"fa fa-calendar"
></i></span>
<div
class=
"info-box-content"
>
<div
class=
"info-box-content"
>
<span
class=
"info-box-text"
>
调度次数
</span>
<span
class=
"info-box-text"
>
${I18nUtil.getString("job_dashboard_trigger_num")}
</span>
<span
class=
"info-box-number"
>
${jobLogCount}
</span>
<span
class=
"info-box-number"
>
${jobLogCount}
</span>
<div
class=
"progress"
>
<div
class=
"progress"
>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
</div>
</div>
<span
class=
"progress-description"
>
<span
class=
"progress-description"
>
调度中心触发的调度次数
${I18nUtil.getString("job_dashboard_trigger_num_tip")}
<
#
--
<#
if
jobLogCount
gt
0
>
<
#
--
<#
if
jobLogCount
gt
0
>
调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}
<small>
%
</small>
调度成功率:${(jobLogSuccessCount*100/jobLogCount)?string("0.00")}
<small>
%
</small>
</
#
if>
-->
</
#
if>
-->
...
@@ -79,13 +79,13 @@
...
@@ -79,13 +79,13 @@
<span
class=
"info-box-icon"
><i
class=
"fa ion-ios-settings-strong"
></i></span>
<span
class=
"info-box-icon"
><i
class=
"fa ion-ios-settings-strong"
></i></span>
<div
class=
"info-box-content"
>
<div
class=
"info-box-content"
>
<span
class=
"info-box-text"
>
执行器数量
</span>
<span
class=
"info-box-text"
>
${I18nUtil.getString("job_dashboard_jobgroup_num")}
</span>
<span
class=
"info-box-number"
>
${executorCount}
</span>
<span
class=
"info-box-number"
>
${executorCount}
</span>
<div
class=
"progress"
>
<div
class=
"progress"
>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
</div>
</div>
<span
class=
"progress-description"
>
调度中心在线的执行器机器数量
</span>
<span
class=
"progress-description"
>
${I18nUtil.getString("job_dashboard_jobgroup_num_tip")}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"box"
>
<div
class=
"box"
>
<div
class=
"box-header with-border"
>
<div
class=
"box-header with-border"
>
<h3
class=
"box-title"
>
调度报表
</h3>
<h3
class=
"box-title"
>
${I18nUtil.getString("job_dashboard_report")}
</h3>
<
#
--
<
input
type=
"text"
class=
"form-control"
id=
"filterTime"
readonly
>
-->
<
#
--
<
input
type=
"text"
class=
"form-control"
id=
"filterTime"
readonly
>
-->
<!-- tools box -->
<!-- tools box -->
...
@@ -137,6 +137,9 @@
...
@@ -137,6 +137,9 @@
<
@
netCommon
.
commonFooter
/>
<
@
netCommon
.
commonFooter
/>
</div>
</div>
<
@
netCommon
.
commonScript
/>
<
@
netCommon
.
commonScript
/>
<script>
var
system_tips
=
'${I18nUtil.getString("system_tips")}'
;
</script>
<!-- daterangepicker -->
<!-- daterangepicker -->
<script
src=
"${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/plugins/daterangepicker/moment.min.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/plugins/daterangepicker/daterangepicker.js"
></script>
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
浏览文件 @
6f2a5d6c
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<div
class=
"content-wrapper"
>
<div
class=
"content-wrapper"
>
<!-- Content Header (Page header) -->
<!-- Content Header (Page header) -->
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
执行器管理
</h1>
<h1>
${I18nUtil.getString("jobgroup_name")}
</h1>
</section>
</section>
<!-- Main content -->
<!-- Main content -->
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
浏览文件 @
6f2a5d6c
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<div
class=
"content-wrapper"
>
<div
class=
"content-wrapper"
>
<!-- Content Header (Page header) -->
<!-- Content Header (Page header) -->
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
任务管理
</h1>
<h1>
${I18nUtil.getString("jobinfo_name")}
</h1>
<!--
<!--
<ol class="breadcrumb">
<ol class="breadcrumb">
<li><a><i class="fa fa-dashboard"></i>调度管理</a></li>
<li><a><i class="fa fa-dashboard"></i>调度管理</a></li>
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl
浏览文件 @
6f2a5d6c
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<div
class=
"content-wrapper"
>
<div
class=
"content-wrapper"
>
<!-- Content Header (Page header) -->
<!-- Content Header (Page header) -->
<section
class=
"content-header"
>
<section
class=
"content-header"
>
<h1>
调度日志
</h1>
<h1>
${I18nUtil.getString("joblog_name")}
</h1>
<!--
<!--
<ol class="breadcrumb">
<ol class="breadcrumb">
<li><a><i class="fa fa-dashboard"></i>调度日志</a></li>
<li><a><i class="fa fa-dashboard"></i>调度日志</a></li>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-12"
>
<div
class=
"col-xs-12"
>
<div
class=
"box"
>
<div
class=
"box"
>
<
div
class=
"box-header hide"
><h3
class=
"box-title"
>
调度日志
</h3></div
>
<
#
--
<
div
class=
"box-header hide"
><h3
class=
"box-title"
>
调度日志
</h3></div>
--
>
<div
class=
"box-body"
>
<div
class=
"box-body"
>
<table
id=
"joblog_list"
class=
"table table-bordered table-striped display"
width=
"100%"
>
<table
id=
"joblog_list"
class=
"table table-bordered table-striped display"
width=
"100%"
>
<thead>
<thead>
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl
浏览文件 @
6f2a5d6c
...
@@ -39,6 +39,9 @@
...
@@ -39,6 +39,9 @@
</div>
</div>
<
@
netCommon
.
commonScript
/>
<
@
netCommon
.
commonScript
/>
<script>
<script>
var
system_tips
=
'${I18nUtil.getString("system_tips")}'
;
var
system_ok
=
'${I18nUtil.getString("system_ok")}'
;
var
login_username_empty
=
'${I18nUtil.getString("login_username_empty")}'
;
var
login_username_empty
=
'${I18nUtil.getString("login_username_empty")}'
;
var
login_username_lt_5
=
'${I18nUtil.getString("login_username_lt_5")}'
;
var
login_username_lt_5
=
'${I18nUtil.getString("login_username_lt_5")}'
;
...
@@ -47,8 +50,6 @@ var login_password_lt_5 = '${I18nUtil.getString("login_password_lt_5")}';
...
@@ -47,8 +50,6 @@ var login_password_lt_5 = '${I18nUtil.getString("login_password_lt_5")}';
var
login_success
=
'${I18nUtil.getString("login_success")}'
;
var
login_success
=
'${I18nUtil.getString("login_success")}'
;
var
login_fail
=
'${I18nUtil.getString("login_fail")}'
;
var
login_fail
=
'${I18nUtil.getString("login_fail")}'
;
var
system_tips
=
'${I18nUtil.getString("system_tips")}'
;
var
system_ok
=
'${I18nUtil.getString("system_ok")}'
;
</script>
</script>
<script
src=
"${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"
></script>
<script
src=
"${request.contextPath}/static/plugins/jquery/jquery.validate.min.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/plugins/iCheck/icheck.min.js"
></script>
<script
src=
"${request.contextPath}/static/adminlte/plugins/iCheck/icheck.min.js"
></script>
...
...
xxl-job-admin/src/main/webapp/static/js/index.js
浏览文件 @
6f2a5d6c
...
@@ -63,7 +63,7 @@ $(function () {
...
@@ -63,7 +63,7 @@ $(function () {
pieChartInit
(
data
);
pieChartInit
(
data
);
}
else
{
}
else
{
layer
.
open
({
layer
.
open
({
title
:
'系统提示'
,
title
:
system_tips
,
content
:
(
data
.
msg
||
'调度报表数据加载异常'
),
content
:
(
data
.
msg
||
'调度报表数据加载异常'
),
icon
:
'2'
icon
:
'2'
});
});
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论