Merge remote-tracking branch 'origin/develop' into develop

zouzg · Jun 17, 2017 · dc443a2 · dc443a2
2 parents 88f1696 + 52d8643
commit dc443a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.zzg</groupId>
     <artifactId>mybatis-generator-gui</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.3</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,7 +74,7 @@
                 <executions>
                     <execution>
                         <id>copy-files-on-build</id>
-                        <phase>package</phase>
+                        <phase>compile</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>

diff --git a/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java b/src/main/java/com/zzg/mybatis/generator/bridge/MybatisGeneratorBridge.java
@@ -136,13 +136,13 @@ public void generate() throws Exception {
 
         // limit/offset插件
         if (generatorConfig.isOffsetLimit()) {
-            PluginConfiguration pluginConfiguration = new PluginConfiguration();
             if (DbType.MySQL.name().equals(selectedDatabaseConfig.getDbType())
 		            || DbType.PostgreSQL.name().equals(selectedDatabaseConfig.getDbType())) {
+                PluginConfiguration pluginConfiguration = new PluginConfiguration();
                 pluginConfiguration.addProperty("type", "com.zzg.mybatis.generator.plugins.MySQLLimitPlugin");
                 pluginConfiguration.setConfigurationType("com.zzg.mybatis.generator.plugins.MySQLLimitPlugin");
+                context.addPluginConfiguration(pluginConfiguration);
             }
-            context.addPluginConfiguration(pluginConfiguration);
         }
         context.setTargetRuntime("MyBatis3");