From e72b70d45e846276e66e3128eba96404c068fab0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 11:50:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8F=82=E6=95=B0=E9=87=8C=E9=A6=96?=
 =?UTF-8?q?=E5=B0=BE=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/datasource/dto/MysqlConfigration.java   |  6 +++---
 .../dataease/datasource/dto/OracleConfigration.java  | 12 ++++++------
 .../io/dataease/datasource/dto/PgConfigration.java   |  6 +++---
 .../datasource/dto/SqlServerConfigration.java        |  5 ++++-
 frontend/src/views/dataset/data/UpdateInfo.vue       |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
index aa912d19bc..a94e3d0c4a 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
@@ -12,8 +12,8 @@ public class MysqlConfigration extends JdbcDTO {
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000"
-                .replace("HOSTNAME", getHost())
-                .replace("PORT", getPort().toString())
-                .replace("DATABASE", getDataBase());
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
index 6323791f90..d348e0d030 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
@@ -14,14 +14,14 @@ public class OracleConfigration extends JdbcDTO {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         if(getConnectionType().equalsIgnoreCase("serviceName")){
             return "jdbc:oracle:thin:@HOSTNAME:PORT/DATABASE"
-                    .replace("HOSTNAME", getHost())
-                    .replace("PORT", getPort().toString())
-                    .replace("DATABASE", getDataBase());
+                    .replace("HOSTNAME", getHost().trim())
+                    .replace("PORT", getPort().toString().trim())
+                    .replace("DATABASE", getDataBase().trim());
         }else {
             return "jdbc:oracle:thin:@HOSTNAME:PORT:DATABASE"
-                    .replace("HOSTNAME", getHost())
-                    .replace("PORT", getPort().toString())
-                    .replace("DATABASE", getDataBase());
+                    .replace("HOSTNAME", getHost().trim())
+                    .replace("PORT", getPort().toString().trim())
+                    .replace("DATABASE", getDataBase().trim());
         }
     }
 }
diff --git a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
index 3258c575c0..e3fd2ae4d3 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
@@ -12,8 +12,8 @@ public class PgConfigration extends JdbcDTO {
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
-                .replace("HOSTNAME", getHost())
-                .replace("PORT", getPort().toString())
-                .replace("DATABASE", getDataBase());
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
index 7282704586..f08c31167c 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
@@ -10,6 +10,9 @@ public class SqlServerConfigration extends JdbcDTO {
     private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 
     public String getJdbc(){
-        return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase());
+        return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE"
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 6383d4ba36..975a744b73 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -513,8 +513,8 @@ export default {
       }
       this.update_task = true
     },
-    listTask() {
-      post('/dataset/task/list', { tableId: this.table.id }).then(response => {
+    listTask(loading = true) {
+      post('/dataset/task/list', { tableId: this.table.id }, loading).then(response => {
         this.taskData = response.data
       })
     },