From 9dba2d847ad549c1f05f224e11296b2ea1733873 Mon Sep 17 00:00:00 2001
From: gofocustop <wangjian_2016@aliyun.com>
Date: Thu, 23 Aug 2018 20:27:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90pojo?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E4=B8=AD=E4=B8=8D=E7=94=9F=E6=88=90=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B3=A8=E9=87=8A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 5 +++++
 .../zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bc1950f8..8010f161 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,11 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java b/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java
index c9d4ded1..f9572370 100644
--- a/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java
+++ b/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java
@@ -136,7 +136,6 @@ public void generate() throws Exception {
         }
 
         JDBCConnectionConfiguration jdbcConfig = new JDBCConnectionConfiguration();
-        // http://www.mybatis.org/generator/usage/mysql.html
         if (DbType.MySQL.name().equals(dbType) || DbType.MySQL_8.name().equals(dbType)) {
 	        jdbcConfig.addProperty("nullCatalogMeansCurrent", "true");
         }
@@ -144,6 +143,9 @@ public void generate() throws Exception {
         jdbcConfig.setConnectionURL(DbUtil.getConnectionUrlWithSchema(selectedDatabaseConfig));
         jdbcConfig.setUserId(selectedDatabaseConfig.getUsername());
         jdbcConfig.setPassword(selectedDatabaseConfig.getPassword());
+        if(DbType.Oracle.name().equals(dbType)){
+            jdbcConfig.getProperties().setProperty("remarksReporting", "true");
+        }
         // java model
         JavaModelGeneratorConfiguration modelConfig = new JavaModelGeneratorConfiguration();
         modelConfig.setTargetPackage(generatorConfig.getModelPackage());

From b21787b4fc270f0804fec204eaf273ae024f158c Mon Sep 17 00:00:00 2001
From: KingPanda888 <35550416+KingPanda888@users.noreply.github.com>
Date: Tue, 11 Sep 2018 15:21:40 +0800
Subject: [PATCH 2/2] Update README.md

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 81b5523f..16a7be2c 100644
--- a/README.md
+++ b/README.md
@@ -70,9 +70,6 @@ Eclipse or IntelliJ IDEA中启动, 找到```com.zzg.mybatis.generator.MainUI```
 
 ### 赞助
 本工具纯属个人业余时间开发与维护，如果你觉得软件对你有用，欢迎赞助，金额随意 :)
-
-<img src="https://user-images.githubusercontent.com/3505708/38162358-423d2d18-3512-11e8-9b52-c188bf37671d.png" width="200"> <img src="https://user-images.githubusercontent.com/3505708/38162365-56f8f55c-3512-11e8-8fd8-b8ae4f0ad3c8.png" width="200">
-
 - - -
 Licensed under the Apache 2.0 License