From f11b1e2dbbc7378a4b9d39d59349dbbf54001827 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 19 Oct 2021 18:14:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=AB=20es=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/datasource/provider/EsProvider.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 3f955ab781..647585971b 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -227,17 +227,15 @@ public class EsProvider extends DatasourceProvider { throw new Exception(JSONObject.parseObject(response).getJSONObject("error").getString("reason")); } String version = JSONObject.parseObject(response).getJSONObject("version").getString("number"); + String[] versionList = version.split("\\."); + if(Integer.valueOf(versionList[0]) < 7 && Integer.valueOf(versionList[1]) < 3){ + throw new Exception(Translator.get("i18n_es_limit")); + } - if(Integer.valueOf(version.split("\\.")[0]) < 6 ){ - throw new Exception(Translator.get("i18n_es_limit")); - } - if(Integer.valueOf(version.split("\\.")[1]) < 3 ){ - throw new Exception(Translator.get("i18n_es_limit")); - } - if(Integer.valueOf(version.split("\\.")[0]) == 6 ) { + if(Integer.valueOf(versionList[0]) == 6 ) { esConfiguration.setUri("_xpack/sql"); } - if(Integer.valueOf(version.split("\\.")[0]) == 7 ) { + if(Integer.valueOf(versionList[0]) == 7 ) { esConfiguration.setUri("_sql"); } datasourceRequest.getDatasource().setConfiguration(new Gson().toJson(esConfiguration));