diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d9df1dd..3f5cb30 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,11 +23,10 @@ + - - @@ -698,41 +697,41 @@ - + - + - + - + - + - + - + - + @@ -780,13 +779,13 @@ - - + + - + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b11c183..98a7cd4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,23 +4,6 @@ server.port = 8097 spring.application.name = klaus spring.profiles.active = DEV -spring.cloud.discovery.enabled=true -spring.cloud.config.discovery.enabled = true -spring.cloud.config.discovery.service-id = klaus-config-service -spring.cloud.config.fail-fast=true -spring.cloud.config.retry.initial-interval = 1500 -spring.cloud.config.retry.multiplier = 1.5 -spring.cloud.config.retry.max-attempts = 10000 -spring.cloud.config.retry.max-intervals = 1000 -#spring.cloud.config.username = SpringConfigUsername -#spring.cloud.config.password = SpringConfigPassword - -eureka.instance.preferIpAddress = true -eureka.instance.hostname = klaus -eureka.client.registerWithEureka = true -eureka.client.fetchRegistry = true -eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ - #logging: spring.output.ansi.enabled = always logging.level.root=INFO diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..7fd0258 --- /dev/null +++ b/src/main/resources/bootstrap.properties @@ -0,0 +1,18 @@ +#environment: +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.enabled = true +spring.cloud.config.discovery.service-id = klaus-config-service +spring.cloud.config.fail-fast=true +#spring.cloud.config.retry.initial-interval = 1500 +#spring.cloud.config.retry.multiplier = 1.5 +#spring.cloud.config.retry.max-attempts = 10000 +#spring.cloud.config.retry.max-intervals = 1000 +#spring.cloud.config.username = SpringConfigUsername +#spring.cloud.config.password = SpringConfigPassword + +eureka.instance.preferIpAddress = true +eureka.instance.hostname = klaus +eureka.client.registerWithEureka = true +eureka.client.fetchRegistry = true +eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ + diff --git a/target/classes/application.properties b/target/classes/application.properties index cace0d9..98a7cd4 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -4,24 +4,6 @@ server.port = 8097 spring.application.name = klaus spring.profiles.active = DEV -spring.cloud.discovery.enabled=true -spring.cloud.config.discovery.enabled = true -spring.cloud.config.discovery.service-id = klaus-config-service -spring.cloud.config.fail-fast=true -spring.cloud.config.retry.initial-interval = 1500 -spring.cloud.config.retry.multiplier = 1.5 -spring.cloud.config.retry.max-attempts = 10000 -spring.cloud.config.retry.max-intervals = 1000 -#spring.cloud.config.username = SpringConfigUsername -#spring.cloud.config.password = SpringConfigPassword - -eureka.instance.preferIpAddress = true -eureka.instance.hostname = klaus -eureka.client.registerWithEureka = true -eureka.client.fetchRegistry = true -eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ - - #logging: spring.output.ansi.enabled = always logging.level.root=INFO