修复PR #296编译问题

CodingOX · Nov 17, 2018 · 8d7fb0a · 8d7fb0a
1 parent 6d1ce6e
commit 8d7fb0a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/generator/README.md b/generator/README.md
@@ -42,6 +42,8 @@
             <property name="forceAnnotation" value="true"/>
             <property name="beginningDelimiter" value="`"/>
             <property name="endingDelimiter" value="`"/>
+            <!--配置是否启用lombok, 支持如下四种注解-->
+            <property name="lombok" value="Getter,Setter,ToString,Accessors"/>
         </plugin>
 
         <!--通用代码生成器插件-->

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -37,6 +37,7 @@
     <description>Mybatis 通用 Mapper 代码生成器</description>
 
     <properties>
+        <mapper-module.version>1.0.5</mapper-module.version>
         <freemarker.version>2.3.23</freemarker.version>
         <generator.version>1.3.6</generator.version>
     </properties>
@@ -54,11 +55,28 @@
             <version>${generator.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.20</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>sqltool</artifactId>
             <version>2.3.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-base</artifactId>
+            <version>${mapper-module.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/generator/src/main/java/tk/mybatis/mapper/generator/MapperPlugin.java b/generator/src/main/java/tk/mybatis/mapper/generator/MapperPlugin.java
@@ -24,9 +24,12 @@
 
 package tk.mybatis.mapper.generator;
 
+import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.Plugin;
 import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
 import org.mybatis.generator.api.dom.java.Interface;
+import org.mybatis.generator.api.dom.java.Method;
 import org.mybatis.generator.api.dom.java.TopLevelClass;
 import org.mybatis.generator.config.CommentGeneratorConfiguration;
 import org.mybatis.generator.config.Context;

diff --git a/generator/src/test/resources/generatorConfig.xml b/generator/src/test/resources/generatorConfig.xml
@@ -31,7 +31,7 @@
 <generatorConfiguration>
     <context id="Mysql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
         <property name="javaFileEncoding" value="UTF-8"/>
-        <property name="useMapperCommentGenerator" value="false"/>
+        <property name="useMapperCommentGenerator" value="true"/>
 
         <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
             <property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>