From 6343f4b030e05b3c094f26bc5594a4d83e186579 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 12 Apr 2020 01:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=B8=AD=E5=BF=83=E4=B8=8E?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E9=80=9A=E8=AE=AF=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=B8=BA=E5=8F=8C=E5=90=91restful=EF=BC=8C=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E8=B7=A8=E8=AF=AD=E8=A8=80=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=89=A7=E8=A1=8C=E5=99=A8=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=EF=BC=9B=E9=80=9A=E8=AE=AF=E7=BB=84=E4=BB=B6xxl-rpc=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E8=B0=83=E6=95=B4=E4=B8=BAJetty+Gson=E6=96=B9?= =?UTF-8?q?=E6=A1=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl/job/admin/controller/JobGroupController.java | 4 ++-- .../src/main/resources/i18n/message_en.properties | 4 ++-- .../src/main/resources/i18n/message_zh_CN.properties | 4 ++-- .../src/main/resources/i18n/message_zh_TC.properties | 4 ++-- .../src/main/resources/static/js/jobgroup.index.1.js | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index d5c0b7a0..e87666e8 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -66,7 +66,7 @@ public class JobGroupController { return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); } if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appName_length") ); + return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); @@ -95,7 +95,7 @@ public class JobGroupController { return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); } if (xxlJobGroup.getAppName().length()<4 || xxlJobGroup.getAppName().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appName_length") ); + return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index 2a4fc166..5a65ddfb 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -199,8 +199,8 @@ jobgroup_field_addressType_limit=Manually registration type, the machine address 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 hyphen. -jobgroup_field_appName_length=AppName length is limited to 4~64 +jobgroup_field_appname_limit=Limit the beginning of a lowercase letter, consists of lowercase letters、number and hyphen. +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 diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index c3bdc86e..7e150d2d 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -199,8 +199,8 @@ 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_appname_limit=限制以小写字母开头，由小写字母、数字和中划线组成 +jobgroup_field_appname_length=AppName长度限制为4~64 jobgroup_field_title_length=名称长度限制为4~12 jobgroup_field_order_digits=请输入整数 jobgroup_field_orderrange=取值范围为1~1000 diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index dab47eab..d0afcae1 100755 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -199,8 +199,8 @@ 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_appname_limit=限制以小寫字母開頭，由小寫字母、數字和中划線組成 +jobgroup_field_appname_length=AppName長度限制為4~64 jobgroup_field_title_length=名稱長度限制為4~12 jobgroup_field_order_digits=請輸入整數 jobgroup_field_orderrange=取值範圍為1~1000 diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js index 32f36b55..e950496f 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js @@ -186,7 +186,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 ); + }, I18n.jobgroup_field_appname_limit ); $('.add').on('click', function(){ $('#addModal').modal({backdrop: false, keyboard: false}).modal('show'); @@ -209,8 +209,8 @@ $(function() { messages : { appName : { required : I18n.system_please_input+"AppName", - rangelength: I18n.jobgroup_field_appName_length , - myValid01: I18n.jobgroup_field_appName_limit + rangelength: I18n.jobgroup_field_appname_length , + myValid01: I18n.jobgroup_field_appname_limit }, title : { required : I18n.system_please_input + I18n.jobgroup_field_title , @@ -306,8 +306,8 @@ $(function() { messages : { appName : { required : I18n.system_please_input+"AppName", - rangelength: I18n.jobgroup_field_appName_length , - myValid01: I18n.jobgroup_field_appName_limit + rangelength: I18n.jobgroup_field_appname_length , + myValid01: I18n.jobgroup_field_appname_limit }, title : { required : I18n.system_please_input + I18n.jobgroup_field_title ,