包优化，数据库文档增加oracle支持

zyplayer-doc-db/pom.xml

@@ -41,11 +41,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jta-atomikos</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
-			<artifactId>jtds</artifactId>
-			<version>1.3.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
@@ -56,21 +51,6 @@
 			<artifactId>mybatis-spring</artifactId>
 			<version>1.3.0</version>
 		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.44</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.hutool</groupId>
-			<artifactId>hutool-http</artifactId>
-			<version>4.1.8</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
         <dependency>
             <groupId>com.zyplayer</groupId>
             <artifactId>zyplayer-doc-core</artifactId>

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java

@@ -12,8 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
-import java.sql.DatabaseMetaData;
-
 public class DatasourceUtil {
 	private static SqlLogInterceptor sqlLogInterceptor = new SqlLogInterceptor();
 	
@@ -39,33 +37,31 @@ public class DatasourceUtil {
 			// CreateConnectionThread 源码在这个类里面
 			dataSource.setConnectionErrorRetryAttempts(2);
 			dataSource.setBreakAfterAcquireFailure(true);
-			dataSource.setName("zyplayer-doc-db" + dbDatasource.getId());
+			dataSource.setName("zyplayer-doc-db-" + dbDatasource.getId());
 			DruidPooledConnection connection = dataSource.getConnection(3000);
 			if (connection == null) {
 				throw new ConfirmException("尝试获取该数据源连接失败：" + dbDatasource.getSourceUrl());
 			}
 			// 描述连接信息的对象
 			DatabaseFactoryBean databaseFactoryBean = new DatabaseFactoryBean();
-			DatabaseMetaData metaData = connection.getMetaData();
-			String productName = metaData.getDatabaseProductName().toLowerCase();
 			Resource[] resources = null;
 			String dbUrl = dbDatasource.getSourceUrl();
 			PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-			if (productName.contains("mysql")) {
+			if (dbUrl.contains("mysql")) {
 				// jdbc:mysql://192.168.0.1:3306/user_info?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true
 				String[] urlParamArr = dbUrl.split("\\?");
 				String[] urlDbNameArr = urlParamArr[0].split("/");
 				if (urlDbNameArr.length >= 2) {
 					databaseFactoryBean.setDbName(urlDbNameArr[urlDbNameArr.length - 1]);
-					databaseFactoryBean.setHost(urlDbNameArr[urlDbNameArr.length - 2]);
+					//databaseFactoryBean.setHost(urlDbNameArr[urlDbNameArr.length - 2]);
 				}
 				databaseFactoryBean.setDatabaseProduct(DatabaseFactoryBean.DatabaseProduct.MYSQL);
 				resources = resolver.getResources("classpath:com/zyplayer/doc/db/framework/db/mapper/mysql/*.xml");
-			} else if (productName.contains("sql server")) {
+			} else if (dbUrl.contains("sqlserver")) {
 				// jdbc:jtds:sqlserver://192.168.0.1:33434;socketTimeout=60;DatabaseName=user_info;
 				String[] urlParamArr = dbUrl.split(";");
-				String[] urlDbNameArr = urlParamArr[0].split("/");
-				databaseFactoryBean.setHost(urlDbNameArr[urlDbNameArr.length - 1]);
+				//String[] urlDbNameArr = urlParamArr[0].split("/");
+				//databaseFactoryBean.setHost(urlDbNameArr[urlDbNameArr.length - 1]);
 				for (String urlParam : urlParamArr) {
 					String[] keyValArr = urlParam.split("=");
 					if (keyValArr.length >= 2 && keyValArr[0].equalsIgnoreCase("DatabaseName")) {
@@ -74,6 +70,18 @@ public class DatasourceUtil {
 				}
 				databaseFactoryBean.setDatabaseProduct(DatabaseFactoryBean.DatabaseProduct.SQLSERVER);
 				resources = resolver.getResources("classpath:com/zyplayer/doc/db/framework/db/mapper/sqlserver/*.xml");
+			} else if (dbUrl.contains("oracle")) {
+				// jdbc:oracle:thin:@127.0.0.1:1521:user_info
+				// jdbc:oracle:thin:@127.0.0.1:1521/user_info
+				// 代码是写好的，但还没有oracle的库让我测试过~
+				String[] urlParamArr = dbUrl.split("\\?")[0].split("@");
+				String[] urlDbNameArr = urlParamArr[0].split("/");
+				if (urlDbNameArr.length <= 1) {
+					urlDbNameArr = urlParamArr[0].split(":");
+				}
+				databaseFactoryBean.setDbName(urlDbNameArr[urlDbNameArr.length - 1]);
+				databaseFactoryBean.setDatabaseProduct(DatabaseFactoryBean.DatabaseProduct.ORACLE);
+				resources = resolver.getResources("classpath:com/zyplayer/doc/db/framework/db/mapper/oracle/*.xml");
 			}
 			connection.recycle();
 			if (resources == null) {

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java

@@ -13,7 +13,6 @@ public class DatabaseFactoryBean {
 	private DruidDataSource dataSource;
 	private SqlSessionTemplate sqlSessionTemplate;
 	private String url;
-	private String host;
 	private String dbName;
 	private String cnName;
 	private DatabaseProduct databaseProduct;
@@ -35,7 +34,7 @@ public class DatabaseFactoryBean {
 	}
 	
 	public static enum DatabaseProduct {
-		MYSQL, SQLSERVER
+		MYSQL, SQLSERVER, ORACLE
 	}
 
 	public DruidDataSource getDataSource() {
@@ -54,14 +53,6 @@ public class DatabaseFactoryBean {
 		this.url = url;
 	}
 
-	public String getHost() {
-		return host;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
 	public String getDbName() {
 		return dbName;
 	}

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlBaseMapper.xml

@@ -43,6 +43,8 @@
 	<select id="getDatabaseList" resultType="com.zyplayer.doc.db.framework.db.dto.DatabaseInfoDto">
 		select TABLE_SCHEMA dbName
 		from information_schema.tables
+		<!--排除系统库-->
+		where TABLE_SCHEMA != 'information_schema'
 		group by TABLE_SCHEMA
 	</select>
 

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper">
+
+	<resultMap id="TableColumnDescDtoMap" type="com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto" >
+		<result column="NAME" property="name" jdbcType="VARCHAR" />
+		<result column="ISIDENITY" property="isidenity" jdbcType="VARCHAR" />
+		<result column="TYPE" property="type" jdbcType="VARCHAR" />
+		<result column="NULLABLE" property="nullable" jdbcType="VARCHAR" />
+		<result column="LENGTH" property="length" jdbcType="VARCHAR" />
+		<result column="ISPRAMARY" property="ispramary" jdbcType="VARCHAR" />
+		<result column="DESCRIPTION" property="description" jdbcType="VARCHAR" />
+	</resultMap>
+
+	<resultMap id="QueryTableColumnDescDtoMap" type="com.zyplayer.doc.db.framework.db.dto.QueryTableColumnDescDto" >
+		<result column="TABLE_NAME" property="tableName" jdbcType="VARCHAR" />
+		<result column="COLUMN_NAME" property="columnName" jdbcType="VARCHAR" />
+		<result column="DESCRIPTION" property="description" jdbcType="VARCHAR" />
+	</resultMap>
+
+	<!--想用的话就来补充下方法体吧~-->
+
+	<select id="getDatabaseList" resultType="com.zyplayer.doc.db.framework.db.dto.DatabaseInfoDto">
+		SELECT 1
+	</select>
+
+	<select id="getTableStatus" resultType="com.zyplayer.doc.db.controller.vo.TableStatusVo">
+		select 1
+	</select>
+
+	<select id="getTableList" resultType="com.zyplayer.doc.db.framework.db.dto.TableInfoDto">
+		SELECT 1
+	</select>
+
+	<select id="getTableColumnList" resultMap="TableColumnDescDtoMap">
+		select 1
+	</select>
+
+	<select id="getTableColumnDescList" resultMap="TableColumnDescDtoMap">
+		select 1
+	</select>
+
+	<select id="getTableAndColumnBySearch" resultMap="QueryTableColumnDescDtoMap">
+		select 1
+	</select>
+
+	<select id="getTableDescList" resultType="com.zyplayer.doc.db.framework.db.dto.TableDescDto">
+		select 1
+	</select>
+
+	<insert id="updateTableDesc">
+		select 1
+	</insert>
+
+	<insert id="updateTableColumnDesc">
+		select 1
+	</insert>
+
+</mapper>
+

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleMapper.java

@@ -0,0 +1,11 @@
+package com.zyplayer.doc.db.framework.db.mapper.oracle;
+
+/**
+ * oracle数据库的mapper持有对象
+ *
+ * @author 暮光：城中城
+ * @since 2018年8月8日
+ */
+public interface OracleMapper {
+
+}

zyplayer-doc-db/src/main/resources/doc-db-manifest.js

@@ -1,2 +1,2 @@
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,u){for(var i,a,f,l=0,s=[];l<t.length;l++)a=t[l],o[a]&&s.push(o[a][0]),o[a]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=n(n.s=u[l]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var u=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+""+e+".js?"+{0:"ea7225220eb365539ffe",1:"0a0403eb1820498dc9bc"}[e];var a=setTimeout(r,12e4);return i.onerror=i.onload=r,u.appendChild(i),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=doc-db-manifest.js.map?468c61085fdba28ab9e4
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,u){for(var a,i,f,l=0,s=[];l<t.length;l++)i=t[l],o[i]&&s.push(o[i][0]),o[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(r&&r(t,c,u);s.length;)s.shift()();if(u)for(l=0;l<u.length;l++)f=n(n.s=u[l]);return f};var t={},o={2:0};n.e=function(e){function r(){a.onerror=a.onload=null,clearTimeout(i);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var u=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,n.nc&&a.setAttribute("nonce",n.nc),a.src=n.p+""+e+".js?"+{0:"5d425f5ff6468241aa32",1:"0a0403eb1820498dc9bc"}[e];var i=setTimeout(r,12e4);return a.onerror=a.onload=r,u.appendChild(a),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=doc-db-manifest.js.map?81df142ebcf20d4f7a22

zyplayer-doc-db/src/main/resources/doc-db.html

@@ -8,7 +8,7 @@
 
 <body>
 <div id="app"></div>
-<script type="text/javascript" src="doc-db-manifest.js?468c61085fdba28ab9e4"></script><script type="text/javascript" src="doc-db-vendor.js?0a0403eb1820498dc9bc"></script><script type="text/javascript" src="doc-db-index.js?ea7225220eb365539ffe"></script></body>
+<script type="text/javascript" src="doc-db-manifest.js?81df142ebcf20d4f7a22"></script><script type="text/javascript" src="doc-db-vendor.js?0a0403eb1820498dc9bc"></script><script type="text/javascript" src="doc-db-index.js?5d425f5ff6468241aa32"></script></body>
 
 </html>