From 9d5ce1f2889c1e8d29bde23c067a82fb5bc6e8f9 Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Mon, 25 Mar 2019 09:21:41 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20spring-boot-demo-codegen=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E6=B7=BB=E5=8A=A0jdbc=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/constants/GenConstants.java       |  5 ----
 .../xkcoding/codegen/entity/TableRequest.java |  4 +++
 .../com/xkcoding/codegen/utils/DbUtil.java    |  3 +--
 .../src/main/resources/static/index.html      | 26 ++++++++++++++++---
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java
index 8602bc2..52674c8 100644
--- a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java
+++ b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java
@@ -18,9 +18,4 @@ public interface GenConstants {
      * 签名
      */
     String SIGNATURE = "xkcoding";
-
-    /**
-     * JDBC连接串前缀
-     */
-    String JDBC_URL_PREFIX = "jdbc:mysql://";
 }
diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java
index 411faf9..7f086c2 100644
--- a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java
+++ b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java
@@ -25,6 +25,10 @@ public class TableRequest {
      * 每页条数
      */
     private Integer pageSize;
+    /**
+     * jdbc-前缀
+     */
+    private String prepend;
     /**
      * jdbc-url
      */
diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java
index db6fc96..2d6fb69 100644
--- a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java
+++ b/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java
@@ -1,6 +1,5 @@
 package com.xkcoding.codegen.utils;
 
-import com.xkcoding.codegen.constants.GenConstants;
 import com.xkcoding.codegen.entity.TableRequest;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.experimental.UtilityClass;
@@ -24,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 public class DbUtil {
     public HikariDataSource buildFromTableRequest(TableRequest request) {
         HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl(GenConstants.JDBC_URL_PREFIX + request.getUrl());
+        dataSource.setJdbcUrl(request.getPrepend() + request.getUrl());
         dataSource.setUsername(request.getUsername());
         dataSource.setPassword(request.getPassword());
         return dataSource;
diff --git a/spring-boot-demo-codegen/src/main/resources/static/index.html b/spring-boot-demo-codegen/src/main/resources/static/index.html
index acb87e1..263777a 100644
--- a/spring-boot-demo-codegen/src/main/resources/static/index.html
+++ b/spring-boot-demo-codegen/src/main/resources/static/index.html
@@ -47,10 +47,14 @@
                 <Row :gutter="16">
                     <i-form ref="formTableRequest" :model="tableRequest" label-position="right" label-width="50"
                             :rules="tableRequestValidate">
-                        <i-col span="7">
+                        <i-col span="9">
                             <form-item label="URL" prop="url" required>
-                                <i-input v-model="tableRequest.url" placeholder="格式为 <host>:<port>/<dbName>">
-                                    <span slot="prepend">jdbc:mysql://</span>
+                                <i-input v-model="tableRequest.url" :placeholder="urlHint">
+                                    <i-select v-model="tableRequest.prepend" slot="prepend" style="width: 150px;">
+                                        <i-option value="jdbc:mysql://">jdbc:mysql://</i-option>
+                                        <i-option value="jdbc:oracle:thin:@">jdbc:oracle:thin:@</i-option>
+                                        <i-option value="jdbc:sqlserver://">jdbc:sqlserver://</i-option>
+                                    </i-select>
                                 </i-input>
                             </form-item>
                         </i-col>
@@ -71,7 +75,7 @@
                             </form-item>
                         </i-col>
 
-                        <i-col span="4" style="text-align: center">
+                        <i-col span="2" style="text-align: center">
                             <i-button type="primary" long icon="ios-search" @click="search('formTableRequest')">查询
                             </i-button>
                         </i-col>
@@ -184,6 +188,7 @@
       tableRequest: {
         currentPage: 1,
         pageSize: 10,
+        prepend: "",
         url: "",
         username: "",
         password: "",
@@ -240,6 +245,19 @@
       ],
       data: []
     },
+    computed: {
+      urlHint() {
+        if (this.tableRequest.prepend === "jdbc:mysql://") {
+          return "mysql格式为 <host>:<port>/<dbName>";
+        } else if (this.tableRequest.prepend === "jdbc:oracle:thin:@") {
+          return "oracle格式为 <host>:<port>:<SID>";
+        } else if (this.tableRequest.prepend === "jdbc:sqlserver://") {
+          return "sqlserver格式为 <server_name>:<port>";
+        } else {
+          return "请选择 JDBC Url 前缀";
+        }
+      }
+    },
     methods: {
       showConfig(tableName) {
         this.genConfig.tableName = tableName;