diff --git a/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java b/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java index faa3ed59..11d44aec 100644 --- a/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java +++ b/login-base/src/main/java/ink/wgink/login/base/manager/ConfigManager.java @@ -67,7 +67,7 @@ public class ConfigManager implements ISystemConfigManager { public String getSystemConfigParamsValue(String key) { Map systemParams = getSystemConfigParams(); if (systemParams == null) { - return null; + return ""; } return systemParams.get(key); } @@ -86,7 +86,7 @@ public class ConfigManager implements ISystemConfigManager { public String getAppConfigParamsValue(String key) { Map appParams = getAppConfigParams(); if (appParams == null) { - return null; + return ""; } return appParams.get(key); } diff --git a/login-base/src/main/resources/templates/config/update.html b/login-base/src/main/resources/templates/config/update.html index bb891315..ab5019f1 100644 --- a/login-base/src/main/resources/templates/config/update.html +++ b/login-base/src/main/resources/templates/config/update.html @@ -264,7 +264,7 @@
- + @@ -293,7 +293,7 @@
- + @@ -562,7 +562,7 @@ } function isKeyEffective(key) { - if((/^[a-zA-Z0-9\_]+$/g.test(key))) { + if((/^[a-zA-Z0-9\_\-]+$/g.test(key))) { return true; } return false; @@ -578,7 +578,7 @@ } keyupSetTimeout = setTimeout(function() { if(!isKeyEffective(value)) { - top.dialog.msg('参数名只能是字母、数字与下划线组合'); + top.dialog.msg('参数名只能是字母、数字、下划线与横线组合'); self.focus(); self.value = ''; return;