From e36d14a89bbe6b5a91907557f8fef873b6940719 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Tue, 25 Jul 2023 19:21:36 +0800 Subject: [PATCH 1/3] doc: add Badge. --- docs/zh/base/active-record.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/base/active-record.md b/docs/zh/base/active-record.md index 6690a218..7ae33962 100644 --- a/docs/zh/base/active-record.md +++ b/docs/zh/base/active-record.md @@ -1,4 +1,4 @@ -# Active Record +# Active Record [Active Record 模式](http://www.martinfowler.com/eaaCatalog/activeRecord.html)出自 Martin Fowler 写的《[企业应用架构模式](https://book.douban.com/subject/4826290/)》书中。在 Active Record From 36df4633860484c9b0aced8a2e02d3a4191a737a Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Tue, 25 Jul 2023 21:16:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mybatisflex/codegen/template/impl/EnjoyTemplate.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/template/impl/EnjoyTemplate.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/template/impl/EnjoyTemplate.java index 56d58fa6..119be055 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/template/impl/EnjoyTemplate.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/template/impl/EnjoyTemplate.java @@ -45,11 +45,10 @@ public class EnjoyTemplate implements ITemplate { e.addSharedStaticMethod(StringUtil.class); e.setSourceFactory(new FileAndClassPathSourceFactory()); }); + // 以下配置将支持 user.girl 表达式去调用 user 对象的 boolean isGirl() 方法 + Engine.addFieldGetterToFirst(new FieldGetters.IsMethodFieldGetter()); } this.engine = engine; - - // 以下配置将支持 user.girl 表达式去调用 user 对象的 boolean isGirl() 方法 - Engine.addFieldGetterToFirst(new FieldGetters.IsMethodFieldGetter()); } @Override From 1515fdf191bf71f63a382d4dc790be87809b9a25 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Tue, 25 Jul 2023 21:17:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatisflex/codegen/test/GeneratorTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java b/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java index cf0155a5..15a5e8d8 100644 --- a/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java +++ b/mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java @@ -23,6 +23,7 @@ import com.mybatisflex.codegen.config.TableConfig; import com.mybatisflex.codegen.config.TableDefConfig; import com.mybatisflex.spring.service.impl.CacheableServiceImpl; import com.zaxxer.hikari.HikariDataSource; +import org.junit.Test; import java.util.function.UnaryOperator; @@ -149,7 +150,7 @@ public class GeneratorTest { generator.generate(); } - // @Test + @Test public void testCodeGen3() { //配置数据源 HikariDataSource dataSource = new HikariDataSource(); @@ -157,6 +158,13 @@ public class GeneratorTest { dataSource.setUsername("root"); dataSource.setPassword("12345678"); + //通过 datasource 和 globalConfig 创建代码生成器 + new Generator(dataSource, globalConfig()).generate(); + new Generator(dataSource, globalConfig()).generate(); + new Generator(dataSource, globalConfig()).generate(); + } + + private GlobalConfig globalConfig() { GlobalConfig globalConfig = new GlobalConfig(); //用户信息表，用于存放用户信息。 -> 用户信息 @@ -215,11 +223,7 @@ public class GeneratorTest { .setOverwriteEnable(true) .setMapperAnnotation(true); - //通过 datasource 和 globalConfig 创建代码生成器 - Generator generator = new Generator(dataSource, globalConfig); - - //开始生成代码 - generator.generate(); + return globalConfig; } }