From e7b61fb75c90aad6d0db5e265b1834d5afbe2e14 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 19 Jan 2018 21:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/i18n/message.properties | 21 +++++- .../template/jobgroup/jobgroup.index.ftl | 72 +++++++++---------- .../main/webapp/static/js/jobgroup.index.1.js | 72 +++++++++---------- .../main/webapp/static/js/jobinfo.index.1.js | 6 +- 4 files changed, 93 insertions(+), 78 deletions(-) diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index e30d96f3..6c152b1b 100644 --- a/xxl-job-admin/src/main/resources/i18n/message.properties +++ b/xxl-job-admin/src/main/resources/i18n/message.properties @@ -24,6 +24,8 @@ system_show=查看 system_empty=无 system_opt_suc=操作成功 system_opt_fail=操作失败 +system_opt_edit=编辑 +system_opt_del=删除 ## daterangepicker daterangepicker_ranges_recent_hour=最近一小时 @@ -117,8 +119,6 @@ jobinfo_opt_pause=暂停 jobinfo_opt_resume=恢复 jobinfo_opt_log=日志 jobinfo_opt_run=执行 -jobinfo_opt_edit=编辑 -jobinfo_opt_del=删除 ## job log joblog_name=调度日志 @@ -157,7 +157,22 @@ joblog_rolling_log_failoften=终止请求Rolling日志,请求失败次数超上 ## 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_registryList=机器地址 +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 ## help job_help=使用教程 diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl index 45eed882..345fbca1 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl @@ -28,20 +28,20 @@
-

执行器列表

   - +

${I18n.jobgroup_list}

   +
<#----> - + - - - - + + + + @@ -52,7 +52,7 @@ - + @@ -94,41 +94,41 @@
-

新增执行器

+

${I18n.jobgroup_add}

-
+
- -
+ +
- -
+ +
- +
- 自动注册 + ${I18n.jobgroup_field_addressType_0}      - 手动录入 + ${I18n.jobgroup_field_addressType_1}
- +
- +
- - + +
@@ -142,41 +142,41 @@
-

编辑执行器

+

${I18n.jobgroup_edit}

