Skip to content

Commit 61d67f7

Browse files
Rapter1990Rapter1990
committed
Task 62 : Update docker-compose.yml and Define eureka client for each service.
1 parent ec78734 commit 61d67f7

File tree

9 files changed

+56
-23
lines changed

9 files changed

+56
-23
lines changed

‎.idea/compiler.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎advertisement-service/src/main/java/com/springbootmicroservices/advertisement/AdvertisementApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
7+
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.http.client.ClientHttpRequestInterceptor;
910
import org.springframework.web.client.RestTemplate;
@@ -12,6 +13,7 @@
1213
import java.util.List;
1314

1415
@SpringBootApplication
16+
@EnableEurekaClient
1517
public class AdvertisementApplication {
1618

1719
public static void main(String[] args) {

‎configserver/src/main/resources/configurations/advertisement-service.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ keycloak.public-client=true
2727
queue.name=queue-advertisement
2828
spring.rabbitmq.template.exchange=adv-exchange
2929
spring.rabbitmq.template.routing-key=adv-routing
30-
spring.rabbitmq.host=localhost
30+
#spring.rabbitmq.host=localhost
31+
spring.rabbitmq.host=rabbitmq
3132
spring.rabbitmq.port=5672
3233
spring.rabbitmq.username=rabbitmq
3334
spring.rabbitmq.password=123456

‎configserver/src/main/resources/configurations/report-service.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ keycloak.public-client=true
2727
queue.name=queue-advertisement
2828
spring.rabbitmq.template.exchange=adv-exchange
2929
spring.rabbitmq.template.routing-key=adv-routing
30-
spring.rabbitmq.host=localhost
30+
#spring.rabbitmq.host=localhost
31+
spring.rabbitmq.host=rabbitmq
3132
spring.rabbitmq.port=5672
3233
spring.rabbitmq.username=quest
3334
spring.rabbitmq.password=quest

‎docker-compose.yml

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ services:
5050
build:
5151
context: ./configserver
5252
dockerfile: Dockerfile
53-
environment:
54-
CONFIGSERVER_URI: "http://configserver:9191"
55-
CONFIGSERVER_PORT: "9191"
53+
#environment:
54+
#CONFIGSERVER_URI: "http://configserver:9191"
55+
#CONFIGSERVER_PORT: "9191"
5656
ports:
5757
- "9191:9191"
5858
networks:
@@ -66,10 +66,11 @@ services:
6666
context: ./discoveryserver
6767
dockerfile: Dockerfile
6868
environment:
69-
CONFIGSERVER_URI: "http://configserver:9191"
70-
CONFIGSERVER_PORT: "9191"
69+
#CONFIGSERVER_URI: "http://configserver:9191"
70+
#CONFIGSERVER_PORT: "9191"
71+
SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
7172
EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
72-
EUREKASERVER_PORT: "8761"
73+
#EUREKASERVER_PORT: "8761"
7374
WAIT_HOSTS: configserver:9191
7475
depends_on:
7576
configserver:
@@ -88,16 +89,25 @@ services:
8889
environment:
8990
PROFILE: "default"
9091
SERVER_PORT: "8600"
91-
CONFIGSERVER_URI: "http://configserver:9191"
92+
#CONFIGSERVER_URI: "http://configserver:9191"
93+
SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
9294
EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
93-
EUREKASERVER_PORT: "8761"
94-
CONFIGSERVER_PORT: "9191"
95+
#EUREKASERVER_PORT: "8761"
96+
#CONFIGSERVER_PORT: "9191"
9597
WAIT_HOSTS: configserver:9191
9698
depends_on:
9799
configserver:
98100
condition: service_started
99101
eurekaserver:
100102
condition: service_started
103+
userservice:
104+
condition: service_started
105+
managementservice:
106+
condition: service_started
107+
advertisementservice:
108+
condition: service_started
109+
reportservice:
110+
condition: service_started
101111
networks:
102112
- backend
103113

@@ -108,10 +118,11 @@ services:
108118
dockerfile: Dockerfile
109119
environment:
110120
SERVER_PORT: "9000"
111-
CONFIGSERVER_URI: "http://configserver:9191"
112-
CONFIGSERVER_PORT: "9191"
121+
#CONFIGSERVER_URI: "http://configserver:9191"
122+
#CONFIGSERVER_PORT: "9191"
123+
SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
113124
EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
114-
EUREKASERVER_PORT: "8761"
125+
#EUREKASERVER_PORT: "8761"
115126
WAIT_HOSTS: configserver:9191
116127
DATABASE_HOST: database
117128
DATABASE_USER: springmicroserviceuser
@@ -126,6 +137,10 @@ services:
126137
condition: service_healthy
127138
configserver:
128139
condition: service_started
140+
eurekaserver:
141+
condition: service_started
142+
keycloak:
143+
condition: service_started
129144
ports:
130145
- "9000:9000"
131146
networks:
@@ -138,17 +153,16 @@ services:
138153
dockerfile: Dockerfile
139154
environment:
140155
SERVER_PORT: "9002"
141-
CONFIGSERVER_URI: "http://configserver:9191"
142-
CONFIGSERVER_PORT: "9191"
156+
#CONFIGSERVER_URI: "http://configserver:9191"
157+
#CONFIGSERVER_PORT: "9191"
158+
SPRING_CLOUD_CONFIG_URI: "http://configserver:9191"
143159
EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: "http://eurekaserver:8761/eureka/"
144-
EUREKASERVER_PORT: "8761"
160+
#EUREKASERVER_PORT: "8761"
145161
WAIT_HOSTS: configserver:9191
146162
depends_on:
147163
configserver:
148164
condition: service_started
149-
advertisementservice:
150-
condition: service_started
151-
reportservice:
165+
eurekaserver:
152166
condition: service_started
153167
ports:
154168
- "9002:9002"
@@ -180,6 +194,10 @@ services:
180194
condition: service_healthy
181195
configserver:
182196
condition: service_started
197+
eurekaserver:
198+
condition: service_started
199+
rabbitmq:
200+
condition: service_started
183201
ports:
184202
- "9001:9001"
185203
networks:
@@ -211,6 +229,10 @@ services:
211229
condition: service_healthy
212230
configserver:
213231
condition: service_started
232+
eurekaserver:
233+
condition: service_started
234+
rabbitmq:
235+
condition: service_started
214236
ports:
215237
- "9003:9003"
216238
networks:

‎management-service/src/main/java/com/springbootmicroservices/management/ManagementApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
7+
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.http.client.ClientHttpRequestInterceptor;
910
import org.springframework.web.client.RestTemplate;
@@ -12,6 +13,7 @@
1213
import java.util.List;
1314

1415
@SpringBootApplication
16+
@EnableEurekaClient
1517
public class ManagementApplication {
1618

1719
public static void main(String[] args) {

‎report-service/src/main/java/com/springbootmicroservices/report/ReportApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
56

67
@SpringBootApplication
8+
@EnableEurekaClient
79
public class ReportApplication {
810

911
public static void main(String[] args) {

‎user-service/src/main/java/com/springbootmicroservices/userservice/UserserviceApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
56

67
@SpringBootApplication
8+
@EnableEurekaClient
79
public class UserserviceApplication {
810

911
public static void main(String[] args) {

‎user-service/src/main/java/com/springbootmicroservices/userservice/config/KeycloakConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
@Configuration
1111
public class KeycloakConfig {
1212

13-
public final static String serverUrl = "http://localhost:8181";
13+
//public final static String serverUrl = "http://localhost:8181";
14+
public final static String serverUrl = "http://keycloak:8181";
1415
public final static String realm = "master";
1516
public final static String clientId = "spring-boot-microservice-keycloak";
1617
public final static String clientSecret = "6UxIqgy19GidtJB1OgRwqU3Acp11tOlZ";

0 commit comments

Comments
 (0)