diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index ed1e4720..25820360 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -1,9 +1,6 @@ name: Deploy on: - push: - branches: - - fix/** workflow_run: workflows: ["CI (Java)"] types: [completed] diff --git a/apps/user-service/build.gradle b/apps/user-service/build.gradle index 3660ab02..cf0b538b 100644 --- a/apps/user-service/build.gradle +++ b/apps/user-service/build.gradle @@ -165,7 +165,7 @@ bootJar { exclude 'application-test-*.yml' exclude 'log4j2-test-*.yml' exclude 'application-develop.yml' - exclude 'log4j2-develop.yml' + exclude 'log4j2-*.yml' exclude 'sql/**' } diff --git a/apps/user-service/src/main/resources/application-production.yml b/apps/user-service/src/main/resources/application-production.yml index c53e00bb..9463232d 100644 --- a/apps/user-service/src/main/resources/application-production.yml +++ b/apps/user-service/src/main/resources/application-production.yml @@ -44,4 +44,4 @@ mybatis: map-underscore-to-camel-case: true logging: - config: classpath:log4j2-production.yml + config: file:config/log4j2-production.yml