Merge pull request enilu#8 from itas109/master

修复freemarker模板问题、增加默认参数、本地文件夹重复允许删除文件夹
windynet · Aug 23, 2019 · 578db8c · 578db8c
2 parents e269b50 + fd9bbcf
commit 578db8c
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,6 +31,7 @@
             <artifactId>postgresql</artifactId>
             <version>42.2.5</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.oracle/ojdbc14 -->
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc14</artifactId>

diff --git a/src/main/java/cn/enilu/tool/database/doc/generator/Main.java b/src/main/java/cn/enilu/tool/database/doc/generator/Main.java
@@ -35,20 +35,33 @@ public static void main(String[] args) {
             System.out.println("input database name:");
             dbName = sc.nextLine();
         }
-        System.out.println("input host:");
+        System.out.println("input host (default 127.0.0.1) :");
         String ip = sc.nextLine();
-        System.out.println("input port(default " + getDefaultPort(dbType) + "):");
+        if("".equals(ip))
+        {
+            ip = "127.0.0.1";
+        }
+
+        System.out.println("input port (default " + getDefaultPort(dbType) + ") :");
         String port = sc.nextLine();
         if("".equals(port))
         {
             port = getDefaultPort(dbType);
         }
 
-        System.out.println("input username:");
+        System.out.println("input username (default " + getDefaultUser(dbType) + ") :");
         String username = sc.nextLine();
+        if("".equals(username))
+        {
+            username = getDefaultUser(dbType);
+        }
 
-        System.out.println("input password:");
+        System.out.println("input password (default 123456) :");
         String passowrd = sc.nextLine();
+        if("".equals(passowrd))
+        {
+            passowrd = "123456";
+        }
 
         SimpleDataSource dataSource = new SimpleDataSource();
         if ("1".equals(dbType)) {
@@ -75,6 +88,9 @@ public static void main(String[] args) {
                 break;
             case "4":
                 generator = new SqlServer(dbName, dataSource);
+            default:
+                System.out.println("not support database");
+                break;
         }
 
         generator.generateDoc();
@@ -108,4 +124,33 @@ private static String getDefaultPort(String dbType) {
 
         return defaultPort;
     }
+
+    private static String getDefaultUser(String dbType) {
+        String defaultUser = "";
+
+        switch (dbType) {
+            case "1": {
+                defaultUser = "root";
+                break;
+            }
+            case "2": {
+                defaultUser = "not support";
+                break;
+            }
+            case "3": {
+                defaultUser = "postgres";
+                break;
+            }
+            case "4": {
+                defaultUser = "sa";
+                break;
+            }
+            default: {
+                defaultUser = "-";
+                break;
+            }
+        }
+
+        return defaultUser;
+    }
 }
diff --git a/src/main/java/cn/enilu/tool/database/doc/generator/database/Generator.java b/src/main/java/cn/enilu/tool/database/doc/generator/database/Generator.java
@@ -14,6 +14,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Scanner;
 
 /**
  * Generator
@@ -44,7 +45,20 @@ public Generator(String dbName, SimpleDataSource dataSource) {
     public void generateDoc() {
         File docDir = new File(docPath);
         if (docDir.exists()) {
-            throw new RuntimeException("该文件夹" + docPath + "已存在");
+
+            String str = "\n【温馨提示】 - 文件夹" + docPath + "已存在。 是否删除?(y 默认删除)\n";
+            //throw new RuntimeException(str);
+            System.out.print(str);
+
+            Scanner sc = new Scanner(System.in);
+            String dbType = sc.nextLine();
+            if ("y".equals(dbType) || "".equals(dbType)) {
+                docDir.delete();
+            }
+            else
+            {
+                return;
+            }
         } else {
             docDir.mkdirs();
         }
@@ -61,7 +75,6 @@ public void save2File(List<TableVo> tables) {
         for (TableVo tableVo : tables) {
             saveTableFile(tableVo);
         }
-
     }
 
     private void saveSummary(List<TableVo> tables) {

diff --git a/src/main/resources/database.html b/src/main/resources/database.html
@@ -24,15 +24,15 @@ <h2>表汇总</h2>
     <#list tables as item>
     <tr style="background-color: #e8edff;">
         <td>${item.table}</td>
-        <td>${item.comment}</td>
+        <td>${item.comment?default('')}</td>
     </tr>
     </#list>
     </tbody>
 </table>
 <h2>表明细</h2>
 <#list tables as item>
 <br>
-<h3>${item.comment}(${item.table})</h3>
+<h3>${item.comment?default('')}(${item.table})</h3>
 <table   width="100%">
     <thead style="background-color: #b9c9fe;font-weight: bold;">
     <tr>
@@ -48,9 +48,9 @@ <h3>${item.comment}(${item.table})</h3>
     <tr style="background-color: #e8edff;">
         <td>${column.name}</td>
         <td>${column.type}</td>
-        <td>${column.key}</td>
-        <td>${column.isNullable}</td>
-        <td>${column.comment}</td>
+        <td>${column.key?default('')}</td>
+        <td>${column.isNullable?default('')}</td>
+        <td>${column.comment?default('')}</td>
     </tr>
     </#list>
     </tbody>