diff --git a/servers/boe-server-basic/pom.xml b/servers/boe-server-basic/pom.xml index bfbeae18..28a9587e 100644 --- a/servers/boe-server-basic/pom.xml +++ b/servers/boe-server-basic/pom.xml @@ -98,7 +98,7 @@ true src/main/resources - application-${profileActive}.yml + application-*.yml application.yml diff --git a/servers/boe-server-basic/src/main/resources/application-prod.yml b/servers/boe-server-basic/src/main/resources/application-prod.yml index 58c210dc..34a58c13 100644 --- a/servers/boe-server-basic/src/main/resources/application-prod.yml +++ b/servers/boe-server-basic/src/main/resources/application-prod.yml @@ -1,9 +1,9 @@ # application-pro.yml spring: profiles: - active: pro + active: prod redis: - database: 3 + database: 1 host: 10.251.88.213 password: qwert!W588 port: 6379 diff --git a/servers/boe-server-basic/src/main/resources/application.yml b/servers/boe-server-basic/src/main/resources/application.yml index 4d04d8ae..16d67301 100644 --- a/servers/boe-server-basic/src/main/resources/application.yml +++ b/servers/boe-server-basic/src/main/resources/application.yml @@ -1,7 +1,7 @@ # application.yml spring: profiles: - active: @profileActive@ + active: dev application: name: boe-server-basic jackson: @@ -62,4 +62,4 @@ ok: # 设置logback.xml位置 logging: - config: classpath:log/logback-@profileActive@.xml \ No newline at end of file + config: classpath:log/logback-${spring.profiles.active}.xml \ No newline at end of file