diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index 1d11c0eae6..65ac06f5ff 100644 --- a/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -11,9 +11,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.JsonObject; +import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.dto.dataset.DatasetTableFieldDTO; import io.dataease.plugins.common.dto.datasource.TableDesc; import io.dataease.plugins.common.dto.datasource.TableField; +import io.dataease.plugins.common.exception.DataEaseException; import io.dataease.plugins.common.request.datasource.DatasourceRequest; import io.dataease.plugins.datasource.entity.Status; import io.dataease.plugins.datasource.provider.Provider; @@ -245,9 +247,9 @@ public class ApiProvider extends Provider { rootPath = "$[*]"; JsonNode jsonArray = null; try { - jsonArray = new ObjectMapper().readTree(response); + jsonArray = CommonBeanFactory.getBean(ObjectMapper.class).readTree(response); } catch (Exception e) { - e.printStackTrace(); + DataEaseException.throwException(e.getMessage()); } for (Object o : jsonArray) { handleStr(apiDefinition, o.toString(), fields, rootPath); diff --git a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index cf415b8b5e..fec8ac0107 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -1620,7 +1620,7 @@ public class EsQueryProvider extends QueryProvider { "{\"dateformat\": \"yyyy/MMdd\"},\n" + "{\"dateformat\": \"yyyy-MM-dd\"},\n" + "{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" + - "{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" + + "{\"dateformat\": \"yyyy/MM/dd HH:mm:ss\"},\n" + "{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" + "]", Dateformat.class); } diff --git a/core/backend/src/main/resources/application.properties b/core/backend/src/main/resources/application.properties index 2b9a8079f3..1683cb9987 100644 --- a/core/backend/src/main/resources/application.properties +++ b/core/backend/src/main/resources/application.properties @@ -80,6 +80,7 @@ server.compression.min-response-size=1024 server.servlet.context-parameters.configurationStrategy=SYSTEM_PROPERTIES server.servlet.session.cookie.http-only=true server.servlet.session.tracking-modes=cookie +spring.jackson.parser.allow-numeric-leading-zeros=true