From f7f7557d4dda5d0ad3c46e4c5f5791b278cc3bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 1 Dec 2020 11:44:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20maven=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + pom.xml | 28 +++++++++++++++++++ ...lication-prop.yml => application-prod.yml} | 0 .../src/main/resources/application.yml | 4 +-- 4 files changed, 31 insertions(+), 2 deletions(-) rename ruoyi-admin/src/main/resources/{application-prop.yml => application-prod.yml} (100%) diff --git a/README.md b/README.md index 42a6a04b..8e3ee8e7 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ * Bean简化 使用 Lombok 简化 get set toString 等等 * 容器改动 Tomcat 改为 并发性能更好的 undertow * 代码生成模板 改为适配 Mybatis-Plus 的代码 +* 项目修改为 maven多环境配置 * 重磅更新 升级MybatisPlus 3.4.1 重写配置文件详细注释 更新所有插件 * 同步升级 3.2.1 修复重大bug 阻止任意文件下载漏洞 diff --git a/pom.xml b/pom.xml index 5c0870db..db9ebfb9 100644 --- a/pom.xml +++ b/pom.xml @@ -249,6 +249,12 @@ + + + src/main/resources + true + + @@ -276,4 +282,26 @@ + + + dev + + + dev + debug + + + + true + + + + prod + + prod + warn + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-prop.yml b/ruoyi-admin/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-prop.yml rename to ruoyi-admin/src/main/resources/application-prod.yml diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 394380bc..5a786661 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -38,7 +38,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.ruoyi: @logging.level@ org.springframework: warn # Spring配置 @@ -48,7 +48,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: @profiles.active@ # 文件上传 servlet: multipart: