From e0e59cc82e8819f6e83defad7a41a1bf27b5ad8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Mon, 19 Apr 2021 15:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/sql/增量更新语句.sql   |  2 +-
 .../db-ui/src/views/data/DatasourceManage.vue | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/zyplayer-doc-manage/src/main/resources/sql/增量更新语句.sql b/zyplayer-doc-manage/src/main/resources/sql/增量更新语句.sql
index 9a4a4607..a5c4fafd 100644
--- a/zyplayer-doc-manage/src/main/resources/sql/增量更新语句.sql
+++ b/zyplayer-doc-manage/src/main/resources/sql/增量更新语句.sql
@@ -1,4 +1,4 @@
--- ==导出注意==
+-- 每次发版时注意事项 ---
 -- 1. datetime(0) 低版本不支持此语法，改为datetime
 -- 2. utf8mb4 低版本不支持此字符集，改为utf8
 -- 3. 加字段后记得排查是否有insert语句，需要同步修改
diff --git a/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue b/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue
index d9f199e3..fa646050 100644
--- a/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue
+++ b/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue
@@ -191,11 +191,13 @@
             },
             addDatasource() {
                 this.datasourceDialogVisible = true;
+				this.testDatasourceErrLoading = false;
                 this.newDatasource = {name: "", driverClassName: "", sourceUrl: "", sourceName: "", sourcePassword: "", groupName: ""};
             },
             editDatasource(row) {
                 this.newDatasource = JSON.parse(JSON.stringify(row));
                 this.datasourceDialogVisible = true;
+				this.testDatasourceErrLoading = false;
             },
             deleteDatasource(row) {
                 this.$confirm('确定要删除此数据源吗？', '提示', {
@@ -220,16 +222,20 @@
                 });
             },
             testDatasource() {
-                this.testDatasourceErrLoading = true;
-                datasourceApi.queryTestDatasource(this.newDatasource).then(res => {
-                    this.testDatasourceErrLoading = false;
-                    if (res.errCode == 200) {
-                        this.$message.success("连接成功！");
-                    } else {
-                        this.testDatasourceErrVisible = true;
-                        this.testDatasourceErrInfo = res.errMsg || '';
-                    }
-                });
+				this.testDatasourceErrLoading = true;
+				datasourceApi.queryTestDatasource(this.newDatasource).then(res => {
+					this.testDatasourceErrLoading = false;
+					if (res.errCode == 200) {
+						this.$message.success("连接成功！");
+					} else {
+						this.testDatasourceErrVisible = true;
+						this.testDatasourceErrInfo = res.errMsg || '';
+					}
+				}).catch(err => {
+					this.testDatasourceErrLoading = false;
+					this.testDatasourceErrVisible = true;
+					this.testDatasourceErrInfo = err.message || '请求出错';
+				});
             },
             driverClassNameChange() {
                 if (this.newDatasource.driverClassName == 'com.mysql.jdbc.Driver') {