From 1dc200a3cceb6864fbb956691e42fee95a0d0dd1 Mon Sep 17 00:00:00 2001
From: john <admin@john-pc.local>
Date: Wed, 14 Oct 2026 13:38:34 +0000
Subject: [PATCH] =?UTF-8?q?build:=20=E5=88=86=E7=8E=AF=E5=A2=83=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=20(Maven=20profile=20=E6=B3=A8=E5=85=A5=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=20profile,=20jar=20=E5=90=8D=E5=8A=A0=20-test/-prod?=
 =?UTF-8?q?=20=E5=90=8E=E7=BC=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ry-api/pom.xml 新增 test/prod profile, 提供 active.profile 与 jar.suffix
- ruoyi-admin 资源过滤仅针对 application*.yml, finalName 追加 jar.suffix
- application.yml 的 spring.profiles.active 改用 @active.profile@, 免运行时 --spring.profiles.active

Co-Authored-By: Claude Code <noreply@anthropic.com>
---
 ry-api/pom.xml                                | 22 +++++++++++++++++++
 ry-api/ruoyi-admin/pom.xml                    | 19 +++++++++++++++-
 .../src/main/resources/application.yml        |  4 ++--
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/ry-api/pom.xml b/ry-api/pom.xml
index 8dfdedc..a440761 100644
--- a/ry-api/pom.xml
+++ b/ry-api/pom.xml
@@ -31,6 +31,10 @@
         <jwt.version>0.9.1</jwt.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <springdoc.version>3.0.3</springdoc.version>
+        <!-- 打包注入的激活 profile: 默认 prod, -Ptest / -Pprod 覆盖 -->
+        <active.profile>prod</active.profile>
+        <!-- jar 名后缀: 默认空 (=ruoyi-admin.jar), -Ptest → -test, -Pprod → -prod -->
+        <jar.suffix></jar.suffix>
     </properties>
 
     <!-- 依赖声明 -->
@@ -215,6 +219,24 @@
         </plugins>
     </build>
 
+    <!-- 分环境打包: mvn package -Ptest / -Pprod 生成 ruoyi-admin-test.jar / ruoyi-admin-prod.jar (profile 已注入, 免 spring.profiles.active 启动参数) -->
+    <profiles>
+        <profile>
+            <id>test</id>
+            <properties>
+                <active.profile>test</active.profile>
+                <jar.suffix>-test</jar.suffix>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <active.profile>prod</active.profile>
+                <jar.suffix>-prod</jar.suffix>
+            </properties>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>public</id>
diff --git a/ry-api/ruoyi-admin/pom.xml b/ry-api/ruoyi-admin/pom.xml
index 42f8acb..1212453 100644
--- a/ry-api/ruoyi-admin/pom.xml
+++ b/ry-api/ruoyi-admin/pom.xml
@@ -63,6 +63,23 @@
     </dependencies>
 
     <build>
+        <!-- 仅过滤 application*.yml 注入 @active.profile@, 其余资源 (logback/mapper/i18n) 不过滤避免误替换 ${...} -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>application*.yml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>application*.yml</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -89,7 +106,7 @@
                 </configuration>   
            </plugin>   
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${project.artifactId}${jar.suffix}</finalName>
     </build>
 
 </project>
\ No newline at end of file
diff --git a/ry-api/ruoyi-admin/src/main/resources/application.yml b/ry-api/ruoyi-admin/src/main/resources/application.yml
index c49c42c..451afb3 100644
--- a/ry-api/ruoyi-admin/src/main/resources/application.yml
+++ b/ry-api/ruoyi-admin/src/main/resources/application.yml
@@ -6,8 +6,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    # 默认 prod 环境; 本地测试用 --spring.profiles.active=test (group 自动展开为 druid,test)
-    active: prod
+    # 默认 prod; Maven 打包时用 -Ptest/-Pprod 注入 @active.profile@ (见 pom.xml profiles), 免运行时 --spring.profiles.active
+    active: @active.profile@
     group:
       test: druid,test
       prod: druid,prod