From 8e6e3d879548d719c15ae0e56cba79764ee34734 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 31 Jul 2024 18:25:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=8F=92=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/commons/utils/SqlparserUtils.java | 3 ++- .../main/java/io/dataease/dataset/manage/DatasetSQLManage.java | 3 ++- .../java/io/dataease/datasource/server/DatasourceServer.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java index 44b7965d77..13b3b32f26 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java @@ -8,6 +8,7 @@ import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; +import io.dataease.license.utils.LicenseUtil; import io.dataease.utils.JsonUtil; import net.sf.jsqlparser.expression.*; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; @@ -548,7 +549,7 @@ public class SqlparserUtils { prefix = datasourceType.getPrefix(); suffix = datasourceType.getSuffix(); } else { - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), value.getType())).toList(); if (ObjectUtils.isNotEmpty(list)) { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java index 9feac047cd..8e9163a555 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java @@ -26,6 +26,7 @@ import io.dataease.extensions.view.dto.ChartExtFilterDTO; import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; +import io.dataease.license.utils.LicenseUtil; import io.dataease.system.manage.CorePermissionManage; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; @@ -374,7 +375,7 @@ public class DatasetSQLManage { BeanUtils.copyBean(dto, datasourceType); return dto; } else { - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList(); if (ObjectUtils.isNotEmpty(list)) { 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 11b1ee47b8..8db4b316a6 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 @@ -859,7 +859,7 @@ public class DatasourceServer implements DatasourceApi { private void preCheckDs(DatasourceDTO datasource) throws DEException { List list = datasourceTypes().stream().map(DatasourceConfiguration.DatasourceType::getType).collect(Collectors.toList()); - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); xpackPluginsDatasourceVOS.forEach(ele -> list.add(ele.getType())); }