diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9515c28..a95b05a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -24,6 +24,10 @@ + + + + @@ -626,7 +630,6 @@ @@ -786,13 +790,13 @@ - - + + - + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2b743f5..cd79f9b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,15 +1,15 @@ #environment: +eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ + server.port = 8097 -endpoints.env.enabled = false +spring.application.name = klaus +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.service-id = klaus-config-service +#spring.cloud.config.fail-fast=true #spring.cloud.config.username = SpringConfigUsername #spring.cloud.config.password = SpringConfigPassword #logging: spring.output.ansi.enabled = always logging.level.root=INFO logging.level.org.springframework.web=INFO -logging.level.com.release11=INFO -#operations -release11.mocked-service.controller.delete = false -release11.mocked-service.controller.getAll = false -release11.mocked-service.controller.get = true -release11.mocked-service.controller.set = true +logging.level.com.release11=INFO \ No newline at end of file diff --git a/src/main/resources/bootstrap-PROD.yml b/src/main/resources/bootstrap-PROD.yml index c9a2696..5ed8ee4 100644 --- a/src/main/resources/bootstrap-PROD.yml +++ b/src/main/resources/bootstrap-PROD.yml @@ -16,10 +16,3 @@ spring: server: port: 8097 -eureka: - client: - enabled: true - register-with-eureka: true - fetch-registry: true - serviceUrl: - defaultZone: http://netflix:eureka@eureka:8761/eureka diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties index 62447d2..eefc303 100644 --- a/src/main/resources/bootstrap.properties +++ b/src/main/resources/bootstrap.properties @@ -1,7 +1,6 @@ #environment: spring.cloud.config.discovery.service-id = klaus-config-service #spring.cloud.config.retry.initial-interval = 1500 -release11.mocked-service.controller.delete = true #spring.cloud.config.retry.multiplier = 1.5 #spring.cloud.config.retry.max-attempts = 10000 #spring.cloud.config.retry.max-intervals = 1000 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index dbaf14d..410497c 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -15,10 +15,3 @@ spring: server: port: 8097 -eureka: - client: - enabled: true - register-with-eureka: true - fetch-registry: true - serviceUrl: - defaultZone: http://netflix:eureka@eureka:8761/eureka