diff --git a/docs/assets/images/ad/admin-banner.jpg b/docs/assets/images/ad/admin-banner.jpg index 7dd2cb06..49e717d6 100644 Binary files a/docs/assets/images/ad/admin-banner.jpg and b/docs/assets/images/ad/admin-banner.jpg differ diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ControllerConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ControllerConfig.java index 020c8fb7..c30b073e 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ControllerConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/ControllerConfig.java @@ -27,6 +27,10 @@ import java.io.Serializable; public class ControllerConfig implements Serializable { private static final long serialVersionUID = 8391630904705910611L; + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; /** * Controller 类的前缀。 */ @@ -60,6 +64,14 @@ public class ControllerConfig implements Serializable { return superClass.getSimpleName(); } + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + /** * 获取类前缀。 */ 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 85cac658..3da5760e 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 @@ -27,6 +27,11 @@ import java.io.Serializable; public class EntityConfig implements Serializable { private static final long serialVersionUID = -6790274333595436008L; + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; + /** * Entity 类的前缀。 */ @@ -82,6 +87,14 @@ public class EntityConfig implements Serializable { */ private int jdkVersion; + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + /** * 获取类前缀。 */ 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 064310e8..a52b6679 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 @@ -29,6 +29,11 @@ import java.io.Serializable; public class MapperConfig implements Serializable { private static final long serialVersionUID = 1937442008907641534L; + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; + /** * Mapper 类的前缀。 */ @@ -62,6 +67,14 @@ public class MapperConfig implements Serializable { return superClass.getSimpleName(); } + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + /** * 获取类前缀。 */ diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/PackageConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/PackageConfig.java index 69b8770b..9df0e852 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/PackageConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/PackageConfig.java @@ -44,7 +44,6 @@ public class PackageConfig implements Serializable { * Entity 所在包。 */ private String entityPackage; - /** * Mapper 所在包。 */ 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 d42a64cd..0193eac2 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 @@ -30,6 +30,11 @@ import java.io.Serializable; public class ServiceConfig implements Serializable { private static final long serialVersionUID = -2152473328300910220L; + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; + /** * Service 类的前缀。 */ @@ -58,6 +63,14 @@ public class ServiceConfig implements Serializable { return superClass.getSimpleName(); } + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + /** * 获取类前缀。 */ 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 5d705fee..52f22432 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 @@ -27,6 +27,12 @@ import java.io.Serializable; public class ServiceImplConfig implements Serializable { private static final long serialVersionUID = 17115432462168151L; + + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; + /** * ServiceImpl 类的前缀。 */ @@ -52,6 +58,14 @@ public class ServiceImplConfig implements Serializable { */ private boolean cacheExample; + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + public String buildSuperClassImport() { if (superClass == null) { return "com.mybatisflex.spring.service.impl.ServiceImpl"; diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/TableDefConfig.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/TableDefConfig.java index c2e9ed41..157e926c 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/TableDefConfig.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/TableDefConfig.java @@ -29,6 +29,10 @@ import java.io.Serializable; public class TableDefConfig implements Serializable { private static final long serialVersionUID = 8137903163796008036L; + /** + * 代码生成目录,当未配置时,使用 PackageConfig 的配置 + */ + private String sourceDir; /** * TableDef 类的前缀。 */ @@ -68,6 +72,14 @@ public class TableDefConfig implements Serializable { } } + public String getSourceDir() { + return sourceDir; + } + + public void setSourceDir(String sourceDir) { + this.sourceDir = sourceDir; + } + /** * 获取类前缀。 */ diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java index ec59a22d..adda7bb5 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.PackageConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class ControllerGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); ControllerConfig controllerConfig = globalConfig.getControllerConfig(); + String sourceDir = StringUtil.isNotBlank(controllerConfig.getSourceDir()) ? controllerConfig.getSourceDir() : packageConfig.getSourceDir(); + String controllerPackagePath = packageConfig.getControllerPackage().replace(".", "/"); - File controllerJavaFile = new File(packageConfig.getSourceDir(), controllerPackagePath + "/" + + File controllerJavaFile = new File(sourceDir, controllerPackagePath + "/" + table.buildControllerClassName() + ".java"); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java index e4b12817..9a165c91 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.PackageConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class EntityGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); EntityConfig entityConfig = globalConfig.getEntityConfig(); + String sourceDir = StringUtil.isNotBlank(entityConfig.getSourceDir()) ? entityConfig.getSourceDir() : packageConfig.getSourceDir(); + String entityPackagePath = packageConfig.getEntityPackage().replace(".", "/"); - File entityJavaFile = new File(packageConfig.getSourceDir(), entityPackagePath + "/" + + File entityJavaFile = new File(sourceDir, entityPackagePath + "/" + table.buildEntityClassName() + ".java"); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java index 12bd7d61..c775e00b 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.PackageConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class MapperGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); MapperConfig mapperConfig = globalConfig.getMapperConfig(); + String sourceDir = StringUtil.isNotBlank(mapperConfig.getSourceDir()) ? mapperConfig.getSourceDir() : packageConfig.getSourceDir(); + String mapperPackagePath = packageConfig.getMapperPackage().replace(".", "/"); - File mapperJavaFile = new File(packageConfig.getSourceDir(), mapperPackagePath + "/" + + File mapperJavaFile = new File(sourceDir, mapperPackagePath + "/" + table.buildMapperClassName() + ".java"); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java index 3a7ce530..c00ed5fa 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.ServiceConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class ServiceGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); ServiceConfig serviceConfig = globalConfig.getServiceConfig(); + String sourceDir = StringUtil.isNotBlank(serviceConfig.getSourceDir()) ? serviceConfig.getSourceDir() : packageConfig.getSourceDir(); + String servicePackagePath = packageConfig.getServicePackage().replace(".", "/"); - File serviceJavaFile = new File(packageConfig.getSourceDir(), servicePackagePath + "/" + + File serviceJavaFile = new File(sourceDir, servicePackagePath + "/" + table.buildServiceClassName() + ".java"); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java index 1d9a74a0..736d818b 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.ServiceImplConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class ServiceImplGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); ServiceImplConfig serviceImplConfig = globalConfig.getServiceImplConfig(); + String sourceDir = StringUtil.isNotBlank(serviceImplConfig.getSourceDir()) ? serviceImplConfig.getSourceDir() : packageConfig.getSourceDir(); + String serviceImplPackagePath = packageConfig.getServiceImplPackage().replace(".", "/"); - File serviceImplJavaFile = new File(packageConfig.getSourceDir(), serviceImplPackagePath + "/" + + File serviceImplJavaFile = new File(sourceDir, serviceImplPackagePath + "/" + table.buildServiceImplClassName() + ".java"); diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java index 214e34d1..ac298555 100644 --- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java +++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java @@ -21,6 +21,7 @@ import com.mybatisflex.codegen.config.TableDefConfig; import com.mybatisflex.codegen.constant.TemplateConst; import com.mybatisflex.codegen.entity.Table; import com.mybatisflex.codegen.generator.IGenerator; +import com.mybatisflex.core.util.StringUtil; import java.io.File; import java.util.HashMap; @@ -54,8 +55,10 @@ public class TableDefGenerator implements IGenerator { PackageConfig packageConfig = globalConfig.getPackageConfig(); TableDefConfig tableDefConfig = globalConfig.getTableDefConfig(); + String sourceDir = StringUtil.isNotBlank(tableDefConfig.getSourceDir()) ? tableDefConfig.getSourceDir() : packageConfig.getSourceDir(); + String tableDefPackagePath = packageConfig.getTableDefPackage().replace(".", "/"); - File tableDefJavaFile = new File(packageConfig.getSourceDir(), tableDefPackagePath + "/" + + File tableDefJavaFile = new File(sourceDir, tableDefPackagePath + "/" + table.buildTableDefClassName() + ".java"); diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml index 0ce252f9..c6ae79f0 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: # driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/flex_test username: root - password: 12345678 + password: 123456 # driver-class-name: # datasource: # driver-class-name: org.h2.Driver