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

fix: 集群模式抽取数据

Browse Source
This commit is contained in:
taojinlong 2022-04-05 21:49:24 +08:00
parent 8c0d7ae0ad
commit 3ae10f4592
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -876,7 +876,12 @@ public class ExtractDataService {
case StarRocks: case StarRocks:
MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class); MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfiguration.getHost().trim(), mysqlConfiguration.getDataBase().trim(), mysqlConfiguration.getPort().toString(), mysqlConfiguration.getUsername(), mysqlConfiguration.getPassword()); dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfiguration.getHost().trim(), mysqlConfiguration.getDataBase().trim(), mysqlConfiguration.getPort().toString(), mysqlConfiguration.getUsername(), mysqlConfiguration.getPassword());
dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8"); if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && mysqlConfiguration.getExtraParams().split("&").length > 0){
String[] params = mysqlConfiguration.getExtraParams().split("&");
for(int i=0;i<params.length;i++){
dataMeta.addExtraOption("MYSQL", params[i].split("=")[0], params[i].split("=")[1]);
}
}
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL); selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
inputStep = inputStep(transMeta, selectSQL); inputStep = inputStep(transMeta, selectSQL);

3
backend/src/main/java/io/dataease/service/kettle/KettleService.java
View File

@ -67,8 +67,7 @@ public class KettleService {
httpClientConfig.addHeader("Authorization", authValue); httpClientConfig.addHeader("Authorization", authValue);
try { try {
String response = HttpClientUtil.get("http://" + kettleDTO.getCarte() + ":" + kettleDTO.getPort() + "/kettle/status/", httpClientConfig); String response = HttpClientUtil.get("http://" + kettleDTO.getCarte() + ":" + kettleDTO.getPort() + "/kettle/status/", httpClientConfig);
return ResultHolder.success("Kettle is valid.");
return ResultHolder.error("Kettle is valid.");
}catch (Exception e){ }catch (Exception e){
return ResultHolder.error("Kettle is invalid: " + e.getMessage()); return ResultHolder.error("Kettle is invalid: " + e.getMessage());
} }