From 4474970b2d32537bc98db8c3d006ccaa49e1ff04 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sun, 3 Jul 2022 22:02:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/datasource/DatasourceService.java | 7 +++++++ frontend/src/views/system/datasource/DsForm.vue | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index f8cdfaf41c..7c80d40166 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -1,5 +1,7 @@ package io.dataease.service.datasource; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -140,6 +142,11 @@ public class DatasourceService { if (StringUtils.isNotEmpty(configuration.getCustomDriver()) && !configuration.getCustomDriver().equalsIgnoreCase("default")) { datasourceDTO.setCalculationMode(DatasourceCalculationMode.DIRECT); } + JSONObject jsonObject = JSONObject.parseObject(datasourceDTO.getConfiguration()); + if(jsonObject.getString("queryTimeout") == null){ + jsonObject.put("queryTimeout", 30); + datasourceDTO.setConfiguration(jsonObject.toString()); + } } if(datasourceDTO.getType().equalsIgnoreCase(DatasourceTypes.mysql.toString())){ diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue index 4bd16b2fb4..cc050e7955 100644 --- a/frontend/src/views/system/datasource/DsForm.vue +++ b/frontend/src/views/system/datasource/DsForm.vue @@ -319,9 +319,6 @@ export default { } else { this.form.configuration = JSON.parse(this.form.configuration) - if(this.form.configuration.queryTimeout === undefined){ - this.form.configuration.queryTimeout = 30 - } } this.disabled = this.params && this.params.id && this.params.showModel && this.params.showModel === 'show' && !this.canEdit },