Merge pull request #3813 from actiontech/fix/1752

[inner-1752] fix: replace Chinese commas
actiontech · Sep 5, 2023 · 9c1fc29 · 9c1fc29
2 parents 7f590f4 + 8531b69
commit 9c1fc29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/actiontech/dble/config/helper/GetAndSyncDbInstanceKeyVariables.java b/src/main/java/com/actiontech/dble/config/helper/GetAndSyncDbInstanceKeyVariables.java
@@ -71,7 +71,7 @@ public KeyVariables call() {
                 if (!await) {
                     fail = true;
                     isFinish = true;
-                    LOGGER.warn("test conn timeout，TCP connection may be lost");
+                    LOGGER.warn("test conn timeout,TCP connection may be lost");
                 }
             }
         } catch (InterruptedException e) {

diff --git a/src/main/java/com/actiontech/dble/config/model/SystemConfig.java b/src/main/java/com/actiontech/dble/config/model/SystemConfig.java
@@ -1362,7 +1362,7 @@ private void checkChineseProperty(String val, String name) {
         }
         int length = 11;
         if (val.length() > length) {
-            problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal，the value contains a maximum of " + length + " characters");
+            problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal,the value contains a maximum of " + length + " characters");
         }
 
         String chinese = val.replaceAll(XMLDbLoader.PATTERN_DB.toString(), "");
@@ -1371,7 +1371,7 @@ private void checkChineseProperty(String val, String name) {
         }
 
         if (!StringUtil.isChinese(chinese)) {
-            problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal，the " + Charset.defaultCharset().name() + " encoding is recommended, Property [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
+            problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal,the " + Charset.defaultCharset().name() + " encoding is recommended, Property [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
         }
     }
 }
diff --git a/src/main/java/com/actiontech/dble/services/manager/information/tables/DbleDbInstance.java b/src/main/java/com/actiontech/dble/services/manager/information/tables/DbleDbInstance.java
@@ -496,7 +496,7 @@ private void checkChineseProperty(String val, String name) {
         }
 
         if (!StringUtil.isChinese(chinese)) {
-            throw new ConfigException("Column [ " + name + " ] " + val + " is illegal，the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
+            throw new ConfigException("Column [ " + name + " ] " + val + " is illegal,the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             if (!StringUtil.isChinese(chinese)) {
-                throw new ConfigException("Column [ " + name + " ] " + val + " is illegal，the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
+                throw new ConfigException("Column [ " + name + " ] " + val + " is illegal,the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ]  show be use  u4E00-u9FA5a-zA-Z_0-9\\-\\.");
             }
         }
@@ Expand Down @@