From 417132d25cbc1e40454f93bc74b748076944238b 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: Tue, 23 Jul 2019 21:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/manage/entity/DbDatasource.java | 18 ++++++++++++++++-- .../db/controller/DatabaseDocController.java | 14 ++++++++++---- .../db/controller/DbDatasourceController.java | 4 +++- .../configuration/DatasourceUtil.java | 1 + .../framework/db/bean/DatabaseFactoryBean.java | 9 +++++++++ .../src/main/resources/doc-db-index.js | 8 ++++---- .../src/main/resources/doc-db-manifest.js | 4 ++-- .../src/main/resources/doc-db-vendor.js | 6 +++--- zyplayer-doc-db/src/main/resources/doc-db.html | 2 +- zyplayer-doc-ui/db-ui/src/App.vue | 2 +- .../db-ui/src/views/data/DatasourceManage.vue | 8 ++++++-- 11 files changed, 56 insertions(+), 20 deletions(-) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java index ed26d2d2..d3cc4786 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java @@ -1,13 +1,14 @@ package com.zyplayer.doc.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; + import java.io.Serializable; +import java.util.Date; /** *
- * + * *
* * @author 暮光:城中城 @@ -63,6 +64,11 @@ public class DbDatasource implements Serializable { */ private Integer yn; + /** + * 数据源名称 + */ + private String name; + public Long getId() { return id; } @@ -141,4 +147,12 @@ public class DbDatasource implements Serializable { ", yn=" + yn + "}"; } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java index b284fc94..5599a5e0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java @@ -45,7 +45,12 @@ public class DatabaseDocController { @PostMapping(value = "/getDataSourceList") public ResponseJson getDataSourceList() { List