From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 java110-generator/src/main/java/com/java110/code/TableToJson.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/java110-generator/src/main/java/com/java110/code/TableToJson.java b/java110-generator/src/main/java/com/java110/code/TableToJson.java
index f5dcebf..5e76bad 100644
--- a/java110-generator/src/main/java/com/java110/code/TableToJson.java
+++ b/java110-generator/src/main/java/com/java110/code/TableToJson.java
@@ -34,7 +34,7 @@
             ")";
 
     public static void main(String[] args) {
-
+        //涓氬姟鍚嶇О desc 涓氬姟缂栫爜鍚嶇О鐢熸垚鍚庣被鍚� name 涓婚敭 id  闇�瑕佹斁鍒伴偅涓湇鍔� shareName
         String newSql = createTableSql.substring(createTableSql.indexOf("(") + 1, createTableSql.lastIndexOf(")"));
         String tableName = createTableSql.substring(createTableSql.indexOf("TABLE") + 5, createTableSql.indexOf("("));
         tableName = tableName.replaceAll("`", "").trim();
@@ -73,6 +73,14 @@
             if (rowSql.toLowerCase().contains("not null")) {
                 required.put("code", StringUtil.lineToHump(key));
                 String comment = rowSql.contains("COMMENT") ? rowSql.substring(rowSql.indexOf("COMMENT '") + 9) : StringUtil.lineToHump(key);
+                comment = comment.trim();
+                if(comment.contains("锛�")){
+                    comment = comment.split("锛�")[0];
+                }
+                if(comment.contains(" ")){
+                    comment = comment.split(" ")[0];
+                }
+
                 required.put("msg", comment + "涓嶈兘涓虹┖");
                 requireds.add(required);
             }

--
Gitblit v1.8.0