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 }) },