diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95d9e58..be38361 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,7 +23,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -263,6 +263,90 @@
1598862102028
+
+ 1601295490642
+
+
+
+ 1601295490642
+
+
+ 1601297400597
+
+
+
+ 1601297400597
+
+
+ 1601297733933
+
+
+
+ 1601297733934
+
+
+ 1601297895444
+
+
+
+ 1601297895444
+
+
+ 1601300366399
+
+
+
+ 1601300366399
+
+
+ 1601300573031
+
+
+
+ 1601300573031
+
+
+ 1601300898190
+
+
+
+ 1601300898190
+
+
+ 1601301048201
+
+
+
+ 1601301048201
+
+
+ 1601370283197
+
+
+
+ 1601370283199
+
+
+ 1601371391685
+
+
+
+ 1601371391685
+
+
+ 1601377932874
+
+
+
+ 1601377932874
+
+
+ 1601380234222
+
+
+
+ 1601380234222
+
1601380914561
@@ -515,98 +599,14 @@
1602675615735
-
- 1602678114572
+
+ 1603723957961
- 1602678114572
+ 1603723957962
-
- 1602747495997
-
-
-
- 1602747495998
-
-
- 1602747978224
-
-
-
- 1602747978224
-
-
- 1602755704406
-
-
-
- 1602755704407
-
-
- 1602757104849
-
-
-
- 1602757104849
-
-
- 1602760822329
-
-
-
- 1602760822330
-
-
- 1602761543559
-
-
-
- 1602761543559
-
-
- 1602762547538
-
-
-
- 1602762547538
-
-
- 1602762821493
-
-
-
- 1602762821493
-
-
- 1602765840114
-
-
-
- 1602765840114
-
-
- 1603105517154
-
-
-
- 1603105517155
-
-
- 1603105637745
-
-
-
- 1603105637745
-
-
- 1603189491156
-
-
-
- 1603189491157
-
-
+
@@ -626,6 +626,8 @@
+
+
@@ -648,10 +650,8 @@
-
-
-
-
+
+
@@ -662,6 +662,10 @@
+
+
+
+
@@ -679,60 +683,56 @@
+
+
+
+
-
-
-
-
-
+
-
+
-
-
+
+
-
+
-
-
+
-
-
+
+
-
+
-
-
+
-
-
+
+
-
+
-
-
+
-
-
+
+
-
+
-
-
+
@@ -780,14 +780,13 @@
-
+
-
+
-
-
+
@@ -798,11 +797,10 @@
-
+
-
-
+
@@ -819,11 +817,10 @@
-
-
+
+
-
\ No newline at end of file
diff --git a/Klaus.iml b/Klaus.iml
index 7269cf0..9d7024e 100644
--- a/Klaus.iml
+++ b/Klaus.iml
@@ -191,6 +191,5 @@
-
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 006fa00..8685cb8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
depends_on:
- redis
environment:
- EUREKA_INSTANCE_PREFER_IP_ADDRESS: 'true'
SPRING_PROFILES_ACTIVE: DEV
networks:
default:
diff --git a/pom.xml b/pom.xml
index 189466f..cf08277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,10 +110,6 @@
spring-cloud-starter-netflix-eureka-client
${eureka-client.version}
-
- org.springframework.retry
- spring-retry
-
diff --git a/src/main/java/com/release11/klaus/KlausApplication.java b/src/main/java/com/release11/klaus/KlausApplication.java
index d974ea5..827d7eb 100644
--- a/src/main/java/com/release11/klaus/KlausApplication.java
+++ b/src/main/java/com/release11/klaus/KlausApplication.java
@@ -2,9 +2,9 @@ package com.release11.klaus;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
-@EnableDiscoveryClient
@SpringBootApplication
public class KlausApplication {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ad4eae7..d321935 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,7 @@
#environment:
server.port = 8097
-
-spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-
+#spring.cloud.config.username = SpringConfigUsername
+#spring.cloud.config.password = SpringConfigPassword
#logging:
spring.output.ansi.enabled = always
logging.level.root=INFO
diff --git a/src/main/resources/data-access.properties b/src/main/resources/data-access.properties
index 27196b6..122952c 100644
--- a/src/main/resources/data-access.properties
+++ b/src/main/resources/data-access.properties
@@ -1,2 +1,2 @@
-redis.host = redis
+redis.host = localhost
redis.port = 6379
\ No newline at end of file
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 9c529e7..899a830 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -1,10 +1,12 @@
#environment:
-server.port = 8097
-
-spring.application.name = klaus
-spring.profiles.active = DEV
eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
-
+server.port = 8097
+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
diff --git a/target/classes/com/release11/klaus/KlausApplication.class b/target/classes/com/release11/klaus/KlausApplication.class
index e409548..3c7716c 100644
Binary files a/target/classes/com/release11/klaus/KlausApplication.class and b/target/classes/com/release11/klaus/KlausApplication.class differ
diff --git a/target/classes/data-access.properties b/target/classes/data-access.properties
index 27196b6..122952c 100644
--- a/target/classes/data-access.properties
+++ b/target/classes/data-access.properties
@@ -1,2 +1,2 @@
-redis.host = redis
+redis.host = localhost
redis.port = 6379
\ No newline at end of file
diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
index 5e7d511..e706c81 100644
--- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
+++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
- date = "2020-10-15T11:51:20+0200",
+ date = "2020-10-14T13:24:17+0200",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
)
@Component