From 1f2992757a3606191a5fafc48540ccf315b27746 Mon Sep 17 00:00:00 2001 From: lhzsdnu <2383376138@qq.com> Date: Fri, 14 Jul 2023 20:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E8=AF=8D=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh/core/column.md | 2 +- docs/zh/core/data-cache.md | 4 +- docs/zh/others/codegen.md | 16 ++--- .../codegen/config/ControllerConfig.java | 14 ++--- .../codegen/config/EntityConfig.java | 10 ++-- .../codegen/config/GlobalConfig.java | 60 +++++++++---------- .../codegen/config/MapperConfig.java | 14 ++--- .../codegen/config/ServiceConfig.java | 14 ++--- .../codegen/config/ServiceImplConfig.java | 16 ++--- .../com/mybatisflex/codegen/entity/Table.java | 8 +-- .../resources/templates/enjoy/controller.tpl | 4 +- .../codegen/test/GeneratorTest.java | 6 +- 12 files changed, 84 insertions(+), 84 deletions(-) diff --git a/docs/zh/core/column.md b/docs/zh/core/column.md index 52aeea59..a0d0dfbd 100644 --- a/docs/zh/core/column.md +++ b/docs/zh/core/column.md @@ -276,4 +276,4 @@ mybatis-flex 内置的扩展 typeHandler 还有： 在某些场景下，我们的 entity 可能会有通用的字段以及配置，这种场景如果我们要为每个 entity 去设置，这会相对麻烦。 在这种场景下，我们可以建立一个通用的 BaseEntity 类，然后让所有的 Entity 都继承是该类。 -Entity 一般是通过代码生成器生成的，我们通过 `GlobalConfig.entitySupperClass` 可以为代码生成器配置全局的 Entity 父类，更多关于代码生成器可以请访问 [这里](../others/codegen.md)。 \ No newline at end of file +Entity 一般是通过代码生成器生成的，我们通过 `GlobalConfig.entitySuperClass` 可以为代码生成器配置全局的 Entity 父类，更多关于代码生成器可以请访问 [这里](../others/codegen.md)。 \ No newline at end of file diff --git a/docs/zh/core/data-cache.md b/docs/zh/core/data-cache.md index c4d69fb2..43b127a1 100644 --- a/docs/zh/core/data-cache.md +++ b/docs/zh/core/data-cache.md @@ -179,11 +179,11 @@ public class AccountServiceImpl extends CacheableServiceImpl supperClass; + private Class superClass; /** * 是否覆盖之前生成的文件。 @@ -50,11 +50,11 @@ public class ControllerConfig { private boolean restStyle = true; public String buildSuperClassImport() { - return supperClass.getName(); + return superClass.getName(); } public String buildSuperClassName() { - return supperClass.getSimpleName(); + return superClass.getSimpleName(); } /** @@ -90,15 +90,15 @@ public class ControllerConfig { /** * 获取父类。 */ - public Class getSupperClass() { - return supperClass; + public Class getSuperClass() { + return superClass; } /** * 设置父类。 */ - public ControllerConfig setSupperClass(Class supperClass) { - this.supperClass = supperClass; + public ControllerConfig setSuperClass(Class superClass) { + this.superClass = superClass; return this; } diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/EntityConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/EntityConfig.java index 35ea08bb..b36aaf87 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/EntityConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/EntityConfig.java @@ -39,7 +39,7 @@ public class EntityConfig { /** * Entity 类的父类，可以自定义一些 BaseEntity 类。 */ - private Class supperClass; + private Class superClass; /** * 是否覆盖之前生成的文件。 @@ -94,15 +94,15 @@ public class EntityConfig { /** * 获取父类。 */ - public Class getSupperClass() { - return supperClass; + public Class getSuperClass() { + return superClass; } /** * 设置父类。 */ - public EntityConfig setSupperClass(Class supperClass) { - this.supperClass = supperClass; + public EntityConfig setSuperClass(Class superClass) { + this.superClass = superClass; return this; } diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/GlobalConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/GlobalConfig.java index b2d94b0d..42c2da0a 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/GlobalConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/GlobalConfig.java @@ -836,17 +836,17 @@ public class GlobalConfig { } /** - * @see EntityConfig#getSupperClass() + * @see EntityConfig#getSuperClass() */ - public Class getEntitySupperClass() { - return getEntityConfig().getSupperClass(); + public Class getEntitySuperClass() { + return getEntityConfig().getSuperClass(); } /** - * @see EntityConfig#setSupperClass(Class) + * @see EntityConfig#setSuperClass(Class) */ - public void setEntitySupperClass(Class entitySupperClass) { - getEntityConfig().setSupperClass(entitySupperClass); + public void setEntitySuperClass(Class entitySuperClass) { + getEntityConfig().setSuperClass(entitySuperClass); } /** @@ -946,17 +946,17 @@ public class GlobalConfig { } /** - * @see MapperConfig#getSupperClass() + * @see MapperConfig#getSuperClass() */ - public Class getMapperSupperClass() { - return getMapperConfig().getSupperClass(); + public Class getMapperSuperClass() { + return getMapperConfig().getSuperClass(); } /** - * @see MapperConfig#setSupperClass(Class) + * @see MapperConfig#setSuperClass(Class) */ - public void setMapperSupperClass(Class mapperSupperClass) { - getMapperConfig().setSupperClass(mapperSupperClass); + public void setMapperSuperClass(Class mapperSuperClass) { + getMapperConfig().setSuperClass(mapperSuperClass); } /** @@ -1028,17 +1028,17 @@ public class GlobalConfig { } /** - * @see ServiceConfig#getSupperClass() + * @see ServiceConfig#getSuperClass() */ - public Class getServiceSupperClass() { - return getServiceConfig().getSupperClass(); + public Class getServiceSuperClass() { + return getServiceConfig().getSuperClass(); } /** - * @see ServiceConfig#setSupperClass(Class) + * @see ServiceConfig#setSuperClass(Class) */ - public void setServiceSupperClass(Class serviceSupperClass) { - getServiceConfig().setSupperClass(serviceSupperClass); + public void setServiceSuperClass(Class serviceSuperClass) { + getServiceConfig().setSuperClass(serviceSuperClass); } public boolean isServiceImplGenerateEnable() { @@ -1096,17 +1096,17 @@ public class GlobalConfig { } /** - * @see ServiceImplConfig#getSupperClass() + * @see ServiceImplConfig#getSuperClass() */ - public Class getServiceImplSupperClass() { - return getServiceImplConfig().getSupperClass(); + public Class getServiceImplSuperClass() { + return getServiceImplConfig().getSuperClass(); } /** - * @see ServiceImplConfig#setSupperClass(Class) + * @see ServiceImplConfig#setSuperClass(Class) */ - public void setServiceImplSupperClass(Class serviceImplSupperClass) { - getServiceImplConfig().setSupperClass(serviceImplSupperClass); + public void setServiceImplSuperClass(Class serviceImplSuperClass) { + getServiceImplConfig().setSuperClass(serviceImplSuperClass); } /** @@ -1178,17 +1178,17 @@ public class GlobalConfig { } /** - * @see ControllerConfig#getSupperClass() + * @see ControllerConfig#getSuperClass() */ - public Class getControllerSupperClass() { - return getControllerConfig().getSupperClass(); + public Class getControllerSuperClass() { + return getControllerConfig().getSuperClass(); } /** - * @see ControllerConfig#setSupperClass(Class) + * @see ControllerConfig#setSuperClass(Class) */ - public void setControllerSupperClass(Class controllerSupperClass) { - getControllerConfig().setSupperClass(controllerSupperClass); + public void setControllerSuperClass(Class controllerSuperClass) { + getControllerConfig().setSuperClass(controllerSuperClass); } /** diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/MapperConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/MapperConfig.java index 41e55921..83e0bf9e 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/MapperConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/MapperConfig.java @@ -39,7 +39,7 @@ public class MapperConfig { /** * 自定义 Mapper 的父类。 */ - private Class supperClass = BaseMapper.class; + private Class superClass = BaseMapper.class; /** * 是否覆盖之前生成的文件。 @@ -52,11 +52,11 @@ public class MapperConfig { private boolean mapperAnnotation; public String buildSuperClassImport() { - return supperClass.getName(); + return superClass.getName(); } public String buildSuperClassName() { - return supperClass.getSimpleName(); + return superClass.getSimpleName(); } /** @@ -92,15 +92,15 @@ public class MapperConfig { /** * 获取父类。 */ - public Class getSupperClass() { - return supperClass; + public Class getSuperClass() { + return superClass; } /** * 设置父类。 */ - public MapperConfig setSupperClass(Class supperClass) { - this.supperClass = supperClass; + public MapperConfig setSuperClass(Class superClass) { + this.superClass = superClass; return this; } diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceConfig.java index 17be7dd3..912ac1c5 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceConfig.java @@ -40,7 +40,7 @@ public class ServiceConfig { /** * 自定义 Service 的父类。 */ - private Class supperClass = IService.class; + private Class superClass = IService.class; /** * 是否覆盖之前生成的文件。 @@ -48,11 +48,11 @@ public class ServiceConfig { private boolean overwriteEnable; public String buildSuperClassImport() { - return supperClass.getName(); + return superClass.getName(); } public String buildSuperClassName() { - return supperClass.getSimpleName(); + return superClass.getSimpleName(); } /** @@ -88,15 +88,15 @@ public class ServiceConfig { /** * 获取父类。 */ - public Class getSupperClass() { - return supperClass; + public Class getSuperClass() { + return superClass; } /** * 设置父类。 */ - public ServiceConfig setSupperClass(Class supperClass) { - this.supperClass = supperClass; + public ServiceConfig setSuperClass(Class superClass) { + this.superClass = superClass; return this; } diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceImplConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceImplConfig.java index 27d440b6..59c1858d 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceImplConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ServiceImplConfig.java @@ -40,7 +40,7 @@ public class ServiceImplConfig { /** * 自定义 ServiceImpl 的父类。 */ - private Class supperClass = ServiceImpl.class; + private Class superClass = ServiceImpl.class; /** * 是否覆盖之前生成的文件。 @@ -53,11 +53,11 @@ public class ServiceImplConfig { private boolean cacheExample; public String buildSuperClassImport() { - return supperClass.getName(); + return superClass.getName(); } public String buildSuperClassName() { - return supperClass.getSimpleName(); + return superClass.getSimpleName(); } /** @@ -93,15 +93,15 @@ public class ServiceImplConfig { /** * 获取父类。 */ - public Class getSupperClass() { - return supperClass; + public Class getSuperClass() { + return superClass; } /** * 设置父类。 */ - public ServiceImplConfig setSupperClass(Class supperClass) { - this.supperClass = supperClass; + public ServiceImplConfig setSuperClass(Class superClass) { + this.superClass = superClass; return this; } @@ -124,7 +124,7 @@ public class ServiceImplConfig { * 是否生成缓存例子。 */ public boolean isCacheExample() { - return CacheableServiceImpl.class.equals(supperClass) && cacheExample; + return CacheableServiceImpl.class.equals(superClass) && cacheExample; } /** diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java index 4ad6fbe1..53025538 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java @@ -173,8 +173,8 @@ public class Table { EntityConfig entityConfig = globalConfig.getEntityConfig(); - if (entityConfig.getSupperClass() != null) { - imports.add(entityConfig.getSupperClass().getName()); + if (entityConfig.getSuperClass() != null) { + imports.add(entityConfig.getSuperClass().getName()); } if (entityConfig.getImplInterfaces() != null) { @@ -257,8 +257,8 @@ public class Table { */ public String buildExtends() { EntityConfig entityConfig = globalConfig.getEntityConfig(); - if (entityConfig.getSupperClass() != null) { - return " extends " + entityConfig.getSupperClass().getSimpleName(); + if (entityConfig.getSuperClass() != null) { + return " extends " + entityConfig.getSuperClass().getSimpleName(); } else { return ""; } diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/controller.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/controller.tpl index 27d43b10..dd733b5b 100644 --- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/controller.tpl +++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/controller.tpl @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; #else import org.springframework.stereotype.Controller; #end -#if(controllerConfig.supperClass) +#if(controllerConfig.superClass) import #(controllerConfig.buildSuperClassImport()); #end @@ -39,7 +39,7 @@ import java.util.List; @Controller #end @RequestMapping("/#(firstCharToLowerCase(entityClassName))") -public class #(table.buildControllerClassName()) #if(controllerConfig.supperClass)extends #(controllerConfig.buildSuperClassName()) #end { +public class #(table.buildControllerClassName()) #if(controllerConfig.superClass)extends #(controllerConfig.buildSuperClassName()) #end { @Autowired private #(table.buildServiceClassName()) #(serviceVarName); 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 24081993..b39acdc2 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 @@ -61,7 +61,7 @@ public class GeneratorTest { //配置生成 entity globalConfig.setEntityGenerateEnable(true); globalConfig.setEntityWithLombok(true); - globalConfig.setEntitySupperClass(BaseEntity.class); + globalConfig.setEntitySuperClass(BaseEntity.class); //配置生成 mapper globalConfig.setMapperGenerateEnable(true); @@ -122,7 +122,7 @@ public class GeneratorTest { globalConfig.enableEntity() .setOverwriteEnable(true) .setWithLombok(true) - .setSupperClass(BaseEntity.class); + .setSuperClass(BaseEntity.class); //配置生成 mapper globalConfig.enableMapper(); @@ -130,7 +130,7 @@ public class GeneratorTest { globalConfig.enableService(); //配置生成 serviceImpl globalConfig.enableServiceImpl() - .setSupperClass(CacheableServiceImpl.class) + .setSuperClass(CacheableServiceImpl.class) .setCacheExample(true); //配置生成 controller globalConfig.enableController();