diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java index 00478b4a..52a83d98 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java @@ -97,10 +97,10 @@ public class JobGroupController { String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (StringTool.isBlank(item)) { - return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_invalid") ); } if (!(HttpTool.isHttp(item) || HttpTool.isHttps(item))) { - return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid")+"[2]" ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_invalid")+"[2]" ); } } } @@ -143,10 +143,10 @@ public class JobGroupController { String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (StringTool.isBlank(item)) { - return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return Response.ofFail(I18nUtil.getString("jobgroup_field_registryList_invalid") ); } if (!(HttpTool.isHttp(item) || HttpTool.isHttps(item))) { - return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_unvalid")+"[2]" ); + return Response.ofFail( I18nUtil.getString("jobgroup_field_registryList_invalid")+"[2]" ); } } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index f64bb66c..a756abb6 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -250,7 +250,7 @@ public class JobLogController { } else if (type == 9) { clearBeforeNum = 0; // 清理所有日志数据 } else { - return Response.ofFail(I18nUtil.getString("joblog_clean_type_unvalid")); + return Response.ofFail(I18nUtil.getString("joblog_clean_type_invalid")); } List logIds = null; @@ -270,7 +270,7 @@ public class JobLogController { // base check XxlJobLog jobLog = xxlJobLogMapper.load(id); if (jobLog == null) { - throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid")); + throw new RuntimeException(I18nUtil.getString("joblog_logid_invalid")); } // valid permission @@ -294,7 +294,7 @@ public class JobLogController { // valid XxlJobLog jobLog = xxlJobLogMapper.load(logId); // todo, need to improve performance if (jobLog == null) { - return Response.ofFail(I18nUtil.getString("joblog_logid_unvalid")); + return Response.ofFail(I18nUtil.getString("joblog_logid_invalid")); } // log cat 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 f950fffc..0647ccff 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -182,7 +182,7 @@ joblog_clean_type_6=Clean up log data ten thousand record ago joblog_clean_type_7=Clean up log data thirty thousand record ago joblog_clean_type_8=Clean up log data hundred thousand record ago joblog_clean_type_9=Clean up all log data -joblog_clean_type_unvalid=Clean type is illegal +joblog_clean_type_invalid=Clean type is illegal joblog_handleCode_200=Success joblog_handleCode_500=Fail joblog_handleCode_502=Timeout @@ -194,7 +194,7 @@ joblog_rolling_log=Rolling log joblog_rolling_log_refresh=Refresh joblog_rolling_log_triggerfail=The job trigger fail, can not view the rolling log joblog_rolling_log_failoften=The request for the Rolling log is terminated, the number of failed requests exceeds the limit, Reload the log on the refresh page -joblog_logid_unvalid=Log ID is illegal +joblog_logid_invalid=Log ID is illegal ## job group jobgroup_name=Executor Manage @@ -208,7 +208,7 @@ jobgroup_field_addressType_0=Automatic registration jobgroup_field_addressType_1=Manual registration jobgroup_field_addressType_limit=Manually registration type, the machine address must not be empty jobgroup_field_registryList=machine address -jobgroup_field_registryList_unvalid=registry machine address is illegal +jobgroup_field_registryList_invalid=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 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 e5968600..7d4d2604 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 @@ -182,7 +182,7 @@ joblog_clean_type_6=清理一万条以前日志数据 joblog_clean_type_7=清理三万条以前日志数据 joblog_clean_type_8=清理十万条以前日志数据 joblog_clean_type_9=清理所有日志数据 -joblog_clean_type_unvalid=清理类型参数异常 +joblog_clean_type_invalid=清理类型参数异常 joblog_handleCode_200=成功 joblog_handleCode_500=失败 joblog_handleCode_502=失败(超时) @@ -194,7 +194,7 @@ joblog_rolling_log=执行日志 joblog_rolling_log_refresh=刷新 joblog_rolling_log_triggerfail=任务发起调度失败，无法查看执行日志 joblog_rolling_log_failoften=终止请求Rolling日志,请求失败次数超上限,可刷新页面重新加载日志 -joblog_logid_unvalid=日志ID非法 +joblog_logid_invalid=日志ID非法 ## job group jobgroup_name=执行器管理 @@ -208,7 +208,7 @@ jobgroup_field_addressType_0=自动注册 jobgroup_field_addressType_1=手动录入 jobgroup_field_addressType_limit=手动录入注册方式，机器地址不可为空 jobgroup_field_registryList=机器地址 -jobgroup_field_registryList_unvalid=机器地址格式非法 +jobgroup_field_registryList_invalid=机器地址格式非法 jobgroup_field_registryList_placeholder=请输入执行器地址列表，多地址逗号分隔 jobgroup_field_appname_limit=限制以小写字母开头，由小写字母、数字和中划线组成 jobgroup_field_appname_length=AppName长度限制为4~64 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 e0f849ec..fce7ebc9 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 @@ -182,7 +182,7 @@ joblog_clean_type_6=清理一萬條以前日誌資料 joblog_clean_type_7=清理三萬條以前日誌資料 joblog_clean_type_8=清理十萬條以前日誌資料 joblog_clean_type_9=清理所有日誌資料 -joblog_clean_type_unvalid=清理類型參数異常 +joblog_clean_type_invalid=清理類型參数異常 joblog_handleCode_200=成功 joblog_handleCode_500=失敗 joblog_handleCode_502=失敗(超時) @@ -194,7 +194,7 @@ joblog_rolling_log=執行日誌 joblog_rolling_log_refresh=更新 joblog_rolling_log_triggerfail=任務發起調度失敗，無法查看執行日誌 joblog_rolling_log_failoften=終止請求Rolling日誌，請求失敗次數超上限，可刷新頁面重新加載日誌 -joblog_logid_unvalid=日誌ID非法 +joblog_logid_invalid=日誌ID非法 ## job group jobgroup_name=執行器管理 @@ -208,7 +208,7 @@ jobgroup_field_addressType_0=自動注冊 jobgroup_field_addressType_1=手動登錄 jobgroup_field_addressType_limit=手動登錄注冊方式，機器地址不可為空 jobgroup_field_registryList=機器地址 -jobgroup_field_registryList_unvalid=機器地址格式非法 +jobgroup_field_registryList_invalid=機器地址格式非法 jobgroup_field_registryList_placeholder=請輸入執行器地址列表，多個地址請以逗號分隔 jobgroup_field_appname_limit=限制以小寫字母開頭，由小寫字母、數字和中划線組成 jobgroup_field_appname_length=AppName長度限制為4~64