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

Merge pull request #6608 from dataease/pr@dev-v2@fixDatasource

Browse Source 
fix: 初始化数据引擎失败
This commit is contained in:
taojinlong 2023-11-08 04:14:02 -06:00 committed by GitHub
commit c5dd598647
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
View File

@ -122,8 +122,11 @@ public class EngineServer {
}
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[] databasePrams = matcher.group(3).split("\\?");
mysqlConfiguration.setDataBase(databasePrams[0]);
if(databasePrams.length == 2){
mysqlConfiguration.setExtraParams(databasePrams[1]);
}
mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
engine.setConfiguration(JsonUtil.toJSONString(mysqlConfiguration).toString());

5
core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
View File

@ -34,7 +34,10 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
try {
engineServer.initSimpleEngine();
datasourceServer.updateDemoDs();
}catch (Exception e){
e.printStackTrace();
}
try {
calciteProvider.initConnectionPool();
}catch (Exception e){
e.printStackTrace();