From c74e3863e076c3e9b68c952a4c58bbcb72685915 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 24 Sep 2021 16:42:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=ABes=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/EsProvider.java | 9 +++++---- .../java/io/dataease/provider/es/EsQueryProvider.java | 2 +- .../io/dataease/service/dataset/DataSetTableService.java | 4 ---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java index 4e0bf23afb..003957f3a7 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -49,11 +49,12 @@ public class EsProvider extends DatasourceProvider { List list = new LinkedList<>(); try { EsConfigDTO esConfigDTO = new Gson().fromJson(dsr.getDatasource().getConfiguration(), EsConfigDTO.class); - HttpClientConfig httpClientConfig = new HttpClientConfig(); - String auth = esConfigDTO.getUsername() + ":" + esConfigDTO.getPassword(); - byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); - httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); + if(StringUtils.isNotEmpty(esConfigDTO.getUsername())){ + String auth = esConfigDTO.getUsername() + ":" + esConfigDTO.getPassword(); + byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); + httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); + } Requst requst = new Requst(); requst.setQuery(dsr.getQuery()); requst.setFetch_size(dsr.getFetchSize()); diff --git a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java index b49ebbb7c8..bc4aebf0dd 100644 --- a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java @@ -151,7 +151,7 @@ public class EsQueryProvider extends QueryProvider { String cast = String.format(EsSqlLConstants.CAST, originField, "timestamp"); fieldName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, EsSqlLConstants.DEFAULT_DATE_FORMAT); } else if (f.getDeType() == DeTypeConstants.DE_INT) { - fieldName = String.format(EsSqlLConstants.CAST, originField, "timestamp"); + fieldName = String.format(EsSqlLConstants.CAST, originField, "bigint"); } else { fieldName = originField; } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index e4050f543b..0e12bbf992 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -504,12 +504,8 @@ public class DataSetTableService { QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds)); map.put("sql", datasourceRequest.getQuery()); - System.out.println(datasourceRequest.getQuery()); try { data.addAll(jdbcProvider.getData(datasourceRequest)); - for(int i=0;i< data.size(); i++){ - System.out.println(data.get(i)[2]); - } } catch (Exception e) { e.printStackTrace(); DEException.throwException(e.getMessage());