From 3ae10f4592eae621396c22da7babf812efef10df Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 5 Apr 2022 21:49:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=9B=86=E7=BE=A4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/ExtractDataService.java | 7 ++++++- .../java/io/dataease/service/kettle/KettleService.java | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index fe31d15721..85ebe9b281 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -876,7 +876,12 @@ public class ExtractDataService { case StarRocks: 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.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 Date: Tue, 5 Apr 2022 21:57:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20es=20=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/EsProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; From 8d1812f8faa4dd7aab67952f5d3d849a97d97c93 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 5 Apr 2022 22:36:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20hive=20sql=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/datasource/JdbcProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);