From 38fcb019992fd7a72a5c097922f9ff8cf0f76ffb Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 14 Oct 2021 11:18:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=ABes=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/EsProvider.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 dba8980fca..69948926f0 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -231,16 +231,17 @@ public class EsProvider extends DatasourceProvider { throw new Exception(JSONObject.parseObject(response).getJSONObject("error").getString("reason")); } String version = JSONObject.parseObject(response).getJSONObject("version").getString("number"); - if(Integer.valueOf(version.substring(0,1)) < 6 ){ + + if(Integer.valueOf(version.split("\\.")[0]) < 6 ){ throw new Exception(Translator.get("i18n_es_limit")); } - if(Integer.valueOf(version.substring(2,3)) < 3 ){ + if(Integer.valueOf(version.split("\\.")[1]) < 3 ){ throw new Exception(Translator.get("i18n_es_limit")); } - if(Integer.valueOf(version.substring(0,1)) == 6 ) { + if(Integer.valueOf(version.split("\\.")[0]) == 6 ) { esConfiguration.setUri("_xpack/sql"); } - if(Integer.valueOf(version.substring(0,1)) == 7 ) { + if(Integer.valueOf(version.split("\\.")[0]) == 7 ) { esConfiguration.setUri("_sql"); } datasourceRequest.getDatasource().setConfiguration(new Gson().toJson(esConfiguration));