diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java index c0e5d4b45b..6f794ae4d5 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLBotManage.java @@ -153,7 +153,7 @@ public class DatasetSQLBotManage { } - public List getDatasetList(String dvInfo){ + public List getDatasetList(String dvInfo) { return extChartViewMapper.findDataSQLBotDatasetDvId(dvInfo); } @@ -538,7 +538,7 @@ public class DatasetSQLBotManage { DataSQLBotAssistantVO vo = new DataSQLBotAssistantVO(); vo.setDataBase(config.getDataBase()); vo.setExtraParams(config.getExtraParams()); - vo.setHost(config.getHost()); + vo.setHost(dsType.contains(DatasourceConfiguration.DatasourceType.es.name()) ? config.getUrl() : config.getHost()); vo.setPort(config.getPort()); vo.setName(row.get("cd_name").toString()); vo.setComment(ObjectUtils.isEmpty(row.get("cd_description")) ? vo.getName() : row.get("cd_description").toString()); diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java index 7a6e221f30..3af32fd6f0 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java @@ -48,6 +48,7 @@ public class Configuration { private String sshPassword; private String sshKey; private String sshKeyPassword; + private String url; public String getLHost(){