Merge pull request #107 from hx23840/1.0

fix mysql url splicing error
young-datafan-ooooo1 · Sep 17, 2022 · bfee339 · bfee339
2 parents 42ff94d + 9dc0f9b
commit bfee339
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...datafan/portal/model/management/datasource/controller/DatasourceServiceApiController.java b/...datafan/portal/model/management/datasource/controller/DatasourceServiceApiController.java
@@ -113,7 +113,11 @@ public Result<Boolean, Object> jcAdd(String userId, JCDataSourceVO jcDataSourceV
                 datasource.setDriverClassName(jcDataSourceVO.getCustomDriverClass());
             } else {
                 url = datasourceService.getUrl(jcDataSourceVO);
-                datasource.setDsUrl(url + "?access=" + jcDataSourceVO.getAccess());
+                if (!url.contains("?")) {
+                    datasource.setDsUrl(url + "?access=" + jcDataSourceVO.getAccess());
+                } else {
+                    datasource.setDsUrl(url + "&access=" + jcDataSourceVO.getAccess());
+                }
             }
 
             if (jcDataSourceVO.getDsConnectorSetting() != null) {
@@ -162,7 +166,11 @@ public Result<Boolean, Object> jcUpdate(String userId, JCDataSourceVO jcDataSour
                 datasource.setDriverClassName(jcDataSourceVO.getCustomDriverClass());
             } else {
                 url = datasourceService.getUrl(jcDataSourceVO);
-                datasource.setDsUrl(url + "?access=" + jcDataSourceVO.getAccess());
+                if (!url.contains("?")) {
+                    datasource.setDsUrl(url + "?access=" + jcDataSourceVO.getAccess());
+                }else{
+                    datasource.setDsUrl(url + "&access=" + jcDataSourceVO.getAccess());
+                }
             }
 
             if (jcDataSourceVO.getDsConnectorSetting() != null) {