From 2214322c9700c49c638a99f9c9ffa3433e9e8a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=88=E8=AD=B7?= <2413957313@qq.com>
Date: Wed, 17 Jan 2024 20:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbswitch-admin-ui/package.json                |   3 +
 dbswitch-admin-ui/src/router/index.js         | 240 +++++++++---------
 .../src/views/connection/driver.vue           |   2 +-
 .../src/views/connection/list.vue             | 154 +++++++----
 .../src/main/resources/application.yml        |   8 +-
 5 files changed, 231 insertions(+), 176 deletions(-)

diff --git a/dbswitch-admin-ui/package.json b/dbswitch-admin-ui/package.json
index dde98b2d..0291c2ac 100644
--- a/dbswitch-admin-ui/package.json
+++ b/dbswitch-admin-ui/package.json
@@ -10,13 +10,16 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "ant-design-vue": "^2.2.8",
     "axios": "^0.19.2",
     "echarts": "^4.9.0",
     "element-ui": "^2.15.6",
+    "qs": "^6.11.2",
     "urlencode": "^1.1.0",
     "vue": "^2.5.2",
     "vue-count-to": "^1.0.13",
     "vue-cron": "^1.0.9",
+    "vue-hot-reload-api": "^2.3.4",
     "vue-router": "^3.0.1"
   },
   "devDependencies": {
diff --git a/dbswitch-admin-ui/src/router/index.js b/dbswitch-admin-ui/src/router/index.js
index bc9d82a9..35a0ad21 100644
--- a/dbswitch-admin-ui/src/router/index.js
+++ b/dbswitch-admin-ui/src/router/index.js
@@ -9,125 +9,133 @@ Vue.use(Router);
 //
 ///////////////////////////////////////////////////////////////////////////
 const constantRouter = new Router({
-  routes: [
-    {
-      path: '/',
-      name: '首页',
-      component: () => import('@/views/layout'),
-      redirect: '/dashboard',
-      children: [
+    routes: [
         {
-          path: '/dashboard',
-          name: '概览',
-          icon: "el-icon-menu",
-          component: () => import('@/views/dashboard/index')
+            path: '/',
+            name: '首页',
+            component: () => import('@/views/layout'),
+            redirect: '/dashboard',
+            children: [
+                {
+                    path: '/dashboard',
+                    name: '概览',
+                    icon: "el-icon-menu",
+                    component: () => import('@/views/dashboard/index')
+                },
+                {
+                    path: '/connection',
+                    name: '数据源管理',
+                    icon: "el-icon-s-order",
+                    component: () => import('@/views/connection/index'),
+                    children: [
+                        {
+                            path: '/connection/list',
+                            name: '数据源',
+                            icon: "el-icon-bank-card",
+                            component: () => import('@/views/connection/list')
+                            // children: [
+                            //     {
+                            //         path: '/dataSourceCreateStep1',
+                            //         name: '选择数据源',
+                            //         icon: "el-icon-menu",
+                            //         component: () => import('@/views/connection/dataSourceCreateStep1')
+                            //     }
+                            // ]
+                        },
+                        {
+                            path: '/connection/driver',
+                            name: '驱动配置',
+                            icon: "el-icon-help",
+                            component: () => import('@/views/connection/driver'),
+                        }
+                    ]
+                },
+                {
+                    path: '/metadata',
+                    name: '数据库管理',
+                    icon: "el-icon-coin",
+                    component: () => import('@/views/metadata/index')
+                },
+                {
+                    path: '/task',
+                    name: '数据集成 MDI',
+                    icon: "el-icon-s-tools",
+                    component: () => import('@/views/task/index'),
+                    children: [
+                        {
+                            path: '/task/assignment',
+                            name: '任务管理',
+                            icon: "el-icon-eleme",
+                            component: () => import('@/views/task/assignment'),
+                        },
+                        {
+                            path: '/task/schedule',
+                            name: '监控调度',
+                            icon: "el-icon-pie-chart",
+                            component: () => import('@/views/task/schedule')
+                        }
+                    ]
+                },
+                {
+                    path: '/log',
+                    name: '审计日志',
+                    icon: "el-icon-platform-eleme",
+                    //redirect: '/log/access',
+                    component: () => import('@/views/log/index'),
+                    children: [
+                        {
+                            path: '/log/access',
+                            name: '登录日志',
+                            icon: "el-icon-place",
+                            component: () => import('@/views/log/access')
+                        },
+                        {
+                            path: '/log/action',
+                            name: '操作日志',
+                            icon: "el-icon-s-check",
+                            component: () => import('@/views/log/action')
+                        }
+                    ]
+                },
+                {
+                    path: '/about',
+                    name: '关于系统',
+                    icon: "el-icon-s-custom",
+                    component: () => import('@/views/about/me')
+                },
+                {
+                    path: '/user/personal',
+                    name: '个人中心',
+                    hidden: true,
+                    component: () => import('@/views/personal/index')
+                },
+                {
+                    path: '/task/create',
+                    name: '创建任务',
+                    hidden: true,
+                    component: () => import('@/views/task/create')
+                },
+                {
+                    path: '/task/update',
+                    name: '修改任务',
+                    hidden: true,
+                    component: () => import('@/views/task/update')
+                },
+                {
+                    path: '/task/detail',
+                    name: '查看任务',
+                    hidden: true,
+                    component: () => import('@/views/task/detail')
+                }
+            ],
         },
-        {
-          path: '/connection',
-          name: '连接配置',
-          icon: "el-icon-s-order",
-          component: () => import('@/views/connection/index'),
-          children: [
-            {
-              path: '/connection/driver',
-              name: '驱动配置',
-              icon: "el-icon-help",
-              component: () => import('@/views/connection/driver'),
-            },
-            {
-              path: '/connection/list',
-              name: '连接管理',
-              icon: "el-icon-bank-card",
-              component: () => import('@/views/connection/list')
-            }
-          ]
-        },
-        {
-          path: '/metadata',
-          name: '数据目录',
-          icon: "el-icon-coin",
-          component: () => import('@/views/metadata/index')
-        },
-        {
-          path: '/task',
-          name: '任务管理',
-          icon: "el-icon-s-tools",
-          component: () => import('@/views/task/index'),
-          children: [
-            {
-              path: '/task/assignment',
-              name: '任务安排',
-              icon: "el-icon-eleme",
-              component: () => import('@/views/task/assignment'),
-            },
-            {
-              path: '/task/schedule',
-              name: '调度记录',
-              icon: "el-icon-pie-chart",
-              component: () => import('@/views/task/schedule')
-            }
-          ]
-        },
-        {
-          path: '/log',
-          name: '审计日志',
-          icon: "el-icon-platform-eleme",
-          //redirect: '/log/access',
-          component: () => import('@/views/log/index'),
-          children: [
-            {
-              path: '/log/access',
-              name: '登录日志',
-              icon: "el-icon-place",
-              component: () => import('@/views/log/access')
-            },
-            {
-              path: '/log/action',
-              name: '操作日志',
-              icon: "el-icon-s-check",
-              component: () => import('@/views/log/action')
-            }
-          ]
-        },
-        {
-          path: '/about',
-          name: '关于系统',
-          icon: "el-icon-s-custom",
-          component: () => import('@/views/about/me')
-        },
-        {
-          path: '/user/personal',
-          name: '个人中心',
-          hidden: true,
-          component: () => import('@/views/personal/index')
-        },
-        {
-          path: '/task/create',
-          name: '创建任务',
-          hidden: true,
-          component: () => import('@/views/task/create')
-        },
-        {
-          path: '/task/update',
-          name: '修改任务',
-          hidden: true,
-          component: () => import('@/views/task/update')
-        },
-        {
-          path: '/task/detail',
-          name: '查看任务',
-          hidden: true,
-          component: () => import('@/views/task/detail')
-        }
-      ],
-    },
 
-    {
-      path: '/login',
-      name: '登录',
-      component: () => import('@/views/login')
-    }
-  ]
+        {
+            path: '/login',
+            name: '登录',
+            component: () => import('@/views/login')
+        }
+    ]
 });
 
 export default constantRouter;
diff --git a/dbswitch-admin-ui/src/views/connection/driver.vue b/dbswitch-admin-ui/src/views/connection/driver.vue
index c1a6d169..5af195ef 100644
--- a/dbswitch-admin-ui/src/views/connection/driver.vue
+++ b/dbswitch-admin-ui/src/views/connection/driver.vue
@@ -13,7 +13,7 @@
               <li v-for="(item,index) in connectionTypes"
                   :key="index"
                   @click="handleChooseClick(item.type,index)"
-                  :class="{active:index==isActive}">[{{item.id}}]{{item.type}}</li>
+                  :class="{active:index==isActive}">[{{item.id}}] {{item.type}}</li>
             </ul>
           </div>
         </el-card>
diff --git a/dbswitch-admin-ui/src/views/connection/list.vue b/dbswitch-admin-ui/src/views/connection/list.vue
index 8faf851e..886c9ec2 100644
--- a/dbswitch-admin-ui/src/views/connection/list.vue
+++ b/dbswitch-admin-ui/src/views/connection/list.vue
@@ -16,7 +16,10 @@
           <el-button type="primary"
                      size="mini"
                      icon="el-icon-document-add"
-                     @click="addConnection">添加</el-button>
+                     @click="addConnection">接入数据源</el-button>
+<!--                     @click="selectDataSource">接入数据源-->
+<!--          </el-button>-->
+
         </div>
       </div>
 
@@ -25,10 +28,10 @@
                 size="small"
                 border>
         <el-table-column prop="id"
-                         label="编号"
+                         label="序号"
                          min-width="5%"></el-table-column>
         <el-table-column prop="name"
-                         label="连接名称"
+                         label="数据源名称"
                          show-overflow-tooltip
                          min-width="20%"></el-table-column>
         <el-table-column prop="createTime"
@@ -58,22 +61,26 @@
                          type="danger"
                          icon="el-icon-video-play"
                          @click="handleTest(scope.$index, scope.row)"
-                         round>测试</el-button>
+                         round>测试
+              </el-button>
               <el-button size="small"
                          type="primary"
                          icon="el-icon-document"
                          @click="handleMore(scope.$index, scope.row)"
-                         round>详情</el-button>
+                         round>详情
+              </el-button>
               <el-button size="small"
                          type="warning"
                          icon="el-icon-edit"
                          @click="handleUpdate(scope.$index, scope.row)"
-                         round>编辑</el-button>
+                         round>编辑
+              </el-button>
               <el-button size="small"
                          type="success"
                          icon="el-icon-delete"
                          @click="handleDelete(scope.$index, scope.row)"
-                         round>删除</el-button>
+                         round>删除
+              </el-button>
             </el-button-group>
           </template>
         </el-table-column>
@@ -155,6 +162,31 @@
         </div>
       </el-dialog>
 
+      <el-dialog title="接入数据源"
+                 :visible.sync="dataSourceCreateStep1"
+                 :showClose="false"
+                 :before-close="handleClose">
+
+
+        <el-form :model="createform"
+                 size="mini"
+                 status-icon
+                 :rules="rules"
+                 ref="createform">
+          <el-form-item label="数据库类型"
+                        label-width="120px"
+                        :required=true
+                        prop="type">
+            <el-radio-group v-model="createform.type" @change="selectChangedDriverVersion">
+              <el-radio :label="item.type" :key="index" v-for="(item,index) in databaseType">{{ item.type }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+        </el-form>
+
+
+      </el-dialog>
+
       <el-dialog title="添加数据源连接信息"
                  :visible.sync="createFormVisible"
                  :showClose="false"
@@ -164,7 +196,7 @@
                  status-icon
                  :rules="rules"
                  ref="createform">
-          <el-form-item label="连接名称"
+          <el-form-item label="数据源名称"
                         label-width="120px"
                         :required=true
                         prop="name"
@@ -207,7 +239,7 @@
             <el-tooltip placement="top">
               <i class="el-icon-question">样例:</i>
               <div slot="content">
-                {{createform.sample}}
+                {{ createform.sample }}
               </div>
             </el-tooltip>
             <el-input type="textarea"
@@ -218,14 +250,14 @@
                       auto-complete="off">
             </el-input>
           </el-form-item>
-          <el-form-item label="账号名称"
+          <el-form-item label="用户名"
                         label-width="120px"
                         prop="username"
                         style="width:85%">
             <el-input v-model="createform.username"
                       auto-complete="off"></el-input>
           </el-form-item>
-          <el-form-item label="连接密码"
+          <el-form-item label="密码"
                         label-width="120px"
                         prop="password"
                         style="width:85%">
@@ -238,7 +270,8 @@
              class="dialog-footer">
           <el-button @click="createFormVisible = false">取 消</el-button>
           <el-button type="primary"
-                     @click="handleCreate">确 定</el-button>
+                     @click="handleCreate">确 定
+          </el-button>
         </div>
       </el-dialog>
 
@@ -317,7 +350,8 @@
              class="dialog-footer">
           <el-button @click="updateFormVisible = false">取 消</el-button>
           <el-button type="primary"
-                     @click="handleSave">确 定</el-button>
+                     @click="handleSave">确 定
+          </el-button>
         </div>
       </el-dialog>
     </el-card>
@@ -327,7 +361,7 @@
 <script>
 
 export default {
-  data () {
+  data() {
     return {
       loading: true,
       keyword: null,
@@ -337,8 +371,7 @@ export default {
       totalCount: 2,
       databaseType: [],
       connectionDriver: [],
-      tableData: [
-      ],
+      tableData: [],
       queryForm: {
         title: "",
         type: "",
@@ -413,7 +446,8 @@ export default {
       },
       dialogFormVisible: false,
       createFormVisible: false,
-      updateFormVisible: false
+      updateFormVisible: false,
+      dataSourceCreateStep1: false,
     }
   },
   methods: {
@@ -430,18 +464,18 @@ export default {
           size: this.pageSize
         })
       }).then(res => {
-        if (0 === res.data.code) {
-          this.currentPage = res.data.pagination.page;
-          this.pageSize = res.data.pagination.size;
-          this.totalCount = res.data.pagination.total;
-          this.tableData = res.data.data;
-        } else {
-          alert("加载任务列表失败:" + res.data.message);
-        }
-      },
-        function () {
-          console.log("load connection list failed");
-        }
+            if (0 === res.data.code) {
+              this.currentPage = res.data.pagination.page;
+              this.pageSize = res.data.pagination.size;
+              this.totalCount = res.data.pagination.total;
+              this.tableData = res.data.data;
+            } else {
+              alert("加载任务列表失败:" + res.data.message);
+            }
+          },
+          function () {
+            console.log("load connection list failed");
+          }
       );
     },
     searchByKeyword: function () {
@@ -454,32 +488,32 @@ export default {
         method: "GET",
         url: "/dbswitch/admin/api/v1/connection/types"
       }).then(
-        res => {
-          if (0 === res.data.code) {
-            this.databaseType = res.data.data;
-          } else {
-            alert("加载任务列表失败:" + res.data.message);
+          res => {
+            if (0 === res.data.code) {
+              this.databaseType = res.data.data;
+            } else {
+              alert("加载任务列表失败:" + res.data.message);
+            }
+          },
+          function () {
+            console.log("failed");
           }
-        },
-        function () {
-          console.log("failed");
-        }
       );
     },
-    handleClose (done) {
+    handleClose(done) {
     },
     handleDelete: function (index, row) {
       this.$confirm(
-        "此操作将此数据源ID=" + row.id + "删除么, 是否继续?",
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }
+          "此操作将此数据源ID=" + row.id + "删除么, 是否继续?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
       ).then(() => {
         this.$http.delete(
-          "/dbswitch/admin/api/v1/connection/delete/" + row.id
+            "/dbswitch/admin/api/v1/connection/delete/" + row.id
         ).then(res => {
           //console.log(res);
           if (0 === res.data.code) {
@@ -496,7 +530,7 @@ export default {
     },
     handleTest: function (index, row) {
       this.$http.get(
-        "/dbswitch/admin/api/v1/connection/test/" + row.id
+          "/dbswitch/admin/api/v1/connection/test/" + row.id
       ).then(res => {
         //console.log(res);
         if (0 === res.data.code) {
@@ -510,6 +544,10 @@ export default {
       this.createFormVisible = true;
       this.createform = {};
     },
+    selectDataSource: function () {
+      this.dataSourceCreateStep1 = true;
+
+    },
     handleCreate: function () {
       let driverClass = "";
       if (this.databaseType.length > 0) {
@@ -557,14 +595,14 @@ export default {
     selectChangedDriverVersion: function (value) {
       this.connectionDriver = [];
       this.$http.get(
-        "/dbswitch/admin/api/v1/connection/" + value + "/drivers"
+          "/dbswitch/admin/api/v1/connection/" + value + "/drivers"
       ).then(res => {
         if (0 === res.data.code) {
           this.connectionDriver = res.data.data;
           let varDatabaseType = this.databaseType.find(
-            (item) => {
-              return item.type === value;
-            });
+              (item) => {
+                return item.type === value;
+              });
           if (varDatabaseType) {
             this.createform.sample = varDatabaseType.sample;
           }
@@ -577,7 +615,7 @@ export default {
     handleUpdate: function (index, row) {
       this.updateform = JSON.parse(JSON.stringify(row));
       this.$http.get(
-        "/dbswitch/admin/api/v1/connection/" + this.updateform.type + "/drivers"
+          "/dbswitch/admin/api/v1/connection/" + this.updateform.type + "/drivers"
       ).then(res => {
         if (0 === res.data.code) {
           this.connectionDriver = res.data.data;
@@ -643,9 +681,9 @@ export default {
       this.loading = true;
       this.currentPage = currentPage;
       this.loadData();
-    }
+    },
   },
-  created () {
+  created() {
     this.loadDatabaseTypes();
     this.loadData();
   }
@@ -657,12 +695,14 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .el-card,
 .el-message {
   width: 100%;
   height: 100%;
   overflow: auto;
 }
+
 .connection-list-top {
   width: 100%;
   display: flex;
@@ -675,14 +715,18 @@ export default {
   display: flex;
   justify-content: space-between;
 }
+
 .left-search-input {
   width: 300px;
   margin-right: auto;
   margin: 10px 5px;
 }
+
 .right-add-button-group {
   width: 100px;
   margin-left: auto;
   margin: 10px 5px;
 }
 </style>
+
+
diff --git a/dbswitch-admin/src/main/resources/application.yml b/dbswitch-admin/src/main/resources/application.yml
index 906775bb..cf66bcb0 100644
--- a/dbswitch-admin/src/main/resources/application.yml
+++ b/dbswitch-admin/src/main/resources/application.yml
@@ -12,9 +12,9 @@ spring:
     static-path-pattern: /statics/**
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.31.57:3306/dbswitch?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000
-    username: tangyibo
-    password: 123456
+    url: jdbc:mysql://192.168.171.131:3306/dbswitch?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&connectTimeout=30000
+    username: root
+    password: root
     validation-query: SELECT 1
     test-on-borrow: true
   flyway:
@@ -32,4 +32,4 @@ mybatis:
 
 dbswitch:
   configuration:
-    drivers-base-path: ${APP_DRIVERS_PATH}
+    drivers-base-path: ${APP_DRIVERS_PATH:D:\Code\Gitee\IdeaProjects\dbswitch\drivers}