Skip to content

Commit fbb2651

Browse files
author
taojinlong
committed
fix: es 数据源添加表
1 parent 8ec3e7f commit fbb2651

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

backend/src/main/java/io/dataease/provider/datasource/EsProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.dataease.dto.datasource.TableField;
1414
import io.dataease.exception.DataEaseException;
1515
import io.dataease.i18n.Translator;
16+
import io.dataease.plugins.common.constants.EsSqlLConstants;
1617
import io.dataease.provider.query.es.EsQueryProvider;
1718
import org.apache.commons.codec.binary.Base64;
1819
import org.apache.commons.lang.StringUtils;
@@ -97,7 +98,7 @@ public List<String[]> fetchResult(DatasourceRequest datasourceRequest) throws Ex
9798

9899
@Override
99100
public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception {
100-
datasourceRequest.setQuery("desc " + datasourceRequest.getTable());
101+
datasourceRequest.setQuery("desc " + String.format(EsSqlLConstants.KEYWORD_TABLE, datasourceRequest.getTable()));
101102
List<TableField> tableFields = new ArrayList<>();
102103
try {
103104
String response = exexQuery(datasourceRequest, datasourceRequest.getQuery(), "?format=json");
@@ -292,6 +293,7 @@ private String exexQuery(DatasourceRequest datasourceRequest, String sql, String
292293
Request request = new Request();
293294
request.setQuery(sql);
294295
request.setFetch_size(datasourceRequest.getFetchSize());
296+
System.out.println(new Gson().toJson(request));
295297
String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri;
296298
String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
297299
return response;

0 commit comments

Comments
 (0)