diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 08919df5..965b874b 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2809,7 +2809,7 @@ public void execute() { - 7、【升级】升级多项maven依赖至较新版本; - 8、【优化】调度组件触发判断优化,合并PR-2502; - 9、【优化】调度日志调整,完善日志参数信息,合并PR-2761; -- 10、【优化】I18N国际化完善,合并PR-2888; +- 10、【优化】I18N国际化完善、参数名重构,合并PR-2888、PR-3006; - 11、【优化】告警组件初始化重构,提升代码可维护性,合并PR-2903; - 12、【优化】一致性哈希路由算法优化,重构哈希环逻辑提升代码简洁性; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java index 6d0028a3..710e3583 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/base/LoginController.java @@ -100,7 +100,7 @@ public class LoginController { } password = password.trim(); if (!(password.length()>=4 && password.length()<=20)) { - return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_length_limit")+"[4-20]" ); } // md5 password diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java index 29a00315..448013b3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java @@ -87,7 +87,7 @@ public class JobUserController { } xxlJobUser.setUsername(xxlJobUser.getUsername().trim()); if (!(xxlJobUser.getUsername().length()>=4 && xxlJobUser.getUsername().length()<=20)) { - return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_length_limit")+"[4-20]" ); } // valid password if (StringTool.isBlank(xxlJobUser.getPassword())) { @@ -95,7 +95,7 @@ public class JobUserController { } xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_length_limit")+"[4-20]" ); } // md5 password String passwordHash = Sha256Tool.sha256(xxlJobUser.getPassword()); @@ -127,7 +127,7 @@ public class JobUserController { if (StringTool.isNotBlank(xxlJobUser.getPassword())) { xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_length_limit")+"[4-20]" ); } // md5 password String passwordHash = Sha256Tool.sha256(xxlJobUser.getPassword()); @@ -176,7 +176,7 @@ public class JobUserController { } password = password.trim(); if (!(password.length()>=4 && password.length()<=20)) { - return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_length_limit")+"[4-20]" ); } // md5 password 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 ee6b87ff..46389ada 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -31,7 +31,7 @@ system_unvalid=illegal system_not_found=not exist system_nav=Navigation system_digits=digits -system_lengh_limit=Length limit +system_length_limit=Length limit system_permission_limit=Permission limit system_welcome=Welcome system_num_range=Numerical range limit 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 19b5dae7..c428898f 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 @@ -31,7 +31,7 @@ system_unvalid=非法 system_not_found=不存在 system_nav=导航 system_digits=整数 -system_lengh_limit=长度限制 +system_length_limit=长度限制 system_permission_limit=权限拦截 system_welcome=欢迎 system_num_range=数值范围限制 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 2570bed9..d17cd4f9 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 @@ -31,7 +31,7 @@ system_unvalid=非法 system_not_found=不存在 system_nav=導航 system_digits=整數 -system_lengh_limit=長度限制 +system_length_limit=長度限制 system_permission_limit=權限控管 system_welcome=歡迎 system_num_range=數值範圍限制 diff --git a/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl b/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl index 7aae8ab5..4f9ff773 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl +++ b/xxl-job-admin/src/main/resources/templates/biz/user.list.ftl @@ -272,11 +272,11 @@ messages : { username : { required : I18n.system_please_input + I18n.user_username, - rangelength: I18n.system_lengh_limit + "[4-20]" + rangelength: I18n.system_length_limit + "[4-20]" }, password : { required : I18n.system_please_input + I18n.user_password, - rangelength: I18n.system_lengh_limit + "[4-20]" + rangelength: I18n.system_length_limit + "[4-20]" } }, writeFormData: function() {