Merge remote-tracking branch 'origin/master'

DTStack · Jul 19, 2023 · 9504afc · 9504afc
2 parents eb9b834 + 0f63b06
commit 9504afc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -102,6 +102,7 @@ body:
         - v1.1
         - v1.2
         - v1.3
+        - v1.4
     validations:
       required: true
 

diff --git a/...common/src/main/java/com/dtstack/taier/datasource/plugin/common/utils/PropertiesUtil.java b/...common/src/main/java/com/dtstack/taier/datasource/plugin/common/utils/PropertiesUtil.java
@@ -59,7 +59,7 @@ public static Properties convertToProp(RdbmsSourceDTO rdbmsSourceDTO, Properties
             JSONObject propertiesJson = JSONUtil.parseJsonObject(rdbmsSourceDTO.getProperties());
             for (String key : propertiesJson.keySet()) {
                 String value = propertiesJson.getString(key);
-                if (StringUtils.isNotBlank(value)) {
+                if (StringUtils.isNotBlank(value) && StringUtils.isNotBlank(prefix)) {
                     String newKey = key.startsWith(prefix) ? key : prefix + key;
                     properties.setProperty(newKey, value);
                 }