center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 拼写错误

Browse Source
This commit is contained in:
taojinlong 2022-03-01 12:05:38 +08:00
parent 665cd7eefb
commit 66ffc20172
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java → backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java
View File

@ -3,7 +3,7 @@ package io.dataease.controller.request.datasource.es;
import lombok.Data; import lombok.Data;
@Data @Data
public class Requst { public class Request {
private String query; private String query;
private Integer fetch_size = 10000; private Integer fetch_size = 10000;
private boolean field_multi_value_leniency = true; private boolean field_multi_value_leniency = true;

2
backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java → backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java
View File

@ -3,6 +3,6 @@ package io.dataease.controller.request.datasource.es;
import lombok.Data; import lombok.Data;
@Data @Data
public class RequstWithCursor extends Requst{ public class RequestWithCursor extends Request {
private String cursor; private String cursor;
} }

24
backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
View File

@ -5,16 +5,14 @@ import com.google.gson.Gson;
import io.dataease.commons.utils.HttpClientConfig; import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil; import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.controller.request.datasource.es.EsReponse; import io.dataease.controller.request.datasource.es.EsReponse;
import io.dataease.controller.request.datasource.es.Requst; import io.dataease.controller.request.datasource.es.Request;
import io.dataease.controller.request.datasource.es.RequstWithCursor; import io.dataease.controller.request.datasource.es.RequestWithCursor;
import io.dataease.controller.request.datasource.DatasourceRequest; import io.dataease.controller.request.datasource.DatasourceRequest;
import io.dataease.dto.datasource.EsConfiguration; import io.dataease.dto.datasource.EsConfiguration;
import io.dataease.dto.datasource.TableDesc; import io.dataease.dto.datasource.TableDesc;
import io.dataease.dto.datasource.TableField; import io.dataease.dto.datasource.TableField;
import io.dataease.exception.DataEaseException; import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.provider.ProviderFactory;
import io.dataease.provider.query.QueryProvider;
import io.dataease.provider.query.es.EsQueryProvider; import io.dataease.provider.query.es.EsQueryProvider;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -55,11 +53,11 @@ public class EsProvider extends DatasourceProvider {
byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8));
httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth));
} }
Requst requst = new Requst(); Request request = new Request();
requst.setQuery(dsr.getQuery()); request.setQuery(dsr.getQuery());
requst.setFetch_size(dsr.getFetchSize()); request.setFetch_size(dsr.getFetchSize());
String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json"; String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json";
String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
EsReponse esReponse = new Gson().fromJson(response, EsReponse.class); EsReponse esReponse = new Gson().fromJson(response, EsReponse.class);
list.addAll(fetchResult(esReponse)); list.addAll(fetchResult(esReponse));
@ -69,7 +67,7 @@ public class EsProvider extends DatasourceProvider {
} }
if (!dsr.isPreviewData()) { if (!dsr.isPreviewData()) {
while (StringUtils.isNotEmpty(esReponse.getCursor())) { while (StringUtils.isNotEmpty(esReponse.getCursor())) {
RequstWithCursor requstWithCursor = new RequstWithCursor(); RequestWithCursor requstWithCursor = new RequestWithCursor();
requstWithCursor.setQuery(dsr.getQuery()); requstWithCursor.setQuery(dsr.getQuery());
requstWithCursor.setFetch_size(dsr.getFetchSize()); requstWithCursor.setFetch_size(dsr.getFetchSize());
requstWithCursor.setCursor(esReponse.getCursor()); requstWithCursor.setCursor(esReponse.getCursor());
@ -286,11 +284,11 @@ public class EsProvider extends DatasourceProvider {
httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth));
} }
Requst requst = new Requst(); Request request = new Request();
requst.setQuery(sql); request.setQuery(sql);
requst.setFetch_size(datasourceRequest.getFetchSize()); request.setFetch_size(datasourceRequest.getFetchSize());
String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri;
String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
return response; return response;
} }