diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java index 3f0658427..8fcf710da 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java @@ -81,6 +81,11 @@ public class ProjectProperties { @NestedConfigurationProperty private License license; + /** + * 是否为生产环境 + */ + private boolean production = false; + /** * 是否本地解析 IP 归属地 */ diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/tool/GeneratorController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/tool/GeneratorController.java index a4d77b7f7..d9a204e11 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/tool/GeneratorController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/tool/GeneratorController.java @@ -30,8 +30,8 @@ import org.springframework.web.bind.annotation.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.extra.spring.SpringUtil; +import top.charles7c.cnadmin.common.config.properties.ProjectProperties; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.vo.PageDataVO; import top.charles7c.cnadmin.common.model.vo.R; @@ -57,6 +57,7 @@ public class GeneratorController { private final GeneratorService generatorService; + private final ProjectProperties projectProperties; @Operation(summary = "分页查询数据表", description = "分页查询数据表") @SaCheckPermission("tool:generator:list") @@ -97,7 +98,7 @@ public R saveConfig(@Validated @RequestBody GenConfigRequest request, @PathVaria @SaCheckPermission("tool:generator:list") @PostMapping("/{tableName}") public R generate(@PathVariable String tableName) { - ValidationUtils.throwIf("prod".equals(SpringUtil.getActiveProfile()), "仅支持在开发环境生成代码"); + ValidationUtils.throwIf(projectProperties.isProduction(), "仅支持在开发环境生成代码"); generatorService.generate(tableName); return R.ok("生成成功,请查看生成代码是否正确"); } diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml index 1763600fc..ac9b47765 100644 --- a/continew-admin-webapi/src/main/resources/config/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml @@ -2,6 +2,8 @@ project: # URL url: https://cnadmin.charles7c.top + # 是否为生产环境 + production: true --- ### 服务器配置 server: