diff --git a/backend/src/main/java/io/dataease/datasource/dto/CHConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/CHConfiguration.java similarity index 94% rename from backend/src/main/java/io/dataease/datasource/dto/CHConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/CHConfiguration.java index 5a93a1bb25..a6a1a31f2f 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/CHConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/CHConfiguration.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; @Getter @Setter -public class CHConfigration extends JdbcDTO { +public class CHConfiguration extends JdbcConfiguration { private String driver = "ru.yandex.clickhouse.ClickHouseDriver"; private String extraParams = ""; diff --git a/backend/src/main/java/io/dataease/datasource/dto/DorisConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/DorisConfiguration.java similarity index 68% rename from backend/src/main/java/io/dataease/datasource/dto/DorisConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/DorisConfiguration.java index b3f7306b5c..50dee1d7e4 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/DorisConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/DorisConfiguration.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class DorisConfigration extends MysqlConfigration { +public class DorisConfiguration extends MysqlConfiguration { private Integer httpPort; } diff --git a/backend/src/main/java/io/dataease/datasource/dto/EsConfigDTO.java b/backend/src/main/java/io/dataease/datasource/dto/EsConfiguration.java similarity index 90% rename from backend/src/main/java/io/dataease/datasource/dto/EsConfigDTO.java rename to backend/src/main/java/io/dataease/datasource/dto/EsConfiguration.java index 7959e9ec68..f9e9ee5f1c 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/EsConfigDTO.java +++ b/backend/src/main/java/io/dataease/datasource/dto/EsConfiguration.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter -public class EsConfigDTO { +public class EsConfiguration { private String url; private String esUsername; private String esPassword; diff --git a/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java b/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java similarity index 94% rename from backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java rename to backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java index a854397b4b..1d052de8cc 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java +++ b/backend/src/main/java/io/dataease/datasource/dto/JdbcConfiguration.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter -public class JdbcDTO { +public class JdbcConfiguration { private String host; private Integer port; private String username; diff --git a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java similarity index 94% rename from backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java index c689c27f31..958427294e 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfiguration.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; @Getter @Setter -public class MysqlConfigration extends JdbcDTO { +public class MysqlConfiguration extends JdbcConfiguration { private String driver = "com.mysql.cj.jdbc.Driver"; private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true"; diff --git a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/OracleConfiguration.java similarity index 93% rename from backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/OracleConfiguration.java index d348e0d030..f73806b888 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/OracleConfiguration.java @@ -5,7 +5,7 @@ import lombok.Setter; @Getter @Setter -public class OracleConfigration extends JdbcDTO { +public class OracleConfiguration extends JdbcConfiguration { private String driver = "oracle.jdbc.driver.OracleDriver"; private String connectionType; diff --git a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/PgConfiguration.java similarity index 94% rename from backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/PgConfiguration.java index bdf031b6ff..fa4393285d 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/PgConfiguration.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; @Getter @Setter -public class PgConfigration extends JdbcDTO { +public class PgConfiguration extends JdbcConfiguration { private String driver = "org.postgresql.Driver"; private String extraParams = ""; diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfiguration.java similarity index 93% rename from backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java rename to backend/src/main/java/io/dataease/datasource/dto/SqlServerConfiguration.java index 3f1d253d45..c8e1fe7436 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java +++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfiguration.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; @Getter @Setter -public class SqlServerConfigration extends JdbcDTO { +public class SqlServerConfiguration extends JdbcConfiguration { private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private String extraParams = ""; public String getJdbc(){ diff --git a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java index eb331990e4..dba8980fca 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/EsProvider.java @@ -1,6 +1,5 @@ package io.dataease.datasource.provider; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.mchange.v2.c3p0.ComboPooledDataSource; @@ -48,17 +47,17 @@ public class EsProvider extends DatasourceProvider { public List getData(DatasourceRequest dsr) throws Exception { List list = new LinkedList<>(); try { - EsConfigDTO esConfigDTO = new Gson().fromJson(dsr.getDatasource().getConfiguration(), EsConfigDTO.class); + EsConfiguration esConfiguration = new Gson().fromJson(dsr.getDatasource().getConfiguration(), EsConfiguration.class); HttpClientConfig httpClientConfig = new HttpClientConfig(); - if(StringUtils.isNotEmpty(esConfigDTO.getEsUsername())){ - String auth = esConfigDTO.getEsUsername() + ":" + esConfigDTO.getEsPassword(); + if(StringUtils.isNotEmpty(esConfiguration.getEsUsername())){ + String auth = esConfiguration.getEsUsername() + ":" + esConfiguration.getEsPassword(); byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } Requst requst = new Requst(); requst.setQuery(dsr.getQuery()); requst.setFetch_size(dsr.getFetchSize()); - String url = esConfigDTO.getUrl().endsWith("/") ? esConfigDTO.getUrl() + esConfigDTO.getUri() + "?format=json" : esConfigDTO.getUrl() + "/" + esConfigDTO.getUri() + "?format=json"; + String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json"; String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); EsReponse esReponse = new Gson().fromJson(response, EsReponse.class); @@ -225,7 +224,7 @@ public class EsProvider extends DatasourceProvider { @Override public void checkStatus(DatasourceRequest datasourceRequest) throws Exception { - EsConfigDTO esConfigDTO = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfigDTO.class); + EsConfiguration esConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfiguration.class); String response = exexGetQuery(datasourceRequest); if(JSONObject.parseObject(response).getJSONObject("error") != null){ @@ -239,21 +238,21 @@ public class EsProvider extends DatasourceProvider { throw new Exception(Translator.get("i18n_es_limit")); } if(Integer.valueOf(version.substring(0,1)) == 6 ) { - esConfigDTO.setUri("_xpack/sql"); + esConfiguration.setUri("_xpack/sql"); } if(Integer.valueOf(version.substring(0,1)) == 7 ) { - esConfigDTO.setUri("_sql"); + esConfiguration.setUri("_sql"); } - datasourceRequest.getDatasource().setConfiguration(new Gson().toJson(esConfigDTO)); + datasourceRequest.getDatasource().setConfiguration(new Gson().toJson(esConfiguration)); getTables(datasourceRequest); } private String exexQuery(DatasourceRequest datasourceRequest, String sql, String uri){ - EsConfigDTO esConfigDTO = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfigDTO.class); - uri = esConfigDTO.getUri()+uri; + EsConfiguration esConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfiguration.class); + uri = esConfiguration.getUri()+uri; HttpClientConfig httpClientConfig = new HttpClientConfig(); - if(StringUtils.isNotEmpty(esConfigDTO.getEsUsername()) && StringUtils.isNotEmpty(esConfigDTO.getEsPassword())){ - String auth = esConfigDTO.getEsUsername() + ":" + esConfigDTO.getEsPassword(); + if(StringUtils.isNotEmpty(esConfiguration.getEsUsername()) && StringUtils.isNotEmpty(esConfiguration.getEsPassword())){ + String auth = esConfiguration.getEsUsername() + ":" + esConfiguration.getEsPassword(); byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } @@ -261,21 +260,21 @@ public class EsProvider extends DatasourceProvider { Requst requst = new Requst(); requst.setQuery(sql); requst.setFetch_size(datasourceRequest.getFetchSize()); - String url = esConfigDTO.getUrl().endsWith("/") ? esConfigDTO.getUrl() + uri : esConfigDTO.getUrl() + "/" + uri; + String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); return response; } private String exexGetQuery(DatasourceRequest datasourceRequest){ - EsConfigDTO esConfigDTO = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfigDTO.class); + EsConfiguration esConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), EsConfiguration.class); HttpClientConfig httpClientConfig = new HttpClientConfig(); - if(StringUtils.isNotEmpty(esConfigDTO.getEsUsername()) && StringUtils.isNotEmpty(esConfigDTO.getEsPassword())){ - String auth = esConfigDTO.getEsUsername() + ":" + esConfigDTO.getEsPassword(); + if(StringUtils.isNotEmpty(esConfiguration.getEsUsername()) && StringUtils.isNotEmpty(esConfiguration.getEsPassword())){ + String auth = esConfiguration.getEsUsername() + ":" + esConfiguration.getEsPassword(); byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } - String response = HttpClientUtil.get(esConfigDTO.getUrl(), httpClientConfig); + String response = HttpClientUtil.get(esConfiguration.getUrl(), httpClientConfig); return response; } diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index 374923730d..5bfb421d63 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -420,12 +420,12 @@ public class JdbcProvider extends DatasourceProvider { private void addToPool(DatasourceRequest datasourceRequest) throws PropertyVetoException { ComboPooledDataSource dataSource; dataSource = new ComboPooledDataSource(); - JdbcDTO jdbcDTO = setCredential(datasourceRequest, dataSource); - dataSource.setMaxIdleTime(jdbcDTO.getMaxIdleTime()); // 最大空闲时间 - dataSource.setAcquireIncrement(jdbcDTO.getAcquireIncrement());// 增长数 - dataSource.setInitialPoolSize(jdbcDTO.getInitialPoolSize());// 初始连接数 - dataSource.setMinPoolSize(jdbcDTO.getMinPoolSize()); // 最小连接数 - dataSource.setMaxPoolSize(jdbcDTO.getMaxPoolSize()); // 最大连接数 + JdbcConfiguration jdbcConfiguration = setCredential(datasourceRequest, dataSource); + dataSource.setMaxIdleTime(jdbcConfiguration.getMaxIdleTime()); // 最大空闲时间 + dataSource.setAcquireIncrement(jdbcConfiguration.getAcquireIncrement());// 增长数 + dataSource.setInitialPoolSize(jdbcConfiguration.getInitialPoolSize());// 初始连接数 + dataSource.setMinPoolSize(jdbcConfiguration.getMinPoolSize()); // 最小连接数 + dataSource.setMaxPoolSize(jdbcConfiguration.getMaxPoolSize()); // 最大连接数 dataSource.setAcquireRetryAttempts(30);// 获取连接重试次数 dataSource.setIdleConnectionTestPeriod(60); // 每60s检查数据库空闲连接 dataSource.setMaxStatements(0); // c3p0全局的PreparedStatements缓存的大小 @@ -451,41 +451,41 @@ public class JdbcProvider extends DatasourceProvider { case mariadb: case de_doris: case ds_doris: - MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class); - username = mysqlConfigration.getUsername(); - password = mysqlConfigration.getPassword(); - driver = mysqlConfigration.getDriver(); - jdbcurl = mysqlConfigration.getJdbc(); + MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfiguration.class); + username = mysqlConfiguration.getUsername(); + password = mysqlConfiguration.getPassword(); + driver = mysqlConfiguration.getDriver(); + jdbcurl = mysqlConfiguration.getJdbc(); break; case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); - username = sqlServerConfigration.getUsername(); - password = sqlServerConfigration.getPassword(); - driver = sqlServerConfigration.getDriver(); - jdbcurl = sqlServerConfigration.getJdbc(); + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); + username = sqlServerConfiguration.getUsername(); + password = sqlServerConfiguration.getPassword(); + driver = sqlServerConfiguration.getDriver(); + jdbcurl = sqlServerConfiguration.getJdbc(); break; case oracle: - OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); - username = oracleConfigration.getUsername(); - password = oracleConfigration.getPassword(); - driver = oracleConfigration.getDriver(); - jdbcurl = oracleConfigration.getJdbc(); + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); + username = oracleConfiguration.getUsername(); + password = oracleConfiguration.getPassword(); + driver = oracleConfiguration.getDriver(); + jdbcurl = oracleConfiguration.getJdbc(); props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ; // props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ; break; case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class); - username = pgConfigration.getUsername(); - password = pgConfigration.getPassword(); - driver = pgConfigration.getDriver(); - jdbcurl = pgConfigration.getJdbc(); + PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); + username = pgConfiguration.getUsername(); + password = pgConfiguration.getPassword(); + driver = pgConfiguration.getDriver(); + jdbcurl = pgConfiguration.getJdbc(); break; case ck: - CHConfigration chConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfigration.class); - username = chConfigration.getUsername(); - password = chConfigration.getPassword(); - driver = chConfigration.getDriver(); - jdbcurl = chConfigration.getJdbc(); + CHConfiguration chConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfiguration.class); + username = chConfiguration.getUsername(); + password = chConfiguration.getPassword(); + driver = chConfiguration.getDriver(); + jdbcurl = chConfiguration.getJdbc(); break; default: break; @@ -500,57 +500,57 @@ public class JdbcProvider extends DatasourceProvider { } - private JdbcDTO setCredential(DatasourceRequest datasourceRequest, ComboPooledDataSource dataSource) throws PropertyVetoException { + private JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, ComboPooledDataSource dataSource) throws PropertyVetoException { DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType()); - JdbcDTO jdbcDTO = new JdbcDTO(); + JdbcConfiguration jdbcConfiguration = new JdbcConfiguration(); switch (datasourceType) { case mysql: case mariadb: case de_doris: case ds_doris: - MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class); - dataSource.setUser(mysqlConfigration.getUsername()); - dataSource.setDriverClass(mysqlConfigration.getDriver()); - dataSource.setPassword(mysqlConfigration.getPassword()); - dataSource.setJdbcUrl(mysqlConfigration.getJdbc()); - jdbcDTO = mysqlConfigration; + MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfiguration.class); + dataSource.setUser(mysqlConfiguration.getUsername()); + dataSource.setDriverClass(mysqlConfiguration.getDriver()); + dataSource.setPassword(mysqlConfiguration.getPassword()); + dataSource.setJdbcUrl(mysqlConfiguration.getJdbc()); + jdbcConfiguration = mysqlConfiguration; break; case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); - dataSource.setUser(sqlServerConfigration.getUsername()); - dataSource.setDriverClass(sqlServerConfigration.getDriver()); - dataSource.setPassword(sqlServerConfigration.getPassword()); - dataSource.setJdbcUrl(sqlServerConfigration.getJdbc()); - jdbcDTO = sqlServerConfigration; + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); + dataSource.setUser(sqlServerConfiguration.getUsername()); + dataSource.setDriverClass(sqlServerConfiguration.getDriver()); + dataSource.setPassword(sqlServerConfiguration.getPassword()); + dataSource.setJdbcUrl(sqlServerConfiguration.getJdbc()); + jdbcConfiguration = sqlServerConfiguration; break; case oracle: - OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); - dataSource.setUser(oracleConfigration.getUsername()); - dataSource.setDriverClass(oracleConfigration.getDriver()); - dataSource.setPassword(oracleConfigration.getPassword()); - dataSource.setJdbcUrl(oracleConfigration.getJdbc()); - jdbcDTO = oracleConfigration; + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); + dataSource.setUser(oracleConfiguration.getUsername()); + dataSource.setDriverClass(oracleConfiguration.getDriver()); + dataSource.setPassword(oracleConfiguration.getPassword()); + dataSource.setJdbcUrl(oracleConfiguration.getJdbc()); + jdbcConfiguration = oracleConfiguration; break; case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class); - dataSource.setUser(pgConfigration.getUsername()); - dataSource.setDriverClass(pgConfigration.getDriver()); - dataSource.setPassword(pgConfigration.getPassword()); - dataSource.setJdbcUrl(pgConfigration.getJdbc()); - jdbcDTO = pgConfigration; + PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); + dataSource.setUser(pgConfiguration.getUsername()); + dataSource.setDriverClass(pgConfiguration.getDriver()); + dataSource.setPassword(pgConfiguration.getPassword()); + dataSource.setJdbcUrl(pgConfiguration.getJdbc()); + jdbcConfiguration = pgConfiguration; break; case ck: - CHConfigration chConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfigration.class); - dataSource.setUser(chConfigration.getUsername()); - dataSource.setDriverClass(chConfigration.getDriver()); - dataSource.setPassword(chConfigration.getPassword()); - dataSource.setJdbcUrl(chConfigration.getJdbc()); - jdbcDTO = chConfigration; + CHConfiguration chConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfiguration.class); + dataSource.setUser(chConfiguration.getUsername()); + dataSource.setDriverClass(chConfiguration.getDriver()); + dataSource.setPassword(chConfiguration.getPassword()); + dataSource.setJdbcUrl(chConfiguration.getJdbc()); + jdbcConfiguration = chConfiguration; break; default: break; } - return jdbcDTO; + return jdbcConfiguration; } private String getDatabase(DatasourceRequest datasourceRequest) { @@ -560,17 +560,17 @@ public class JdbcProvider extends DatasourceProvider { case de_doris: case ds_doris: case mariadb: - MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class); - return mysqlConfigration.getDataBase(); + MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfiguration.class); + return mysqlConfiguration.getDataBase(); case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); - return sqlServerConfigration.getDataBase(); + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); + return sqlServerConfiguration.getDataBase(); case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class); - return pgConfigration.getDataBase(); + PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); + return pgConfiguration.getDataBase(); default: - JdbcDTO jdbcDTO = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcDTO.class); - return jdbcDTO.getDataBase(); + JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); + return jdbcConfiguration.getDataBase(); } } @@ -583,28 +583,28 @@ public class JdbcProvider extends DatasourceProvider { case ds_doris: return "show tables;"; case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); - if(StringUtils.isEmpty(sqlServerConfigration.getSchema())){ + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); + if(StringUtils.isEmpty(sqlServerConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } return "SELECT TABLE_NAME FROM DATABASE.INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA = 'DS_SCHEMA' ;" - .replace("DATABASE", sqlServerConfigration.getDataBase()) - .replace("DS_SCHEMA", sqlServerConfigration.getSchema()); + .replace("DATABASE", sqlServerConfiguration.getDataBase()) + .replace("DS_SCHEMA", sqlServerConfiguration.getSchema()); case oracle: - OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); - if(StringUtils.isEmpty(oracleConfigration.getSchema())){ + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); + if(StringUtils.isEmpty(oracleConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } - return "select table_name, owner from all_tables where owner='" + oracleConfigration.getSchema() + "'"; + return "select table_name, owner from all_tables where owner='" + oracleConfiguration.getSchema() + "'"; case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class); - if(StringUtils.isEmpty(pgConfigration.getSchema())){ + PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); + if(StringUtils.isEmpty(pgConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } - return "SELECT tablename FROM pg_tables WHERE schemaname='SCHEMA' ;".replace("SCHEMA", pgConfigration.getSchema()); + return "SELECT tablename FROM pg_tables WHERE schemaname='SCHEMA' ;".replace("SCHEMA", pgConfiguration.getSchema()); case ck: - CHConfigration chConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfigration.class); - return "SELECT name FROM system.tables where database='DATABASE';".replace("DATABASE", chConfigration.getDataBase()); + CHConfiguration chConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), CHConfiguration.class); + return "SELECT name FROM system.tables where database='DATABASE';".replace("DATABASE", chConfiguration.getDataBase()); default: return "show tables;"; } @@ -620,25 +620,25 @@ public class JdbcProvider extends DatasourceProvider { case ck: return null; case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); - if(StringUtils.isEmpty(sqlServerConfigration.getSchema())){ + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfiguration.class); + if(StringUtils.isEmpty(sqlServerConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } return "SELECT TABLE_NAME FROM DATABASE.INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = 'DS_SCHEMA' ;" - .replace("DATABASE", sqlServerConfigration.getDataBase()) - .replace("DS_SCHEMA", sqlServerConfigration.getSchema()); + .replace("DATABASE", sqlServerConfiguration.getDataBase()) + .replace("DS_SCHEMA", sqlServerConfiguration.getSchema()); case oracle: - OracleConfigration oracleConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfigration.class); - if(StringUtils.isEmpty(oracleConfigration.getSchema())){ + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class); + if(StringUtils.isEmpty(oracleConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } - return "select VIEW_NAME from all_views where owner='" + oracleConfigration.getSchema() + "'"; + return "select VIEW_NAME from all_views where owner='" + oracleConfiguration.getSchema() + "'"; case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class); - if(StringUtils.isEmpty(pgConfigration.getSchema())){ + PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class); + if(StringUtils.isEmpty(pgConfiguration.getSchema())){ throw new Exception(Translator.get("i18n_schema_is_empty")); } - return "SELECT viewname FROM pg_views WHERE schemaname='SCHEMA' ;".replace("SCHEMA", pgConfigration.getSchema()); + return "SELECT viewname FROM pg_views WHERE schemaname='SCHEMA' ;".replace("SCHEMA", pgConfiguration.getSchema()); default: return null; } diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java index deb7de48ab..17b0b1fd9f 100644 --- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java +++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java @@ -96,19 +96,19 @@ public class DatasourceService { case mariadb: case de_doris: case ds_doris: - datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), MysqlConfigration.class)) ); + datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), MysqlConfiguration.class)) ); break; case sqlServer: - datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), SqlServerConfigration.class)) ); + datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), SqlServerConfiguration.class)) ); break; case oracle: - datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), OracleConfigration.class)) ); + datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), OracleConfiguration.class)) ); break; case pg: - datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), PgConfigration.class)) ); + datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), PgConfiguration.class)) ); break; case ck: - datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), CHConfigration.class)) ); + datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), CHConfiguration.class)) ); break; default: break; diff --git a/backend/src/main/java/io/dataease/provider/QueryProvider.java b/backend/src/main/java/io/dataease/provider/QueryProvider.java index 77d0c0e6ed..7695330d3c 100644 --- a/backend/src/main/java/io/dataease/provider/QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/QueryProvider.java @@ -4,7 +4,7 @@ import com.google.gson.Gson; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.Datasource; import io.dataease.controller.request.chart.ChartExtFilterRequest; -import io.dataease.datasource.dto.JdbcDTO; +import io.dataease.datasource.dto.JdbcConfiguration; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; @@ -76,7 +76,7 @@ public abstract class QueryProvider { public void setSchema(SQLObj tableObj, Datasource ds){ if(ds != null && !tableObj.getTableName().startsWith("(") && !tableObj.getTableName().endsWith(")")){ - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); schema = String.format( PgConstants.KEYWORD_TABLE, schema); tableObj.setTableName(schema + "." + tableObj.getTableName()); } diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index a897dc0b65..7cfb1be052 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -6,14 +6,13 @@ import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.controller.request.chart.ChartExtFilterRequest; -import io.dataease.datasource.dto.JdbcDTO; -import io.dataease.datasource.dto.OracleConfigration; +import io.dataease.datasource.dto.JdbcConfiguration; +import io.dataease.datasource.dto.OracleConfiguration; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; -import io.dataease.provider.mysql.MySQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -112,7 +111,7 @@ public class OracleQueryProvider extends QueryProvider { public void setSchema(SQLObj tableObj, Datasource ds){ if(ds != null && !tableObj.getTableName().startsWith("(") && !tableObj.getTableName().endsWith(")")){ - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); schema = String.format( OracleConstants.KEYWORD_TABLE, schema); tableObj.setTableName(schema + "." + tableObj.getTableName()); } @@ -203,7 +202,7 @@ public class OracleQueryProvider extends QueryProvider { @Override public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); return String.format("SELECT * from %s WHERE rownum <= %s ", schema + "." + String.format(OracleConstants.KEYWORD_TABLE, table), limit.toString()); } @@ -730,8 +729,8 @@ public class OracleQueryProvider extends QueryProvider { stringBuilder.append(" \"").append(f.getOriginName()).append("\""); return stringBuilder.toString(); }).toArray(String[]::new); - OracleConfigration oracleConfigration = new Gson().fromJson(ds.getConfiguration(), OracleConfigration.class); - return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), oracleConfigration.getSchema() + ".\"" + table + "\""); + OracleConfiguration oracleConfiguration = new Gson().fromJson(ds.getConfiguration(), OracleConfiguration.class); + return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), oracleConfiguration.getSchema() + ".\"" + table + "\""); } @Override @@ -746,7 +745,7 @@ public class OracleQueryProvider extends QueryProvider { @Override public String convertTableToSql(String tableName, Datasource ds){ - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); schema = String.format( OracleConstants.KEYWORD_TABLE, schema); return createSQLPreview("SELECT * FROM " + schema + "." + String.format(OracleConstants.KEYWORD_TABLE, tableName), null); } diff --git a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java index 04bb3e0651..591dd2aee8 100644 --- a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java @@ -7,14 +7,12 @@ import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.commons.constants.DeTypeConstants; import io.dataease.controller.request.chart.ChartExtFilterRequest; -import io.dataease.datasource.dto.JdbcDTO; +import io.dataease.datasource.dto.JdbcConfiguration; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; -import io.dataease.provider.mysql.MySQLConstants; -import io.dataease.provider.oracle.OracleConstants; import io.dataease.provider.sqlserver.SqlServerSQLConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -709,7 +707,7 @@ public class PgQueryProvider extends QueryProvider { return stringBuilder.toString(); }).toArray(String[]::new); if (ds != null) { - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table); return MessageFormat.format("SELECT {0} FROM {1} ", StringUtils.join(array, ","), tableWithSchema); } else { @@ -724,7 +722,7 @@ public class PgQueryProvider extends QueryProvider { @Override public String convertTableToSql(String tableName, Datasource ds){ - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); schema = String.format( PgConstants.KEYWORD_TABLE, schema); return createSQLPreview("SELECT * FROM " + schema + "." + String.format(PgConstants.KEYWORD_TABLE, tableName), null); } diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index 19ff8072f1..ba191c9111 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -7,15 +7,12 @@ import io.dataease.base.domain.Datasource; import io.dataease.base.mapper.DatasetTableFieldMapper; import io.dataease.commons.constants.DeTypeConstants; import io.dataease.controller.request.chart.ChartExtFilterRequest; -import io.dataease.datasource.dto.JdbcDTO; -import io.dataease.datasource.dto.SqlServerConfigration; +import io.dataease.datasource.dto.JdbcConfiguration; import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; -import io.dataease.provider.oracle.OracleConstants; -import io.dataease.provider.pg.PgConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -159,7 +156,7 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String createQueryTableWithLimit(String table, List fields, Integer limit, boolean isGroup, Datasource ds) { - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); return String.format("SELECT top %s * from %s ", limit.toString(), schema + "." + table); } @@ -666,7 +663,7 @@ public class SqlserverQueryProvider extends QueryProvider { return stringBuilder.toString(); }).toArray(String[]::new); if (ds != null) { - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table); return MessageFormat.format("SELECT {0} FROM {1} ", StringUtils.join(array, ","), tableWithSchema); } else { @@ -681,7 +678,7 @@ public class SqlserverQueryProvider extends QueryProvider { @Override public String convertTableToSql(String tableName, Datasource ds){ - String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema(); + String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema(); schema = String.format( SqlServerSQLConstants.KEYWORD_TABLE, schema); return createSQLPreview("SELECT * FROM " + schema + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, tableName), null); } diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 574d828201..00a9fd9564 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -653,7 +653,7 @@ public class ExtractDataService { String jobName = null; String script = null; Datasource dorisDatasource = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); - DorisConfigration dorisConfigration = new Gson().fromJson(dorisDatasource.getConfiguration(), DorisConfigration.class); + DorisConfiguration dorisConfiguration = new Gson().fromJson(dorisDatasource.getConfiguration(), DorisConfiguration.class); String columns = columnFeilds + ",dataease_uuid"; String transName = null; switch (extractType) { @@ -661,18 +661,18 @@ public class ExtractDataService { transName = "trans_" + DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())); jobName = "job_" + DorisTableUtils.dorisName(datasetTable.getId()); - script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())), root_path + outFile + "." + extention); + script = String.format(shellScript, dorisConfiguration.getUsername(), dorisConfiguration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfiguration.getHost(), dorisConfiguration.getHttpPort(), dorisConfiguration.getDataBase(), DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTable.getId())), root_path + outFile + "." + extention); break; case "incremental_add": transName = "trans_add_" + DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisAddName(datasetTable.getId()); jobName = "job_add_" + DorisTableUtils.dorisName(datasetTable.getId()); - script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); + script = String.format(shellScript, dorisConfiguration.getUsername(), dorisConfiguration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "APPEND", root_path + outFile + "." + extention, dorisConfiguration.getHost(), dorisConfiguration.getHttpPort(), dorisConfiguration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); break; case "incremental_delete": transName = "trans_delete_" + DorisTableUtils.dorisName(datasetTable.getId()); outFile = DorisTableUtils.dorisDeleteName(DorisTableUtils.dorisName(datasetTable.getId())); - script = String.format(shellScript, dorisConfigration.getUsername(), dorisConfigration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "DELETE", root_path + outFile + "." + extention, dorisConfigration.getHost(), dorisConfigration.getHttpPort(), dorisConfigration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); + script = String.format(shellScript, dorisConfiguration.getUsername(), dorisConfiguration.getPassword(), String.valueOf(System.currentTimeMillis()), separator, columns, "DELETE", root_path + outFile + "." + extention, dorisConfiguration.getHost(), dorisConfiguration.getHttpPort(), dorisConfiguration.getDataBase(), DorisTableUtils.dorisName(datasetTable.getId()), root_path + outFile + "." + extention); jobName = "job_delete_" + DorisTableUtils.dorisName(datasetTable.getId()); break; default: @@ -766,8 +766,8 @@ public class ExtractDataService { case ds_doris: case mariadb: case mysql: - MysqlConfigration mysqlConfigration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfigration.class); - dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfigration.getHost().trim(), mysqlConfigration.getDataBase().trim(), mysqlConfigration.getPort().toString(), mysqlConfigration.getUsername(), mysqlConfigration.getPassword()); + MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class); + dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfiguration.getHost().trim(), mysqlConfiguration.getDataBase().trim(), mysqlConfiguration.getPort().toString(), mysqlConfiguration.getUsername(), mysqlConfiguration.getPassword()); dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8"); transMeta.addDatabase(dataMeta); selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL); @@ -775,28 +775,28 @@ public class ExtractDataService { udjcStep = udjc(datasetTableFields, DatasourceTypes.mysql); break; case sqlServer: - SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfigration.class); - dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfigration.getHost().trim(), sqlServerConfigration.getDataBase(), sqlServerConfigration.getPort().toString(), sqlServerConfigration.getUsername(), sqlServerConfigration.getPassword()); + SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class); + dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfiguration.getHost().trim(), sqlServerConfiguration.getDataBase(), sqlServerConfiguration.getPort().toString(), sqlServerConfiguration.getUsername(), sqlServerConfiguration.getPassword()); transMeta.addDatabase(dataMeta); selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL); inputStep = inputStep(transMeta, selectSQL); udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer); break; case pg: - PgConfigration pgConfigration = new Gson().fromJson(datasource.getConfiguration(), PgConfigration.class); - dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfigration.getHost().trim(), pgConfigration.getDataBase(), pgConfigration.getPort().toString(), pgConfigration.getUsername(), pgConfigration.getPassword()); + PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class); + dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword()); transMeta.addDatabase(dataMeta); selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL); inputStep = inputStep(transMeta, selectSQL); udjcStep = udjc(datasetTableFields, DatasourceTypes.pg); break; case oracle: - OracleConfigration oracleConfigration = new Gson().fromJson(datasource.getConfiguration(), OracleConfigration.class); - if (oracleConfigration.getConnectionType().equalsIgnoreCase("serviceName")) { - String database = "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = ORACLE_HOSTNAME)(PORT = ORACLE_PORT))(CONNECT_DATA = (SERVER = DEDICATED)(SERVICE_NAME = ORACLE_SERVICE_NAME )))".replace("ORACLE_HOSTNAME", oracleConfigration.getHost()).replace("ORACLE_PORT", oracleConfigration.getPort().toString()).replace("ORACLE_SERVICE_NAME", oracleConfigration.getDataBase()); - dataMeta = new DatabaseMeta("db", "ORACLE", "Native", "", database, "-1", oracleConfigration.getUsername(), oracleConfigration.getPassword()); + OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class); + if (oracleConfiguration.getConnectionType().equalsIgnoreCase("serviceName")) { + String database = "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = ORACLE_HOSTNAME)(PORT = ORACLE_PORT))(CONNECT_DATA = (SERVER = DEDICATED)(SERVICE_NAME = ORACLE_SERVICE_NAME )))".replace("ORACLE_HOSTNAME", oracleConfiguration.getHost()).replace("ORACLE_PORT", oracleConfiguration.getPort().toString()).replace("ORACLE_SERVICE_NAME", oracleConfiguration.getDataBase()); + dataMeta = new DatabaseMeta("db", "ORACLE", "Native", "", database, "-1", oracleConfiguration.getUsername(), oracleConfiguration.getPassword()); } else { - dataMeta = new DatabaseMeta("db", "ORACLE", "Native", oracleConfigration.getHost().trim(), oracleConfigration.getDataBase(), oracleConfigration.getPort().toString(), oracleConfigration.getUsername(), oracleConfigration.getPassword()); + dataMeta = new DatabaseMeta("db", "ORACLE", "Native", oracleConfiguration.getHost().trim(), oracleConfiguration.getDataBase(), oracleConfiguration.getPort().toString(), oracleConfiguration.getUsername(), oracleConfiguration.getPassword()); } transMeta.addDatabase(dataMeta); @@ -805,8 +805,8 @@ public class ExtractDataService { udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle); break; case ck: - CHConfigration chConfigration = new Gson().fromJson(datasource.getConfiguration(), CHConfigration.class); - dataMeta = new DatabaseMeta("db", "ORACLE", "Native", chConfigration.getHost().trim(), chConfigration.getDataBase().trim(), chConfigration.getPort().toString(), chConfigration.getUsername(), chConfigration.getPassword()); + CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class); + dataMeta = new DatabaseMeta("db", "ORACLE", "Native", chConfiguration.getHost().trim(), chConfiguration.getDataBase().trim(), chConfiguration.getPort().toString(), chConfiguration.getUsername(), chConfiguration.getPassword()); // dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8"); dataMeta.setDatabaseType("Clickhouse"); transMeta.addDatabase(dataMeta);