From 5f0ad8d2006f95633bcf6ad30a55f128e10ad654 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 26 Aug 2021 12:35:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E8=AE=BE=E7=BD=AE=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/service/DatasourceService.java | 10 ++++++++-
 frontend/src/views/system/datasource/form.vue | 21 -------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

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 aabe5cc7f5..529cdb16af 100644
--- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
@@ -1,5 +1,6 @@
 package io.dataease.datasource.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.*;
@@ -14,6 +15,8 @@ import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.datasource.dto.DBTableDTO;
+import io.dataease.datasource.dto.MysqlConfigration;
+import io.dataease.datasource.dto.OracleConfigration;
 import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.ProviderFactory;
 import io.dataease.datasource.request.DatasourceRequest;
@@ -80,7 +83,12 @@ public class DatasourceService {
         request.setSort("update_time desc");
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
         datasourceDTOS.forEach(datasourceDTO -> {
-            datasourceDTO.getType();
+            if(datasourceDTO.getType().equalsIgnoreCase("mysql")){
+                datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), MysqlConfigration.class)) );
+            };
+            if(datasourceDTO.getType().equalsIgnoreCase("oracle")){
+                datasourceDTO.setConfiguration(JSONObject.toJSONString(new Gson().fromJson(datasourceDTO.getConfiguration(), OracleConfigration.class)));
+            };
         });
         return datasourceDTOS;
     }
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index 36b96dbd17..7583b04b44 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -193,27 +193,6 @@ export default {
       this.form = Object.assign({}, row)
       this.originConfiguration = this.form.configuration
       this.form.configuration = JSON.parse(this.form.configuration)
-      if (!this.form.configuration.initialPoolSize) {
-        this.form.configuration.initialPoolSize = 5
-      }
-      if (!this.form.configuration.minPoolSize) {
-        this.form.configuration.minPoolSize = 5
-      }
-      if (!this.form.configuration.maxPoolSize) {
-        this.form.configuration.maxPoolSize = 50
-      }
-      if (!this.form.configuration.maxIdleTime) {
-        this.form.configuration.maxIdleTime = 30
-      }
-      if (!this.form.configuration.acquireIncrement) {
-        this.form.configuration.acquireIncrement = 5
-      }
-      if (!this.form.configuration.idleConnectionTestPeriod) {
-        this.form.configuration.idleConnectionTestPeriod = 5
-      }
-      if (!this.form.configuration.connectTimeout) {
-        this.form.configuration.connectTimeout = 5
-      }
     },
     reset() {
       this.$refs.dsForm.resetFields()