admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!359 代码生成器中没有将自定义配置customConfig添加至参数列表

Browse Source 
Merge pull request !359 from 李楠/main
This commit is contained in:
Michael Yang 2023-10-10 04:26:27 +00:00 committed by Gitee
commit c2742a9e68
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/GlobalConfig.java
View File

@ -233,6 +233,13 @@ public class GlobalConfig implements Serializable {
customConfig.put(key, value);
}
public Map<String, Object> getCustomConfig() {
return customConfig;
}
public void setCustomConfig(Map<String, Object> customConfig) {
this.customConfig = customConfig;
}
// === 分项配置 ===
/**

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
View File

@ -71,7 +71,7 @@ public class ControllerGenerator implements IGenerator {
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("withSwagger", globalConfig.isEntityWithSwagger());
params.put("swaggerVersion", globalConfig.getSwaggerVersion());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, controllerJavaFile);
System.out.println("Controller ---> " + controllerJavaFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
View File

@ -72,7 +72,7 @@ public class EntityGenerator implements IGenerator {
params.put("entityConfig", entityConfig);
params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, entityJavaFile);
System.out.println("Entity ---> " + entityJavaFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
View File

@ -69,7 +69,7 @@ public class MapperGenerator implements IGenerator {
params.put("mapperConfig", mapperConfig);
params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperJavaFile);
System.out.println("Mapper ---> " + mapperJavaFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperXmlGenerator.java
View File

@ -66,7 +66,7 @@ public class MapperXmlGenerator implements IGenerator {
Map<String, Object> params = new HashMap<>(2);
params.put("table", table);
params.put("packageConfig", packageConfig);
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperXmlFile);
System.out.println("MapperXML ---> " + mapperXmlFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
View File

@ -69,7 +69,7 @@ public class ServiceGenerator implements IGenerator {
params.put("serviceConfig", serviceConfig);
params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceJavaFile);
System.out.println("Service ---> " + serviceJavaFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
View File

@ -69,7 +69,7 @@ public class ServiceImplGenerator implements IGenerator {
params.put("packageConfig", packageConfig);
params.put("serviceImplConfig", serviceImplConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceImplJavaFile);
System.out.println("ServiceImpl ---> " + serviceImplJavaFile);

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
View File

@ -69,7 +69,7 @@ public class TableDefGenerator implements IGenerator {
params.put("packageConfig", packageConfig);
params.put("tableDefConfig", tableDefConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig());
params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, tableDefJavaFile);
System.out.println("TableDef ---> " + tableDefJavaFile);