Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/dataease/datasource/dto/CHConfigration.java → 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 = "";

backend/src/main/java/io/dataease/datasource/dto/DorisConfigration.java → 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;
 }

backend/src/main/java/io/dataease/datasource/dto/EsConfigDTO.java → 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;

backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java → 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;

backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java → 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";

backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java → 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;

backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java → 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 = "";

backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java → 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(){

backend/src/main/java/io/dataease/datasource/provider/EsProvider.java

 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<String[]> getData(DatasourceRequest dsr) throws Exception {
         List<String[]> 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;
     }
 

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;

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());
         }

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<DatasetTableField> 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);
     }

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);
     }

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<DatasetTableField> 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);
     }

frontend/src/views/system/datasource/form.vue

@@ -278,6 +278,10 @@ export default {
         this.$message.error(this.$t('datasource.please_choose_schema'))
         return
       }
+      if (this.form.configuration.dataSourceType === 'jdbc' && this.form.configuration.port <= 0) {
+        this.$message.error(this.$t('datasource.port_no_less_then_0'))
+        return
+      }
       this.$refs.dsForm.validate(valid => {
         if (valid) {
           const data = JSON.parse(JSON.stringify(this.form))