Task 62 : Update docker-compose.yml and Define eureka client for each service.

Rapter1990 · Rapter1990 · commit 61d67f7a67e3 · 2022-08-19T12:16:38.000+03:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/advertisement-service/src/main/java/com/springbootmicroservices/advertisement/AdvertisementApplication.java b/advertisement-service/src/main/java/com/springbootmicroservices/advertisement/AdvertisementApplication.java
@@ -4,6 +4,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
@@ -12,6 +13,7 @@
 import java.util.List;
 
 @SpringBootApplication
+@EnableEurekaClient
 public class AdvertisementApplication {
 
     public static void main(String[] args) {
diff --git a/configserver/src/main/resources/configurations/advertisement-service.properties b/configserver/src/main/resources/configurations/advertisement-service.properties
@@ -27,7 +27,8 @@ keycloak.public-client=true
 queue.name=queue-advertisement
 spring.rabbitmq.template.exchange=adv-exchange
 spring.rabbitmq.template.routing-key=adv-routing
-spring.rabbitmq.host=localhost
+#spring.rabbitmq.host=localhost
+spring.rabbitmq.host=rabbitmq
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=rabbitmq
 spring.rabbitmq.password=123456
diff --git a/configserver/src/main/resources/configurations/report-service.properties b/configserver/src/main/resources/configurations/report-service.properties
@@ -27,7 +27,8 @@ keycloak.public-client=true
 queue.name=queue-advertisement
 spring.rabbitmq.template.exchange=adv-exchange
 spring.rabbitmq.template.routing-key=adv-routing
-spring.rabbitmq.host=localhost
+#spring.rabbitmq.host=localhost
+spring.rabbitmq.host=rabbitmq
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=quest
 spring.rabbitmq.password=quest
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,9 +50,9 @@ services:
     build:
       context: ./configserver
       dockerfile: Dockerfile
-    environment:
-      CONFIGSERVER_URI: "http://configserver:9191"
-      CONFIGSERVER_PORT: "9191"
+    #environment:
+      #CONFIGSERVER_URI: "http://configserver:9191"
+      #CONFIGSERVER_PORT: "9191"
     ports:
       - "9191:9191"
     networks:
@@ -66,10 +66,11 @@ services:
       context: ./discoveryserver
       dockerfile: Dockerfile
     environment:
-      CONFIGSERVER_URI: "http://configserver:9191"
-      CONFIGSERVER_PORT: "9191"
+      #CONFIGSERVER_URI: "http://configserver:9191"
+      #CONFIGSERVER_PORT: "9191"
+      SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
       EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
-      EUREKASERVER_PORT: "8761"
+      #EUREKASERVER_PORT: "8761"
       WAIT_HOSTS: configserver:9191
     depends_on:
       configserver:
@@ -88,16 +89,25 @@ services:
     environment:
       PROFILE: "default"
       SERVER_PORT: "8600"
-      CONFIGSERVER_URI: "http://configserver:9191"
+      #CONFIGSERVER_URI: "http://configserver:9191"
+      SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
       EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
-      EUREKASERVER_PORT: "8761"
-      CONFIGSERVER_PORT: "9191"
+      #EUREKASERVER_PORT: "8761"
+      #CONFIGSERVER_PORT: "9191"
       WAIT_HOSTS: configserver:9191
     depends_on:
       configserver:
         condition: service_started
       eurekaserver:
         condition: service_started
+      userservice:
+        condition: service_started
+      managementservice:
+        condition: service_started
+      advertisementservice:
+        condition: service_started
+      reportservice:
+        condition: service_started
     networks:
       - backend
 
@@ -108,10 +118,11 @@ services:
       dockerfile: Dockerfile
     environment:
       SERVER_PORT: "9000"
-      CONFIGSERVER_URI: "http://configserver:9191"
-      CONFIGSERVER_PORT: "9191"
+      #CONFIGSERVER_URI: "http://configserver:9191"
+      #CONFIGSERVER_PORT: "9191"
+      SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
       EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
-      EUREKASERVER_PORT: "8761"
+      #EUREKASERVER_PORT: "8761"
       WAIT_HOSTS: configserver:9191
       DATABASE_HOST: database
       DATABASE_USER: springmicroserviceuser
@@ -126,6 +137,10 @@ services:
         condition: service_healthy
       configserver:
         condition: service_started
+      eurekaserver:
+        condition: service_started
+      keycloak:
+        condition: service_started
     ports:
       - "9000:9000"
     networks:
@@ -138,17 +153,16 @@ services:
       dockerfile: Dockerfile
     environment:
       SERVER_PORT: "9002"
-      CONFIGSERVER_URI: "http://configserver:9191"
-      CONFIGSERVER_PORT: "9191"
+      #CONFIGSERVER_URI: "http://configserver:9191"
+      #CONFIGSERVER_PORT: "9191"
+      SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
       EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
-      EUREKASERVER_PORT: "8761"
+      #EUREKASERVER_PORT: "8761"
       WAIT_HOSTS: configserver:9191
     depends_on:
       configserver:
         condition: service_started
-      advertisementservice:
-        condition: service_started
-      reportservice:
+      eurekaserver:
         condition: service_started
     ports:
       - "9002:9002"
@@ -180,6 +194,10 @@ services:
         condition: service_healthy
       configserver:
         condition: service_started
+      eurekaserver:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     ports:
       - "9001:9001"
     networks:
@@ -211,6 +229,10 @@ services:
         condition: service_healthy
       configserver:
         condition: service_started
+      eurekaserver:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     ports:
       - "9003:9003"
     networks:
diff --git a/management-service/src/main/java/com/springbootmicroservices/management/ManagementApplication.java b/management-service/src/main/java/com/springbootmicroservices/management/ManagementApplication.java
@@ -4,6 +4,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
@@ -12,6 +13,7 @@
 import java.util.List;
 
 @SpringBootApplication
+@EnableEurekaClient
 public class ManagementApplication {
 
     public static void main(String[] args) {
diff --git a/report-service/src/main/java/com/springbootmicroservices/report/ReportApplication.java b/report-service/src/main/java/com/springbootmicroservices/report/ReportApplication.java
@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @SpringBootApplication
+@EnableEurekaClient
 public class ReportApplication {
 
     public static void main(String[] args) {
diff --git a/user-service/src/main/java/com/springbootmicroservices/userservice/UserserviceApplication.java b/user-service/src/main/java/com/springbootmicroservices/userservice/UserserviceApplication.java
@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @SpringBootApplication
+@EnableEurekaClient
 public class UserserviceApplication {
 
     public static void main(String[] args) {
diff --git a/user-service/src/main/java/com/springbootmicroservices/userservice/config/KeycloakConfig.java b/user-service/src/main/java/com/springbootmicroservices/userservice/config/KeycloakConfig.java
@@ -10,7 +10,8 @@
 @Configuration
 public class KeycloakConfig {
 
-    public final static String serverUrl = "http://localhost:8181";
+    //public final static String serverUrl = "http://localhost:8181";
+    public final static String serverUrl = "http://keycloak:8181";
     public final static String realm = "master";
     public final static String clientId = "spring-boot-microservice-keycloak";
     public final static String clientSecret = "6UxIqgy19GidtJB1OgRwqU3Acp11tOlZ";
