diff --git a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java index de1595045e..8f068c3283 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java @@ -13,6 +13,7 @@ import io.dataease.dto.datasource.TableDesc; import io.dataease.dto.datasource.TableField; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; +import io.dataease.plugins.common.constants.EsSqlLConstants; import io.dataease.provider.query.es.EsQueryProvider; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; @@ -97,7 +98,7 @@ public class EsProvider extends DatasourceProvider { @Override public List getTableFileds(DatasourceRequest datasourceRequest) throws Exception { - datasourceRequest.setQuery("desc " + datasourceRequest.getTable()); + datasourceRequest.setQuery("desc " + String.format(EsSqlLConstants.KEYWORD_TABLE, datasourceRequest.getTable())); List tableFields = new ArrayList<>(); try { String response = exexQuery(datasourceRequest, datasourceRequest.getQuery(), "?format=json"); @@ -292,6 +293,7 @@ public class EsProvider extends DatasourceProvider { Request request = new Request(); request.setQuery(sql); request.setFetch_size(datasourceRequest.getFetchSize()); + System.out.println(new Gson().toJson(request)); String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); return response; diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 200f7afdad..cca623dba8 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -252,6 +252,7 @@ public class JdbcProvider extends DatasourceProvider { } catch (SQLException e) { DataEaseException.throwException(e); } catch (Exception e) { + e.printStackTrace(); DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage()); } return new ArrayList<>(); @@ -285,7 +286,7 @@ public class JdbcProvider extends DatasourceProvider { String l = StringUtils.isNotEmpty(metaData.getColumnLabel(j + 1)) ? metaData.getColumnLabel(j + 1) : f; String t = metaData.getColumnTypeName(j + 1); if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.hive.name()) && l.contains(".")) { - l = l.split(".")[1]; + l = l.split("\\.")[1]; } TableField field = new TableField(); field.setFieldName(l);