diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index d69165c1c8..8c363c9a22 100644 --- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -371,9 +371,11 @@ public class DatasourceService { String datasourceStatus = null; try { Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); + System.out.println(datasourceProvider.getClass()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); datasourceStatus = datasourceProvider.checkStatus(datasourceRequest); + System.out.println(datasourceStatus); if (datasource.getType().equalsIgnoreCase("api")) { List apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken>() { }.getType()); @@ -398,6 +400,7 @@ public class DatasourceService { return ResultHolder.success("Success"); } catch (Exception e) { + e.printStackTrace(); datasourceStatus = "Error"; return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage()); } finally { @@ -405,6 +408,7 @@ public class DatasourceService { record.setStatus(datasourceStatus); DatasourceExample example = new DatasourceExample(); example.createCriteria().andIdEqualTo(datasource.getId()); + System.out.println(new Gson().toJson(record)); datasourceMapper.updateByExampleSelective(record, example); } } diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java index 7a392b73fe..5ed6068968 100644 --- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java +++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmConstants.java @@ -4,6 +4,7 @@ package io.dataease.plugins.datasource.dm.query; import io.dataease.plugins.common.constants.datasource.SQLConstants; +import static io.dataease.plugins.common.constants.DatasourceTypes.mysql; import static io.dataease.plugins.common.constants.DatasourceTypes.oracle; public class DmConstants extends SQLConstants { diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java index 05e13b06fd..250fcb2d82 100644 --- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java +++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinConstants.java @@ -9,7 +9,7 @@ public class KylinConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; - + public static final String ALIAS_FIX = "%s"; public static final String CAST = "CAST(%s AS %s)"; public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java index 26e1835eb8..248ce8a10d 100644 --- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java +++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxConstants.java @@ -11,6 +11,7 @@ public class MaxConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; + public static final String ALIAS_FIX = "%s"; public static final String UNIX_TIMESTAMP = "TO_MILLIS(%s)"; public static final String DATE_FORMAT = "to_char(%s, '%s')"; diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java index 696319e9bc..f948851f56 100644 --- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java +++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoConstants.java @@ -11,6 +11,7 @@ public class PrestoConstants extends SQLConstants { public static final String KEYWORD_FIX = "%s." + "%s"; + public static final String ALIAS_FIX = "%s"; public static final String UNIX_TIMESTAMP = "to_unixtime(%s)"; public static final String FROM_UNIXTIME = "from_unixtime(%s)";