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

Merge branch 'main' of https://gitee.com/qq925966998/mybatis-flex

Browse Source 
# Conflicts:
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperXmlGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
#	mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
This commit is contained in:
LeeNan 2023-10-10 14:27:30 +08:00
commit 2670654bd4
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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("javadocConfig", globalConfig.getJavadocConfig());
params.put("withSwagger", globalConfig.isEntityWithSwagger()); params.put("withSwagger", globalConfig.isEntityWithSwagger());
params.put("swaggerVersion", globalConfig.getSwaggerVersion()); params.put("swaggerVersion", globalConfig.getSwaggerVersion());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, controllerJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, controllerJavaFile);
System.out.println("Controller ---> " + 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("entityConfig", entityConfig);
params.put("packageConfig", packageConfig); params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig()); params.put("javadocConfig", globalConfig.getJavadocConfig());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, entityJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, entityJavaFile);
System.out.println("Entity ---> " + 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("mapperConfig", mapperConfig);
params.put("packageConfig", packageConfig); params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig()); params.put("javadocConfig", globalConfig.getJavadocConfig());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperJavaFile);
System.out.println("Mapper ---> " + 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); Map<String, Object> params = new HashMap<>(2);
params.put("table", table); params.put("table", table);
params.put("packageConfig", packageConfig); params.put("packageConfig", packageConfig);
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperXmlFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, mapperXmlFile);
System.out.println("MapperXML ---> " + 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("serviceConfig", serviceConfig);
params.put("packageConfig", packageConfig); params.put("packageConfig", packageConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig()); params.put("javadocConfig", globalConfig.getJavadocConfig());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceJavaFile);
System.out.println("Service ---> " + 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("packageConfig", packageConfig);
params.put("serviceImplConfig", serviceImplConfig); params.put("serviceImplConfig", serviceImplConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig()); params.put("javadocConfig", globalConfig.getJavadocConfig());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceImplJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, serviceImplJavaFile);
System.out.println("ServiceImpl ---> " + 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("packageConfig", packageConfig);
params.put("tableDefConfig", tableDefConfig); params.put("tableDefConfig", tableDefConfig);
params.put("javadocConfig", globalConfig.getJavadocConfig()); params.put("javadocConfig", globalConfig.getJavadocConfig());
params.putAll(globalConfig.getCustomConfig()); params.put("customConfig", globalConfig.getCustomConfig());
globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, tableDefJavaFile); globalConfig.getTemplateConfig().getTemplate().generate(params, templatePath, tableDefJavaFile);
System.out.println("TableDef ---> " + tableDefJavaFile); System.out.println("TableDef ---> " + tableDefJavaFile);