From 9adcecb04facad9e35caca6afeea4e47ec7dfdb9 Mon Sep 17 00:00:00 2001 From: "woo-jin.shin" Date: Mon, 22 Nov 2021 02:18:25 +0900 Subject: [PATCH] [NO-ISSUE] Fix application properties --- processor/src/main/resources/application.yml | 6 +++--- .../src/main/resources/development/webclient.yml | 5 ----- processor/src/main/resources/local/webclient.yml | 5 ----- .../src/main/resources/production/webclient.yml | 5 ----- receiver/build.gradle | 1 + receiver/src/main/resources/application.yml | 12 +++++++++++- .../src/main/resources/development/webclient.yml | 5 ----- receiver/src/main/resources/local/webclient.yml | 5 ----- receiver/src/main/resources/production/webclient.yml | 5 ----- sender/src/main/resources/application.yml | 6 +++--- 10 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 processor/src/main/resources/development/webclient.yml delete mode 100644 processor/src/main/resources/local/webclient.yml delete mode 100644 processor/src/main/resources/production/webclient.yml delete mode 100644 receiver/src/main/resources/development/webclient.yml delete mode 100644 receiver/src/main/resources/local/webclient.yml delete mode 100644 receiver/src/main/resources/production/webclient.yml diff --git a/processor/src/main/resources/application.yml b/processor/src/main/resources/application.yml index d136cf7..c361985 100644 --- a/processor/src/main/resources/application.yml +++ b/processor/src/main/resources/application.yml @@ -6,9 +6,9 @@ spring: profiles: active: ${SPRING_ACTIVE_PROFILE:local} group: - local: "local,datasource-local" - development: "development,datasource-development" - production: "production, datasource-production" + local: "local,datasource-local,webclient-local" + development: "development,datasource-development,webclient-development" + production: "production, datasource-production,webclient-production" freemarker: enabled: false diff --git a/processor/src/main/resources/development/webclient.yml b/processor/src/main/resources/development/webclient.yml deleted file mode 100644 index 06ec4a9..0000000 --- a/processor/src/main/resources/development/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-sender-api - base-url: http://localhost:20082 \ No newline at end of file diff --git a/processor/src/main/resources/local/webclient.yml b/processor/src/main/resources/local/webclient.yml deleted file mode 100644 index 06ec4a9..0000000 --- a/processor/src/main/resources/local/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-sender-api - base-url: http://localhost:20082 \ No newline at end of file diff --git a/processor/src/main/resources/production/webclient.yml b/processor/src/main/resources/production/webclient.yml deleted file mode 100644 index 92f1b9f..0000000 --- a/processor/src/main/resources/production/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-sender-api - base-url: http://ppn_sender:20080 \ No newline at end of file diff --git a/receiver/build.gradle b/receiver/build.gradle index f7771b1..d256b7c 100644 --- a/receiver/build.gradle +++ b/receiver/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-configuration-processor' implementation 'org.springframework.cloud:spring-cloud-starter-config' + implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.telegram:telegrambots:5.3.0' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' diff --git a/receiver/src/main/resources/application.yml b/receiver/src/main/resources/application.yml index a89a769..f448c67 100644 --- a/receiver/src/main/resources/application.yml +++ b/receiver/src/main/resources/application.yml @@ -5,6 +5,10 @@ spring: allow-bean-definition-overriding: true profiles: active: ${SPRING_ACTIVE_PROFILE:local} + group: + local: "local,webclient-local" + development: "development,webclient-development" + production: "production,webclient-production" freemarker: enabled: false @@ -12,4 +16,10 @@ server: port: 20080 error: whitelabel: - enabled: false \ No newline at end of file + enabled: false + +management: + endpoints: + web: + exposure: + include: refresh diff --git a/receiver/src/main/resources/development/webclient.yml b/receiver/src/main/resources/development/webclient.yml deleted file mode 100644 index 9fbfe3a..0000000 --- a/receiver/src/main/resources/development/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-processor-api - base-url: http://localhost:20081 \ No newline at end of file diff --git a/receiver/src/main/resources/local/webclient.yml b/receiver/src/main/resources/local/webclient.yml deleted file mode 100644 index 9fbfe3a..0000000 --- a/receiver/src/main/resources/local/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-processor-api - base-url: http://localhost:20081 \ No newline at end of file diff --git a/receiver/src/main/resources/production/webclient.yml b/receiver/src/main/resources/production/webclient.yml deleted file mode 100644 index aa3fb1b..0000000 --- a/receiver/src/main/resources/production/webclient.yml +++ /dev/null @@ -1,5 +0,0 @@ -webclient: - init: true - units: - - unit-name: ppn-processor-api - base-url: http://ppn_processor:20080 diff --git a/sender/src/main/resources/application.yml b/sender/src/main/resources/application.yml index 4903239..3a184fe 100644 --- a/sender/src/main/resources/application.yml +++ b/sender/src/main/resources/application.yml @@ -6,9 +6,9 @@ spring: profiles: active: ${SPRING_ACTIVE_PROFILE:local} group: - local: local, slackapi-local - development: development, slackapi-development - production: production, slackapi-production + local: "local,slackapi-local,webclient-local" + development: "development,slackapi-development,webclient-development" + production: "production,slackapi-production,webclient-production" freemarker: enabled: false