dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Simple 模式下，DataEase 在启动时读取数据库配置文件自动添加引擎设置参数

Browse Source
This commit is contained in:
taojinlong 2022-04-21 21:19:18 +08:00
parent e20c1a375d
commit a5d8d6cbbb
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
View File

@ -2,6 +2,7 @@ package io.dataease.listener;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.engine.EngineService;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.core.annotation.Order;
@ -15,11 +16,14 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
private DatasourceService datasourceService;
@Resource
private DataSetTableService dataSetTableService;
@Resource
private EngineService engineService;
@Override
public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
datasourceService.initAllDataSourceConnectionPool();
// dataSetTableService.updateDatasetTableStatus();
dataSetTableService.updateDatasetTableStatus();
engineService.initSimpleEngine();
}

35
backend/src/main/java/io/dataease/service/engine/EngineService.java
View File

@ -8,6 +8,7 @@ import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.controller.ResultHolder;
import io.dataease.dto.datasource.DorisConfiguration;
import io.dataease.dto.datasource.MysqlConfiguration;
import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.plugins.common.base.domain.DeEngine;
@ -25,14 +26,15 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.sql.Array;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Service
@Transactional(rollbackFor = Exception.class)
public class EngineService {
@Resource
private Environment env;
private Environment env;
@Resource
private DeEngineMapper deEngineMapper;
@Resource
@ -196,5 +198,34 @@ public class EngineService {
return datasource;
}
public void initSimpleEngine(){
if (!isSimpleMode()) {
return;
}
DeEngineExample engineExample = new DeEngineExample();
engineExample.createCriteria().andTypeEqualTo("engine_mysql");
List<DeEngine> deEngines = deEngineMapper.selectByExampleWithBLOBs(engineExample);
if (CollectionUtils.isNotEmpty(deEngines)) {
return;
}
DeEngine engine = new DeEngine();
engine.setId(UUID.randomUUID().toString());
engine.setType("engine_mysql");
MysqlConfiguration mysqlConfiguration = new MysqlConfiguration();
Pattern WITH_SQL_FRAGMENT = Pattern.compile("jdbc:mysql://(.*):(\\d+)/(.*)");
Matcher matcher = WITH_SQL_FRAGMENT.matcher(env.getProperty("spring.datasource.url"));
if(!matcher.find()){
return;
};
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]);
mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
engine.setConfiguration(new Gson().toJson(mysqlConfiguration));
deEngineMapper.insert(engine);
}
}