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 a5ab8eb222..6681db9fe2 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 @@ -2,8 +2,8 @@ package io.dataease.commons.utils; import com.fasterxml.jackson.core.type.TypeReference; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.dto.SqlVariableDetails; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.exception.DEException; import io.dataease.i18n.Translator; import io.dataease.utils.JsonUtil; 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 c97b0c8701..d3e5ed3b55 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 @@ -3,12 +3,12 @@ package io.dataease.dataset.manage; import io.dataease.extensions.datasource.dto.DatasetTableDTO; import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.dto.ChartExtFilterDTO; import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.dataset.union.*; import io.dataease.extensions.view.model.SQLObj; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; import io.dataease.commons.utils.SqlparserUtils; import io.dataease.constant.AuthEnum; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java index f638be3ab7..8fa2908066 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java @@ -1,10 +1,10 @@ package io.dataease.dataset.utils; import com.google.common.collect.ImmutableList; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.engine.constant.SqlPlaceholderConstants; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.model.SQLMeta; import org.apache.calcite.config.Lex; import org.apache.calcite.sql.*; diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java index 04a6788129..35c080208c 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java @@ -1,8 +1,8 @@ package io.dataease.dataset.utils; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.model.SQLObj; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.utils.Md5Utils; import org.apache.calcite.avatica.util.Quoting; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index e779885c5d..819ad48dc5 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -1,8 +1,6 @@ package io.dataease.datasource.provider; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.dataease.api.ds.vo.DatasourceConfiguration; -import io.dataease.api.ds.vo.DatasourceConfiguration.DatasourceType; import io.dataease.commons.utils.CommonThreadPool; import io.dataease.dataset.utils.FieldUtils; import io.dataease.datasource.dao.auto.entity.CoreDatasource; @@ -14,6 +12,7 @@ import io.dataease.engine.constant.SQLConstants; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.*; import io.dataease.extensions.datasource.provider.Provider; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.i18n.Translator; import io.dataease.utils.BeanUtils; import io.dataease.utils.CommonBeanFactory; @@ -218,7 +217,7 @@ public class CalciteProvider extends Provider { ResultSet resultSet = null; try (Connection con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con, datasourceConfiguration.getQueryTimeout())) { - if (DatasourceConfiguration.DatasourceType.valueOf(value.getType()) == DatasourceType.oracle) { + if (DatasourceConfiguration.DatasourceType.valueOf(value.getType()) == DatasourceConfiguration.DatasourceType.oracle) { statement.executeUpdate("ALTER SESSION SET CURRENT_SCHEMA = " + datasourceConfiguration.getSchema()); } resultSet = statement.executeQuery(datasourceRequest.getQuery()); @@ -319,7 +318,7 @@ public class CalciteProvider extends Provider { public void hidePW(DatasourceDTO datasourceDTO) { DatasourceConfiguration configuration = null; - DatasourceType datasourceType = DatasourceType.valueOf(datasourceDTO.getType()); + DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(datasourceDTO.getType()); switch (datasourceType) { case mysql: case mongo: @@ -415,7 +414,7 @@ public class CalciteProvider extends Provider { String sql = ""; DatasourceConfiguration configuration = null; String database = ""; - DatasourceType datasourceType = DatasourceType.valueOf(datasourceRequest.getDatasource().getType()); + DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(datasourceRequest.getDatasource().getType()); switch (datasourceType) { case mysql: case mongo: @@ -561,7 +560,7 @@ public class CalciteProvider extends Provider { ResultSet resultSet = null; try (Connection con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con, 30)) { - if (DatasourceConfiguration.DatasourceType.valueOf(datasourceSchemaDTO.getType()) == DatasourceType.oracle) { + if (DatasourceConfiguration.DatasourceType.valueOf(datasourceSchemaDTO.getType()) == DatasourceConfiguration.DatasourceType.oracle) { statement.executeUpdate("ALTER SESSION SET CURRENT_SCHEMA = " + datasourceConfiguration.getSchema()); } resultSet = statement.executeQuery(datasourceRequest.getQuery()); @@ -581,7 +580,7 @@ public class CalciteProvider extends Provider { ResultSet resultSet = null; try (Connection con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con, 30)) { - if (DatasourceConfiguration.DatasourceType.valueOf(datasourceSchemaDTO.getType()) == DatasourceType.oracle) { + if (DatasourceConfiguration.DatasourceType.valueOf(datasourceSchemaDTO.getType()) == DatasourceConfiguration.DatasourceType.oracle) { statement.executeUpdate("ALTER SESSION SET CURRENT_SCHEMA = " + datasourceConfiguration.getSchema()); } resultSet = statement.executeQuery(getTableFiledSql(datasourceRequest)); @@ -669,7 +668,7 @@ public class CalciteProvider extends Provider { BasicDataSource dataSource = new BasicDataSource(); Schema schema = null; DatasourceConfiguration configuration = null; - DatasourceType datasourceType = DatasourceType.valueOf(ds.getType()); + DatasourceConfiguration.DatasourceType datasourceType = DatasourceConfiguration.DatasourceType.valueOf(ds.getType()); try { if (rootSchema.getSubSchema(ds.getSchemaAlias()) != null) { JdbcSchema jdbcSchema = rootSchema.getSubSchema(ds.getSchemaAlias()).unwrap(JdbcSchema.class); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java index c312f25dc5..5380f061d8 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java @@ -1,13 +1,13 @@ package io.dataease.datasource.provider; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDeEngine; import io.dataease.datasource.request.EngineRequest; import io.dataease.datasource.type.H2; import io.dataease.extensions.datasource.dto.DatasourceDTO; import io.dataease.extensions.datasource.dto.TableField; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; import org.apache.commons.lang3.StringUtils; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java index 1cb452c832..f06aaf8714 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java @@ -1,13 +1,13 @@ package io.dataease.datasource.provider; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDeEngine; import io.dataease.datasource.request.EngineRequest; import io.dataease.datasource.type.Mysql; import io.dataease.extensions.datasource.dto.DatasourceDTO; import io.dataease.extensions.datasource.dto.TableField; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; import org.apache.commons.lang3.StringUtils; 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 4d63538802..1d1eff7ae2 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 @@ -32,6 +32,7 @@ import io.dataease.datasource.provider.ExcelUtils; import io.dataease.engine.constant.SQLConstants; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.*; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.i18n.Translator; import io.dataease.job.schedule.CheckDsStatusJob; import io.dataease.job.schedule.ScheduleManager; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java index 9604c48d36..bb7a1b35b2 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java index 3b1a9e9b30..71aa870297 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java b/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java index cbc64c9883..8836303b5f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java @@ -1,13 +1,9 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.Arrays; -import java.util.List; - @Data @Component("h2") public class H2 extends DatasourceConfiguration { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java index a362724b7f..a055d2e945 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java index a602f761bf..aea0029054 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java index 3429d20980..43bcad1528 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java @@ -1,7 +1,7 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.exception.DEException; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java index 8058e0f37d..aba3e0d092 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Oracle.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java index 9b66bd3a4d..178c7646f7 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java index 6d81242106..3b8f0a9286 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java index 24e5327514..e47ae373e0 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java @@ -1,6 +1,6 @@ package io.dataease.datasource.type; -import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index 97a1add85e..a1d4d12005 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -1,12 +1,12 @@ package io.dataease.engine.utils; -import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.engine.constant.SQLConstants; import io.dataease.engine.constant.SqlPlaceholderConstants; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.model.SQLObj; import io.dataease.i18n.Translator; import org.apache.commons.lang3.ObjectUtils; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java index e4123a4838..ad9ba51224 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java @@ -9,6 +9,7 @@ import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.DatasetTableDTO; import io.dataease.extensions.datasource.dto.DatasourceDTO; import io.dataease.extensions.datasource.dto.TableField; +import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.model.BusiNodeRequest; import io.dataease.model.BusiNodeVO; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java similarity index 95% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java rename to sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java index f0cab7a66f..cdd0e07e25 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/Configuration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/Configuration.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.dataease.extensions.datasource.vo; import lombok.Data; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DatasourceConfiguration.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java similarity index 97% rename from sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DatasourceConfiguration.java rename to sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java index 287a788225..20448b46c0 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/DatasourceConfiguration.java +++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/DatasourceConfiguration.java @@ -1,4 +1,4 @@ -package io.dataease.api.ds.vo; +package io.dataease.extensions.datasource.vo; import lombok.Data;