From e33eeb89c93ff58c694076f1dbb9370ad5e45d9a Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 30 Jan 2024 10:14:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20ProviderFactory=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=20SDK=20=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/commons/utils/DatasetUtils.java | 2 +- .../dataease/commons/utils/ExcelXlsReader.java | 2 +- .../dataset/DataSetTableFieldController.java | 4 ++-- .../request/dataset/DataSetTableRequest.java | 2 +- .../io/dataease/dto/dataset/ExcelFileData.java | 1 + .../io/dataease/provider/DDLProviderImpl.java | 3 ++- .../provider/datasource/JdbcProvider.java | 2 +- .../provider/engine/doris/DorisDDLProvider.java | 2 +- .../provider/engine/mysql/MysqlDDLProvider.java | 2 +- .../service/chart/ChartViewService.java | 4 ++-- .../chart/ViewPluginBaseServiceImpl.java | 4 ++-- .../service/dataset/DataSetTableService.java | 13 ++++++++----- .../service/dataset/ExtractDataService.java | 8 ++++---- .../dataset/impl/direct/DirectFieldService.java | 4 ++-- .../service/datasource/DatasourceService.java | 6 ++---- .../service/datasource/DriverService.java | 3 +-- .../dataease/service/engine/EngineService.java | 2 +- .../service/panel/PanelGroupService.java | 2 +- .../dto/dataset/DataTableInfoCustomUnion.java | 2 +- .../common}/dto/dataset/DataTableInfoDTO.java | 4 ++-- .../common}/dto/dataset/ExcelSheetData.java | 2 +- .../common}/dto/dataset/union/UnionDTO.java | 2 +- .../common}/dto/dataset/union/UnionItemDTO.java | 2 +- .../dto/dataset/union/UnionParamDTO.java | 2 +- .../datasource}/provider/DDLProvider.java | 4 ++-- .../datasource}/provider/ProviderFactory.java | 17 +++++++---------- .../main/resources/META-INF/spring.factories | 2 ++ ...boot.autoconfigure.AutoConfiguration.imports | 1 + 28 files changed, 53 insertions(+), 51 deletions(-) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/DataTableInfoCustomUnion.java (83%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/DataTableInfoDTO.java (84%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/ExcelSheetData.java (95%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/union/UnionDTO.java (87%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/union/UnionItemDTO.java (83%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common}/dto/dataset/union/UnionParamDTO.java (79%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource}/provider/DDLProvider.java (86%) rename {core/backend/src/main/java/io/dataease => sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource}/provider/ProviderFactory.java (86%) create mode 100644 sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring.factories create mode 100644 sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java index 35b97fd3bb..82f9007c8d 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java @@ -1,6 +1,6 @@ package io.dataease.commons.utils; -import io.dataease.dto.dataset.union.UnionDTO; +import io.dataease.plugins.common.dto.dataset.union.UnionDTO; import org.apache.commons.collections4.CollectionUtils; import java.util.List; diff --git a/core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java b/core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java index 2258b28c07..862a399f19 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java @@ -1,6 +1,6 @@ package io.dataease.commons.utils; -import io.dataease.dto.dataset.ExcelSheetData; +import io.dataease.plugins.common.dto.dataset.ExcelSheetData; import io.dataease.i18n.Translator; import io.dataease.plugins.common.dto.datasource.TableField; import org.apache.poi.hssf.eventusermodel.*; diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index 8d04e625da..6d9a734bf9 100644 --- a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -12,7 +12,7 @@ import io.dataease.commons.constants.ResourceAuthLevel; import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.MultFieldValuesRequest; import io.dataease.controller.response.DatasetTableField4Type; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.DatasetTable; @@ -22,7 +22,7 @@ import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.datasource.entity.Dateformat; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetTableFieldsService; import io.dataease.service.dataset.DataSetTableService; diff --git a/core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java index bb19bc50d6..f8ca7fe9b5 100644 --- a/core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java +++ b/core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java @@ -1,6 +1,6 @@ package io.dataease.controller.request.dataset; -import io.dataease.dto.dataset.ExcelSheetData; +import io.dataease.plugins.common.dto.dataset.ExcelSheetData; import io.dataease.plugins.common.base.domain.DatasetTable; import io.dataease.plugins.common.dto.datasource.TableField; import io.swagger.annotations.ApiModelProperty; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java b/core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java index e6527d0ca7..2b3454769b 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java +++ b/core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java @@ -1,5 +1,6 @@ package io.dataease.dto.dataset; +import io.dataease.plugins.common.dto.dataset.ExcelSheetData; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/core/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java b/core/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java index 306a185b32..1bf8afda8d 100644 --- a/core/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java +++ b/core/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java @@ -1,8 +1,9 @@ package io.dataease.provider; -import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.Datasource; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.datasource.provider.DDLProvider; import org.apache.commons.lang3.StringUtils; import java.util.Arrays; 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 582a482afd..d65859da8e 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 @@ -20,8 +20,8 @@ import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.DefaultJdbcProvider; import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.plugins.datasource.query.QueryProvider; -import io.dataease.provider.ProviderFactory; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java index 16d48b96eb..f1232f3763 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java @@ -1,7 +1,7 @@ package io.dataease.provider.engine.doris; import com.google.gson.Gson; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.Datasource; import io.dataease.commons.utils.TableUtils; diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java index ed7c4a236a..67f6111b91 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java @@ -1,6 +1,6 @@ package io.dataease.provider.engine.mysql; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.Datasource; import io.dataease.commons.utils.TableUtils; diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 999b698ed3..e55fde67d7 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -18,7 +18,6 @@ import io.dataease.controller.response.DataSetDetail; import io.dataease.dto.chart.*; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTableUnionDTO; -import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.ext.ExtChartGroupMapper; import io.dataease.ext.ExtChartViewMapper; import io.dataease.ext.ExtPanelGroupExtendDataMapper; @@ -35,6 +34,7 @@ import io.dataease.plugins.common.constants.datasource.SQLConstants; import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO; import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO; import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.dto.dataset.SqlVariableDetails; import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; @@ -44,12 +44,12 @@ import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDT import io.dataease.plugins.common.util.SpringContextUtil; import io.dataease.plugins.datasource.entity.PageInfo; import io.dataease.plugins.datasource.provider.Provider; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.view.entity.*; import io.dataease.plugins.view.entity.filter.PluginFilterTreeObj; import io.dataease.plugins.view.service.ViewPluginService; import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem; -import io.dataease.provider.ProviderFactory; import io.dataease.provider.query.SQLUtils; import io.dataease.service.chart.util.ChartDataBuild; import io.dataease.service.dataset.*; diff --git a/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java b/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java index c77202fa5d..75a6d3e469 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java @@ -6,7 +6,7 @@ import io.dataease.commons.model.PluginViewSetImpl; import io.dataease.commons.utils.TableUtils; import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.dto.dataset.DataSetTableUnionDTO; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.Datasource; @@ -24,7 +24,7 @@ import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.view.entity.*; import io.dataease.plugins.view.entity.filter.PluginFilterTreeObj; import io.dataease.plugins.view.service.ViewPluginBaseService; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.service.dataset.DataSetTableService; import io.dataease.service.dataset.DataSetTableUnionService; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 890d0dcd35..7eb5f2b997 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -26,9 +26,12 @@ import io.dataease.controller.request.dataset.DataSetTaskRequest; import io.dataease.controller.response.DataSetDetail; import io.dataease.dto.SysLogDTO; import io.dataease.dto.dataset.*; -import io.dataease.dto.dataset.union.UnionDTO; -import io.dataease.dto.dataset.union.UnionItemDTO; -import io.dataease.dto.dataset.union.UnionParamDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoCustomUnion; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.ExcelSheetData; +import io.dataease.plugins.common.dto.dataset.union.UnionDTO; +import io.dataease.plugins.common.dto.dataset.union.UnionItemDTO; +import io.dataease.plugins.common.dto.dataset.union.UnionParamDTO; import io.dataease.ext.ExtDataSetGroupMapper; import io.dataease.ext.ExtDataSetTableMapper; import io.dataease.ext.UtilMapper; @@ -50,8 +53,8 @@ import io.dataease.plugins.common.util.ClassloaderResponsity; import io.dataease.plugins.datasource.provider.Provider; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem; -import io.dataease.provider.DDLProvider; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.DDLProvider; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.provider.datasource.JdbcProvider; import io.dataease.service.chart.util.ChartDataBuild; import io.dataease.service.datasource.DatasourceService; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 5ec60f03b9..b818ac5a28 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -6,8 +6,8 @@ import io.dataease.commons.constants.*; import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; import io.dataease.controller.request.datasource.ApiDefinition; -import io.dataease.dto.dataset.DataTableInfoDTO; -import io.dataease.dto.dataset.ExcelSheetData; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.ExcelSheetData; import io.dataease.dto.datasource.*; import io.dataease.ext.ExtChartViewMapper; import io.dataease.listener.util.CacheUtils; @@ -21,8 +21,8 @@ import io.dataease.plugins.common.request.datasource.DatasourceRequest; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.provider.Provider; import io.dataease.plugins.datasource.query.QueryProvider; -import io.dataease.provider.DDLProvider; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.DDLProvider; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.provider.datasource.JdbcProvider; import io.dataease.service.datasource.DatasourceService; import io.dataease.service.engine.EngineService; diff --git a/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java b/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java index cdbd3eadd5..ec4551238e 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java @@ -6,7 +6,7 @@ import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.LogUtil; import io.dataease.commons.utils.TreeUtils; import io.dataease.dto.dataset.DataSetTableUnionDTO; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.dto.dataset.DeSortDTO; import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.DatasetTable; @@ -21,7 +21,7 @@ import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDT import io.dataease.plugins.datasource.provider.Provider; import io.dataease.plugins.datasource.query.QueryProvider; import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.service.dataset.*; import io.dataease.service.datasource.DatasourceService; import io.dataease.service.engine.EngineService; diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index 666dd9a6bd..631993b57f 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -21,7 +21,7 @@ import io.dataease.controller.request.datasource.ApiDefinition; import io.dataease.controller.sys.response.BasicInfo; import io.dataease.dto.DatasourceDTO; import io.dataease.dto.TaskInstance; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.dto.datasource.DBTableDTO; import io.dataease.dto.datasource.MysqlConfiguration; import io.dataease.ext.ExtDataSourceMapper; @@ -44,7 +44,7 @@ import io.dataease.plugins.common.util.SpringContextUtil; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.Provider; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.provider.datasource.ApiProvider; import io.dataease.service.ScheduleService; import io.dataease.service.dataset.DataSetGroupService; @@ -53,8 +53,6 @@ import io.dataease.service.sys.SysAuthService; import io.dataease.service.system.SystemParameterService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.zookeeper.data.Stat; -import org.mozilla.javascript.EcmaError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.data.redis.core.RedisTemplate; diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java b/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java index 26515df2ae..0c71929d91 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DriverService.java @@ -15,7 +15,7 @@ import io.dataease.plugins.common.base.mapper.DeDriverMapper; import io.dataease.plugins.datasource.entity.JdbcConfiguration; import io.dataease.plugins.datasource.provider.DefaultJdbcProvider; import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -27,7 +27,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Modifier; -import java.net.URL; import java.util.*; import java.util.jar.JarEntry; import java.util.jar.JarFile; diff --git a/core/backend/src/main/java/io/dataease/service/engine/EngineService.java b/core/backend/src/main/java/io/dataease/service/engine/EngineService.java index ca12e002f0..7b82c0a7e3 100644 --- a/core/backend/src/main/java/io/dataease/service/engine/EngineService.java +++ b/core/backend/src/main/java/io/dataease/service/engine/EngineService.java @@ -17,7 +17,7 @@ import io.dataease.plugins.common.base.domain.DeEngineExample; import io.dataease.plugins.common.base.mapper.DeEngineMapper; import io.dataease.plugins.common.request.datasource.DatasourceRequest; import io.dataease.plugins.datasource.provider.Provider; -import io.dataease.provider.ProviderFactory; +import io.dataease.plugins.datasource.provider.ProviderFactory; import io.dataease.service.datasource.DatasourceService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 22cc054a7f..8ce3b1fcd8 100644 --- a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -20,7 +20,7 @@ import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.dataset.DataSetGroupDTO; import io.dataease.dto.dataset.DataSetTableDTO; import io.dataease.dto.dataset.DataSetTaskDTO; -import io.dataease.dto.dataset.DataTableInfoDTO; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import io.dataease.dto.panel.PanelExport2App; import io.dataease.dto.panel.PanelGroupDTO; import io.dataease.dto.panel.PanelTemplateFileDTO; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoCustomUnion.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoCustomUnion.java similarity index 83% rename from core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoCustomUnion.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoCustomUnion.java index 391643669e..96af700106 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoCustomUnion.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoCustomUnion.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset; +package io.dataease.plugins.common.dto.dataset; import lombok.Getter; import lombok.Setter; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoDTO.java similarity index 84% rename from core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoDTO.java index aa7f526cbc..5d3934c698 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/DataTableInfoDTO.java @@ -1,6 +1,6 @@ -package io.dataease.dto.dataset; +package io.dataease.plugins.common.dto.dataset; -import io.dataease.dto.dataset.union.UnionDTO; +import io.dataease.plugins.common.dto.dataset.union.UnionDTO; import lombok.Getter; import lombok.Setter; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/ExcelSheetData.java similarity index 95% rename from core/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/ExcelSheetData.java index bffa3e39e8..903dd8d38e 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/ExcelSheetData.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset; +package io.dataease.plugins.common.dto.dataset; import io.dataease.plugins.common.dto.datasource.TableField; import io.swagger.annotations.ApiModelProperty; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionDTO.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionDTO.java similarity index 87% rename from core/backend/src/main/java/io/dataease/dto/dataset/union/UnionDTO.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionDTO.java index 79a4ab528a..cf283e9b31 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionDTO.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionDTO.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset.union; +package io.dataease.plugins.common.dto.dataset.union; import io.dataease.plugins.common.base.domain.DatasetTable; import lombok.Data; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionItemDTO.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionItemDTO.java similarity index 83% rename from core/backend/src/main/java/io/dataease/dto/dataset/union/UnionItemDTO.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionItemDTO.java index 1d53bfe94f..10a6570e58 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionItemDTO.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionItemDTO.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset.union; +package io.dataease.plugins.common.dto.dataset.union; import io.dataease.plugins.common.base.domain.DatasetTableField; import lombok.Data; diff --git a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionParamDTO.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionParamDTO.java similarity index 79% rename from core/backend/src/main/java/io/dataease/dto/dataset/union/UnionParamDTO.java rename to sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionParamDTO.java index a5bbc2bdae..303f7c921c 100644 --- a/core/backend/src/main/java/io/dataease/dto/dataset/union/UnionParamDTO.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/dataset/union/UnionParamDTO.java @@ -1,4 +1,4 @@ -package io.dataease.dto.dataset.union; +package io.dataease.plugins.common.dto.dataset.union; import lombok.Data; diff --git a/core/backend/src/main/java/io/dataease/provider/DDLProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DDLProvider.java similarity index 86% rename from core/backend/src/main/java/io/dataease/provider/DDLProvider.java rename to sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DDLProvider.java index d72cd5f477..63b573197a 100644 --- a/core/backend/src/main/java/io/dataease/provider/DDLProvider.java +++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DDLProvider.java @@ -1,8 +1,8 @@ -package io.dataease.provider; +package io.dataease.plugins.datasource.provider; -import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.Datasource; +import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO; import java.util.List; diff --git a/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java similarity index 86% rename from core/backend/src/main/java/io/dataease/provider/ProviderFactory.java rename to sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java index 557fb70a2d..ef6ed11264 100644 --- a/core/backend/src/main/java/io/dataease/provider/ProviderFactory.java +++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java @@ -1,4 +1,4 @@ -package io.dataease.provider; +package io.dataease.plugins.datasource.provider; import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.plugins.common.dto.datasource.DataSourceType; @@ -8,24 +8,21 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Configuration; -import io.dataease.plugins.datasource.provider.Provider; import java.util.Map; -@Configuration public class ProviderFactory implements ApplicationContextAware { private static ApplicationContext context; @Override public void setApplicationContext(final ApplicationContext ctx) { - this.context = ctx; - for(final DatasourceTypes d: DatasourceTypes.values()) { + this.context = ctx; + for (final DatasourceTypes d : DatasourceTypes.values()) { final ConfigurableListableBeanFactory beanFactory = ((ConfigurableApplicationContext) context).getBeanFactory(); - if(d.isDatasource()){ + if (d.isDatasource()) { DataSourceType dataSourceType = new DataSourceType(d.getType(), d.getName(), false, d.getExtraParams(), d.getCalculationMode(), d.isJdbc()); - if(dataSourceType.getType().equalsIgnoreCase("oracle")){ + if (dataSourceType.getType().equalsIgnoreCase("oracle")) { dataSourceType.setCharset(d.getCharset()); dataSourceType.setTargetCharset(d.getTargetCharset()); } @@ -42,12 +39,12 @@ public class ProviderFactory implements ApplicationContextAware { public static Provider getProvider(String type) { - if(type.equalsIgnoreCase(DatasourceTypes.engine_doris.toString()) || type.equalsIgnoreCase(DatasourceTypes.engine_mysql.toString())){ + if (type.equalsIgnoreCase(DatasourceTypes.engine_doris.toString()) || type.equalsIgnoreCase(DatasourceTypes.engine_mysql.toString())) { return context.getBean("jdbc", Provider.class); } Map dataSourceTypeMap = SpringContextUtil.getApplicationContext().getBeansOfType((DataSourceType.class)); - if(dataSourceTypeMap.keySet().contains(type)){ + if (dataSourceTypeMap.keySet().contains(type)) { DatasourceTypes datasourceType = DatasourceTypes.valueOf(type); switch (datasourceType) { case es: diff --git a/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring.factories b/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000..eb8c38acab --- /dev/null +++ b/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.dataease.plugins.datasource.provider.ProviderFactory diff --git a/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000..ad4f4ff8e3 --- /dev/null +++ b/sdk/dataease-plugin-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +io.dataease.plugins.datasource.provider.ProviderFactory