center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #5810 from dataease/pr@dev@fixdatasource

Browse Source 
fix: 初始化demo数据源异常
This commit is contained in:
taojinlong 2023-08-01 10:04:54 +08:00 committed by GitHub
commit c57944fa1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -647,8 +647,11 @@ public class DatasourceService {
}
mysqlConfiguration.setHost(matcher.group(1));
mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]);
mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]);
String databaseParams = matcher.group(3);
mysqlConfiguration.setDataBase(databaseParams.split("\\?")[0]);
if (databaseParams.split("\\?").length > 1) {
mysqlConfiguration.setExtraParams(databaseParams.split("\\?")[1]);
}
mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
datasource.setConfiguration(new Gson().toJson(mysqlConfiguration));