From 38deb950ac7b2ed81f0e10816e943156aa076795 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 25 Oct 2023 22:00:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=B8=BA=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cnadmin/common/config/properties/ProjectProperties.java  | 5 +++++
 .../cnadmin/webapi/controller/tool/GeneratorController.java  | 5 +++--
 .../src/main/resources/config/application-prod.yml           | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

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 3f065842..8fcf710d 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 a4d77b7f..d9a204e1 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.validation.annotation.Validated;
 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 @@ import top.charles7c.cnadmin.tool.service.GeneratorService;
 public class GeneratorController {
 
     private final GeneratorService generatorService;
+    private final ProjectProperties projectProperties;
 
     @Operation(summary = "分页查询数据表", description = "分页查询数据表")
     @SaCheckPermission("tool:generator:list")
@@ -97,7 +98,7 @@ public class GeneratorController {
     @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 1763600f..ac9b4776 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: