diff --git a/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java index e96b6ee7..c062b7cd 100644 --- a/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/platform/generator/service/impl/GeneratorServiceImpl.java @@ -112,12 +112,8 @@ public class GeneratorServiceImpl implements GeneratorService { String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0])); genConfig.setEntityName(entityName); - String packageName = YouLaiApplication.class.getPackageName(); - genConfig.setPackageName(StrUtil.subBefore(packageName, ".", true)); - genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true)); - + genConfig.setPackageName(YouLaiApplication.class.getPackageName()); genConfig.setAuthor(generatorProperties.getDefaultConfig().getAuthor()); - } // 根据表的列 + 已经存在的字段生成配置 得到 组合后的字段生成配置 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9b5b7461..d159a823 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,4 +1,5 @@ - +server: + port: 8989 spring: jackson: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 9bc2c18a..ecdcd7ac 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,3 +1,6 @@ +server: + port: 8989 + spring: jackson: ## 默认序列化时间格式 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ba9b3904..913e9673 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,8 +1,4 @@ -server: - port: 8989 spring: - main: - allow-circular-references: true application: name: youlai-boot profiles: