From ee3f478dc780322458699c5f640daffa849c8dfc Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Sun, 1 Dec 2019 22:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mnt/connect.js           | 17 +++++++++++++++++
 src/api/mnt/database.js          | 10 +++++++++-
 src/api/mnt/serverDeploy.js      |  8 --------
 src/views/mnt/database/index.vue | 24 +++++++++++++++++++++---
 src/views/mnt/server/index.vue   |  5 +++--
 5 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 src/api/mnt/connect.js

diff --git a/src/api/mnt/connect.js b/src/api/mnt/connect.js
new file mode 100644
index 0000000..1bbe90b
--- /dev/null
+++ b/src/api/mnt/connect.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function testDbConnect(data) {
+  return request({
+    url: 'api/database/testConnect',
+    method: 'post',
+    data
+  })
+}
+
+export function testServerConnect(data) {
+  return request({
+    url: 'api/serverDeploy/testConnect',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/mnt/database.js b/src/api/mnt/database.js
index 084a74d..b25a8a8 100644
--- a/src/api/mnt/database.js
+++ b/src/api/mnt/database.js
@@ -23,4 +23,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function testDbConnection(data) {
+  return request({
+    url: 'api/database/testConnect',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, testDbConnection }
diff --git a/src/api/mnt/serverDeploy.js b/src/api/mnt/serverDeploy.js
index d2eb944..29fb6bb 100644
--- a/src/api/mnt/serverDeploy.js
+++ b/src/api/mnt/serverDeploy.js
@@ -23,12 +23,4 @@ export function edit(data) {
   })
 }
 
-export function testConnect(data) {
-  return request({
-    url: 'api/serverDeploy/testConnect',
-    method: 'post',
-    data
-  })
-}
-
 export default { add, edit, del }
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 26c93c5..7c44465 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -22,7 +22,7 @@
           <el-input v-model="form.name" style="width: 370px" />
         </el-form-item>
         <el-form-item label="连接地址" prop="jdbcUrl">
-          <el-input v-model="form.jdbcUrl" style="width: 370px" />
+          <el-input v-model="form.jdbcUrl" style="width: 300px" /><el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
           <el-input v-model="form.userName" style="width: 370px" />
@@ -74,13 +74,14 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudDataBase from '@/api//mnt/database'
+import crudDatabase from '@/api/mnt/database'
+import { testDbConnect } from '@/api/mnt/connect'
 export default {
   mixins: [crud],
   data() {
     return {
       title: '数据库',
-      crudMethod: { ...crudDataBase },
+      crudMethod: { ...crudDatabase },
       form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
       rules: {
         name: [
@@ -107,6 +108,23 @@ export default {
     beforeInit() {
       this.url = 'api/database'
       return true
+    },
+    testConnectDatabase() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.loading = true
+          testDbConnect(this.form).then((res) => {
+            this.loading = false
+            this.$notify({
+              title: res ? '连接成功' : '连接失败',
+              type: res ? 'success' : 'error',
+              duration: 2500
+            })
+          }).catch(() => {
+            this.loading = false
+          })
+        }
+      })
     }
   }
 }
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index d7a68d4..b9bcf1c 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -96,7 +96,8 @@
 
 <script>
 import crud from '@/mixins/crud'
-import { crudServer, testConnect } from '@/api/mnt/serverDeploy'
+import crudServer from '@/api/mnt/serverDeploy'
+import { testServerConnect } from '@/api/mnt/connect'
 import { validateIP } from '@/utils/validate'
 export default {
   mixins: [crud],
@@ -141,7 +142,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          testConnect(this.form).then((res) => {
+          testServerConnect(this.form).then((res) => {
             this.loading = false
             this.$notify({
               title: res ? '连接成功' : '连接失败',