diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 6196be095..4ce3d5a40 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -52,7 +52,7 @@ src/main/resources - application.yaml + application.properties keycloak.json false diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackendApiSettings.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackendApiSettings.java index 849324c56..64f8926e9 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackendApiSettings.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackendApiSettings.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; @Component -@PropertySource("file:${spring.config.location}/application.yaml") +@PropertySource("file:${spring.config.location}/application.properties") @ConfigurationProperties("backend-api") public class BackendApiSettings { public String getExampleSetting() { diff --git a/clearing-parent/backend-api/src/main/resources/application.yaml b/clearing-parent/backend-api/src/main/resources/application.properties similarity index 86% rename from clearing-parent/backend-api/src/main/resources/application.yaml rename to clearing-parent/backend-api/src/main/resources/application.properties index 350402939..b297aa7f8 100644 --- a/clearing-parent/backend-api/src/main/resources/application.yaml +++ b/clearing-parent/backend-api/src/main/resources/application.properties @@ -1,13 +1,8 @@ -server: - port: 8080 - servlet: - context-path: /backend-api -spring: - main: - web-application-type: servlet +server.port=8080 +server.servlet.context-path=/backend-api +spring.main.web-application-type=servlet -backend-api: - example-setting: test +backend-api.example-setting=test ##keycloak diff --git a/clearing-parent/dbf-exporter/src/main/resources/application.properties b/clearing-parent/dbf-exporter/src/main/resources/application.properties index de1e33507..600848cda 100644 --- a/clearing-parent/dbf-exporter/src/main/resources/application.properties +++ b/clearing-parent/dbf-exporter/src/main/resources/application.properties @@ -1,3 +1,7 @@ +server.port=8080 +server.servlet.context-path=/exporter +spring.main.web-application-type=servlet + db.jdbc-url=jdbc:postgresql://10.200.200.133:5432/postgres db.driver=org.postgresql.Driver db.login=clearing diff --git a/clearing-parent/dbf-importer/src/main/resources/application.properties b/clearing-parent/dbf-importer/src/main/resources/application.properties index dd9c2002a..926bc6ebc 100644 --- a/clearing-parent/dbf-importer/src/main/resources/application.properties +++ b/clearing-parent/dbf-importer/src/main/resources/application.properties @@ -1,3 +1,7 @@ +server.port=8080 +server.servlet.context-path=/importer +spring.main.web-application-type=servlet + db.jdbc-url=jdbc:postgresql://10.200.200.133:5432/postgres db.driver=org.postgresql.Driver db.login=clearing diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 5e1924958..87d3bd5ea 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -96,8 +96,8 @@ ${folder.clearing.distr.modules}/backend-api/backend-api.jar - ${folder_root_clearing_backend-api}/src/main/resources/application.yaml - ${folder.clearing.distr.modules}/backend-api/application.yaml + ${folder_root_clearing_backend-api}/src/main/resources/application.properties + ${folder.clearing.distr.modules}/backend-api/application.properties ${folder_root_clearing_backend-api}/src/main/resources/keycloak.json diff --git a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile index 03c75cfc2..79244b128 100644 --- a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stable-20220125-jdk17 ADD backend-api.jar /opt/clearing/bin/backend-api.jar -ADD application.yaml /opt/clearing/bin/application.yaml +ADD application.properties /opt/clearing/bin/application.properties ADD keycloak.json /opt/clearing/bin/keycloak.json USER root ENTRYPOINT java -jar /opt/clearing/bin/backend-api.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file