From 25ab3753beb3554877eb6ca0484fcc211362fb39 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 24 Mar 2025 16:29:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E9=87=8C=E5=AE=9E=E7=8E=B0=E8=8E=B7=E5=8F=96=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/server/DatasourceServer.java | 7 +------ .../extensions/datasource/vo/DatasourceConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 5f969e5812..a9d48af41b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -644,7 +644,7 @@ public class DatasourceServer implements DatasourceApi { @Override @XpackInteract(value = "datasourceResourceTree", before = false) public void delete(Long datasourceId) throws DEException { - Objects.requireNonNull(CommonBeanFactory.getBean(DatasourceServer.class)).recursionDel(datasourceId); + Objects.requireNonNull(io.dataease.utils.CommonBeanFactory.getBean(DatasourceServer.class)).recursionDel(datasourceId); } public void recursionDel(Long datasourceId) throws DEException { @@ -1445,11 +1445,6 @@ public class DatasourceServer implements DatasourceApi { Object resObj = null; try { Method method = getMethod(dsType, methodName, classes); - if (object instanceof DatasourceRequest && dsType.equals("APILark")) { - Class clazz = Class.forName(DatasourceRequest.class.getName()); - Method setToken = clazz.getMethod("setToken", String.class); - setToken.invoke(object, dataSourceManage.getTenantAccessToken()); - } resObj = method.invoke(null, object); } catch (Exception e) { DEException.throwException(msg(e)); diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java index fe330c77fa..e61039f1a6 100644 --- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java @@ -27,7 +27,7 @@ public class DatasourceConfiguration extends Configuration { redshift("redshift", "AWS Redshift", "OLTP", "\"", "\"", 13), db2("db2", "Db2", "OLTP", "", "", 12), ck("ck", "Clickhouse", "OLAP", "`", "`", 11), - h2("h2", "H2", "OLAP", "\"", "\"", null), + h2("h2", "H2", "OLAP", "\"", "\"", 30), sqlServer("sqlServer", "Sqlserver", "DL", "[", "]", 2), mongo("mongo", "MongoDB", "DL", "`", "`", 10);