From ebfb1ff5688ab1de9ec1546b3e501c4662106b1b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 22 Mar 2024 17:46:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE=E6=BA=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=90=8E=EF=BC=8C=E5=85=B3=E9=97=AD=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/JdbcProvider.java | 2 +- .../dataease/plugins/datasource/dm/provider/DmDsProvider.java | 1 + .../datasource/kingbase/provider/KingbaseDsProvider.java | 1 + .../plugins/datasource/kylin/provider/KylinDsProvider.java | 1 + .../plugins/datasource/mongo/provider/MongobiDsProvider.java | 1 + .../plugins/datasource/dm/provider/PrestoDsProvider.java | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 64668ce6a2..2f02c65665 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -615,9 +615,9 @@ public class JdbcProvider extends DefaultJdbcProvider { if (StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0) { if (!Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))) { + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); } - ; } return conn; } diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java index 6b7cc957a8..c5075788cd 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java +++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java @@ -114,6 +114,7 @@ public class DmDsProvider extends DefaultJdbcProvider { } if (StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0) { if (!Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))) { + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); } } diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java index 58b59d2a67..49d560063b 100644 --- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java +++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java @@ -96,6 +96,7 @@ public class KingbaseDsProvider extends DefaultJdbcProvider { } if(StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0){ if(! Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))){ + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); }; } diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java index d4f85c4f43..a65b4be9ac 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java +++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java @@ -89,6 +89,7 @@ public class KylinDsProvider extends DefaultJdbcProvider { } if(StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0){ if(! Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))){ + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); }; } diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/provider/MongobiDsProvider.java b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/provider/MongobiDsProvider.java index 0c2fc3c82c..227e21f024 100644 --- a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/provider/MongobiDsProvider.java +++ b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/provider/MongobiDsProvider.java @@ -94,6 +94,7 @@ public class MongobiDsProvider extends DefaultJdbcProvider { } if(StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0){ if(! Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))){ + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); }; } diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/PrestoDsProvider.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/PrestoDsProvider.java index a06fafc3ce..7174d4cb0b 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/PrestoDsProvider.java +++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/PrestoDsProvider.java @@ -116,6 +116,7 @@ public class PrestoDsProvider extends DefaultJdbcProvider { if(StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0){ if(! Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseProductVersion().split("-")[0]))){ + conn.close(); DataEaseException.throwException("当前驱动不支持此版本!"); }; }