From 10479d4469897fab0c210a5c139925bdd55bfe83 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Wed, 23 Mar 2022 16:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B8=8E=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ink/wgink/login/base/manager/ConfigManager.java  | 4 ++--
 .../src/main/resources/templates/config/update.html       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

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<String, String> 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<String, String> 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 @@
                 <div class="layui-form-item">
                     <table class="layui-table">
                         <colgroup>
-                            <col width="150">
+                            <col width="250">
                             <col>
                             <col width="60">
                         </colgroup>
@@ -293,7 +293,7 @@
                 <div class="layui-form-item">
                     <table class="layui-table">
                         <colgroup>
-                            <col width="150">
+                            <col width="250">
                             <col>
                             <col width="60">
                         </colgroup>
@@ -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;