-
+
- -
+ +
- -
+ +
- +
- 自动注册 + ${I18n.jobgroup_field_addressType_0}      - 手动录入 + ${I18n.jobgroup_field_addressType_1}
- +
- +
- - + +
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js index a395f6d0..a7bcaa44 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobgroup.index.1.js @@ -4,7 +4,7 @@ $(function() { $('.remove').on('click', function(){ var id = $(this).attr('id'); - layer.confirm('确认删除分组?', {icon: 3, title:'系统提示'}, function(index){ + layer.confirm( (I18n.system_ok + I18n.jobgroup_del + '？') , {icon: 3, title: I18n.system_tips }, function(index){ layer.close(index); $.ajax({ @@ -15,8 +15,8 @@ $(function() { success : function(data){ if (data.code == 200) { layer.open({ - title: '系统提示', - content: '删除成功', + title: I18n.system_tips , + content: (I18n.jobgroup_del + I18n.system_success), icon: '1', end: function(layero, index){ window.location.reload(); @@ -24,8 +24,8 @@ $(function() { }); } else { layer.open({ - title: '系统提示', - content: (data.msg || "删除失败"), + title: I18n.system_tips, + content: (data.msg || (I18n.jobgroup_del + I18n.system_fail)), icon: '2' }); } @@ -40,7 +40,7 @@ $(function() { var length = value.length; var valid = /^[a-z][a-zA-Z0-9-]*$/; return this.optional(element) || valid.test(value); - }, "限制以小写字母开头，由小写字母、数字和中划线组成"); + }, I18n.jobgroup_field_appName_limit ); $('.add').on('click', function(){ $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); @@ -67,18 +67,18 @@ $(function() { }, messages : { appName : { - required :"请输入“AppName”", - rangelength:"AppName长度限制为4~64", - myValid01: "限制以小写字母开头，由小写字母、数字和中划线组成" + required : I18n.system_please_input+"AppName", + rangelength: I18n.jobgroup_field_appName_length , + myValid01: I18n.jobgroup_field_appName_limit }, title : { - required :"请输入“执行器名称”", - rangelength:"长度限制为4~12" + required : I18n.system_please_input + I18n.jobgroup_field_title , + rangelength: I18n.jobgroup_field_title_length }, order : { - required :"请输入“排序”", - digits: "请输入整数", - range: "取值范围为1~1000" + required : I18n.system_please_input + I18n.jobgroup_field_order , + digits: I18n.jobgroup_field_order_digits , + range: I18n.jobgroup_field_orderrange } }, highlight : function(element) { @@ -96,8 +96,8 @@ $(function() { if (data.code == "200") { $('#addModal').modal('hide'); layer.open({ - title: '系统提示', - content: '新增成功', + title: I18n.system_tips , + content: I18n.system_add_suc , icon: '1', end: function(layero, index){ window.location.reload(); @@ -105,8 +105,8 @@ $(function() { }); } else { layer.open({ - title: '系统提示', - content: (data.msg || "新增失败"), + title: I18n.system_tips, + content: (data.msg || I18n.system_add_fail ), icon: '2' }); } @@ -171,20 +171,20 @@ $(function() { } }, messages : { - appName : { - required :"请输入“AppName”", - rangelength:"AppName长度限制为4~64", - myValid01: "限制以小写字母开头，由小写字母、数字和中划线组成" - }, - title : { - required :"请输入“执行器名称”", - rangelength:"长度限制为4~12" - }, - order : { - required :"请输入“排序”", - digits: "请输入整数", - range: "取值范围为1~1000" - } + appName : { + required : I18n.system_please_input+"AppName", + rangelength: I18n.jobgroup_field_appName_length , + myValid01: I18n.jobgroup_field_appName_limit + }, + title : { + required : I18n.system_please_input + I18n.jobgroup_field_title , + rangelength: I18n.jobgroup_field_title_length + }, + order : { + required : I18n.system_please_input + I18n.jobgroup_field_order , + digits: I18n.jobgroup_field_order_digits , + range: I18n.jobgroup_field_orderrange + } }, highlight : function(element) { $(element).closest('.form-group').addClass('has-error'); @@ -202,8 +202,8 @@ $(function() { $('#addModal').modal('hide'); layer.open({ - title: '系统提示', - content: '更新成功', + title: I18n.system_tips , + content: I18n.system_update_suc , icon: '1', end: function(layero, index){ window.location.reload(); @@ -211,8 +211,8 @@ $(function() { }); } else { layer.open({ - title: '系统提示', - content: (data.msg || "更新失败"), + title: I18n.system_tips, + content: (data.msg || I18n.system_update_fail ), icon: '2' }); } diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js index 6d153730..99f243ca 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js @@ -125,9 +125,9 @@ $(function() { ' '+ pause_resume + '
'+ - ' '+ + ' '+ codeBtn + - ' '+ + ' '+ '

'; return html; @@ -192,7 +192,7 @@ $(function() { url = base_url + "/jobinfo/resume"; needFresh = true; } else if ("job_del" == type) { - typeName = I18n.jobinfo_opt_del ; + typeName = I18n.system_opt_del ; url = base_url + "/jobinfo/remove"; needFresh = true; } else if ("job_trigger" == type) {
ID排序${I18n.jobgroup_field_order} AppName名称注册方式OnLine 机器操作${I18n.jobgroup_field_title}${I18n.jobgroup_field_addressType}OnLine ${I18n.jobgroup_field_registryList}${I18n.system_opt}
${group.order} ${group.appName} ${group.title}<#if group.addressType==0>自动注册<#else>手动录入<#if group.addressType==0>${I18n.jobgroup_field_addressType_0}<#else>${I18n.jobgroup_field_addressType_1} <#if group.registryList?exists> <#list group.registryList as item> @@ -74,8 +74,8 @@ title="${group.title}" order="${group.order}" addressType="${group.addressType}" - addressList="${group.addressList}" >编辑 - + addressList="${group.addressList}" >${I18n.system_opt_edit} +