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 @@ 0.9.1 2.3.1 3.0.3 + + prod + + @@ -215,6 +219,24 @@ + + + + test + + test + -test + + + + prod + + prod + -prod + + + + public 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 @@ + + + + src/main/resources + true + + application*.yml + + + + src/main/resources + false + + application*.yml + + + org.springframework.boot @@ -89,7 +106,7 @@ - ${project.artifactId} + ${project.artifactId}${jar.suffix} \ 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