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 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=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 ? '连接成功' : '连接失败',

From 1ff0492d3c69b73b0aeb8e7b0ad82ee75c2fd752 Mon Sep 17 00:00:00 2001
From: "zhy6599@163.com" <zhy6599@163.com>
Date: Sun, 1 Dec 2019 22:18:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mnt/database/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 7c44465..9bb53cb 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -38,9 +38,9 @@
     </el-dialog>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
-      <el-table-column prop="name" label="数据库名称" />
+      <el-table-column prop="name" label="数据库名称" width="180" />
       <el-table-column prop="jdbcUrl" label="连接地址" />
-      <el-table-column prop="userName" label="用户名" />
+      <el-table-column prop="userName" label="用户名" width="100" />
       <el-table-column v-if="checkPermission(['admin','database:edit','database:del'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','database:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />

From 4b14ba05d53716d3e9a84b7beabe22f7c2519dd8 Mon Sep 17 00:00:00 2001
From: zhanghouying <zhy6599@163.com>
Date: Mon, 9 Dec 2019 14:58:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=8A=E4=BC=A0SQL?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=9D=A5=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/getters.js               |  1 +
 src/store/modules/api.js           |  2 +
 src/views/mnt/database/execute.vue | 86 ++++++++++++++++++++++++++++++
 src/views/mnt/database/index.vue   | 34 ++++++++++--
 4 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 src/views/mnt/database/execute.vue

diff --git a/src/store/getters.js b/src/store/getters.js
index 2e0d110..376e2a8 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,5 +1,6 @@
 const getters = {
   deployUploadApi: state => state.api.deployUploadApi,
+  databaseUploadApi: state => state.api.databaseUploadApi,
   size: state => state.app.size,
   sidebar: state => state.app.sidebar,
   device: state => state.app.device,
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index a4d10d3..92202f6 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -3,6 +3,8 @@ const api = {
   state: {
     // 部署包上传
     deployUploadApi: baseUrl + '/api/deploy/upload',
+    // SQL脚本上传
+    databaseUploadApi: baseUrl + '/api/database/upload',
     // 实时控制台
     socketApi: baseUrl + '/websocket?token=kl',
     // 图片上传
diff --git a/src/views/mnt/database/execute.vue b/src/views/mnt/database/execute.vue
new file mode 100644
index 0000000..4ada6be
--- /dev/null
+++ b/src/views/mnt/database/execute.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" title="执行脚本" width="400px">
+    <el-form ref="form" :rules="rules" size="small">
+      <el-upload
+        :action="databaseUploadApi"
+        :data="databaseInfo"
+        :headers="headers"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        class="upload-demo"
+        drag
+      >
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div slot="tip" class="el-upload__tip">上传后，系统会自动执行SQL脚本</div>
+      </el-upload>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+export default {
+  props: {
+    databaseInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      dialog: false,
+      headers: {
+        Authorization: 'Bearer ' + getToken()
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['databaseUploadApi'])
+  },
+  mounted() {
+  },
+  methods: {
+    cancel() {
+      this.dialog = false
+    },
+    handleSuccess(response, file, fileList) {
+      if (response === 'success') {
+        this.$notify({
+          title: '执行成功',
+          type: 'success',
+          duration: 2500
+        })
+      } else {
+        this.$notify({
+          title: response,
+          type: 'error',
+          duration: 0
+        })
+      }
+    },
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 0
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/mnt/database/index.vue b/src/views/mnt/database/index.vue
index 9bb53cb..9e1d87b 100644
--- a/src/views/mnt/database/index.vue
+++ b/src/views/mnt/database/index.vue
@@ -13,16 +13,28 @@
         type="primary"
         icon="el-icon-plus"
         @click="showAddFormDialog"
-      >新增</el-button>
+      >新增
+      </el-button>
+      <el-button
+        v-permission="['admin','database:add']"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload"
+        @click="execute"
+      >执行脚本
+      </el-button>
     </div>
     <!--表单组件-->
+    <eForm ref="execute" :database-info="currentRow" />
     <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="getFormTitle()" width="530px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="数据库名称" prop="name">
           <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: 300px" /><el-button :loading="loading" type="info" @click="testConnectDatabase">测试</el-button>
+          <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" />
@@ -37,7 +49,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%">
+    <el-table v-loading="loading" :data="data" highlight-current-row stripe size="small" style="width: 100%" @current-change="handleCurrentChange">
       <el-table-column prop="name" label="数据库名称" width="180" />
       <el-table-column prop="jdbcUrl" label="连接地址" />
       <el-table-column prop="userName" label="用户名" width="100" />
@@ -76,12 +88,17 @@
 import crud from '@/mixins/crud'
 import crudDatabase from '@/api/mnt/database'
 import { testDbConnect } from '@/api/mnt/connect'
+import eForm from './execute'
 export default {
+  components: { eForm },
   mixins: [crud],
   data() {
     return {
       title: '数据库',
       crudMethod: { ...crudDatabase },
+      currentRow: {},
+      selectIndex: '',
+      databaseInfo: '',
       form: { id: null, name: null, jdbcUrl: null, userName: null, pwd: null },
       rules: {
         name: [
@@ -125,6 +142,17 @@ export default {
           })
         }
       })
+    },
+    execute() {
+      if (!this.selectIndex) {
+        this.$message.error('请先选择数据库')
+      } else {
+        this.$refs.execute.dialog = true
+      }
+    },
+    handleCurrentChange(row) {
+      this.currentRow = row
+      this.selectIndex = !row ? null : row.id
     }
   }
 }