From 52e5be9442bd799e72b62e5e97b45bf05545be89 Mon Sep 17 00:00:00 2001 From: PIG AI Date: Sun, 15 Jun 2025 12:10:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(codegen):=20=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E6=94=AF=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改PREFIX为pigx.codegen以增强配置项命名空间隔离性 - 新增branch字段用于指定代码生成模板仓库的分支 - 更新GenTemplateServiceImpl中模板文件获取逻辑以支持多分支 - 默认分支设置为master保持向后兼容性 --- .../pigx/codegen/config/PigxCodeGenDefaultProperties.java | 7 ++++++- .../pigx/codegen/service/impl/GenTemplateServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java index 6d9dfe928..698b97449 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/PigxCodeGenDefaultProperties.java @@ -18,13 +18,18 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = PigxCodeGenDefaultProperties.PREFIX) public class PigxCodeGenDefaultProperties implements InitializingBean { - public static final String PREFIX = "codegen"; + public static final String PREFIX = "pigx.codegen"; /** * 是否开启在线更新 */ private boolean autoCheckVersion = true; + /** + * 分支名称,默认为master + */ + private String branch = "master"; + /** * 模板项目地址 */ diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTemplateServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTemplateServiceImpl.java index ffd5b1408..62efc8680 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTemplateServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTemplateServiceImpl.java @@ -188,7 +188,7 @@ public class GenTemplateServiceImpl extends ServiceImpl