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 69948926f0..6d8b4f0150 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -231,17 +231,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));