Modify yaml and pom files for config-server

MaximRom00 · Jan 15, 2023 · 4103ab7 · 4103ab7
1 parent 27c71e6
commit 4103ab7
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 89 deletions.
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
@@ -26,10 +26,14 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-config</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>

diff --git a/api-gateway/src/main/resources/application.yaml b/api-gateway/src/main/resources/application.yaml
@@ -2,46 +2,7 @@ spring:
   application:
     name: api-gateway
   cloud:
-    gateway:
-      routes:
-        - id: customer-service
-          uri: lb://customer-service
-          predicates:
-            - Path=/api/**
-        - id: notification-service
-          uri: lb://notification-service
-          predicates:
-            - Path=/api/notification/email
-        - id: inventory-service
-          uri: lb://inventory-service
-          predicates:
-            - Path=/api/product/**
-        - id: discovery-server
-          uri: http://localhost:8761
-          predicates:
-            - Path=/eureka/web
-          filters:
-            - SetPath=/
-        - id: discovery-server-static
-          uri: http://localhost:8761
-          predicates:
-            - Path=/eureka/**
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          issuer-uri: http://192.168.99.100:8080/realms/microservices-realm
-server:
-  port: 8180
-logging:
-  level:
-    org:
-      springframework:
-        cloud:
-          gateway:
-            route:
-              RouteDefinitionRouteLocator: INFO
-            nodeValue: TRACE
-    root: INFO
+    config:
+      uri: http://localhost:8888
 
 
diff --git a/config-server/src/main/resources/application.yaml b/config-server/src/main/resources/application.yaml
@@ -5,9 +5,7 @@ spring:
     config:
       server:
         git:
-#          uri: https://github.com/MaximRom00/Microservices-example
-          uri: https://github.com/MaximRom00/Config-repo
-#          search-paths: config-repo
-          search-paths: config
+          uri: https://github.com/MaximRom00/Microservices-example
+          search-paths: config-repo
 server:
   port: 8888
diff --git a/customer-service/pom.xml b/customer-service/pom.xml
@@ -24,14 +24,27 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-config</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>

diff --git a/customer-service/src/main/resources/application.yaml b/customer-service/src/main/resources/application.yaml
@@ -1,20 +1,11 @@
 spring:
-  jpa:
-    hibernate:
-      ddl-auto: create
-      naming:
-        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
-    show-sql: true
-    database-platform: org.hibernate.dialect.MySQL5Dialect
-  datasource:
-    url: jdbc:mysql://${mysql.host}:3306/customerm
-    password: '12345'
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
   application:
     name: customer-service
-server:
-  port: 8881
-mysql:
-  host: ${DOCKER_MYSQL_HOST:localhost}
+  cloud:
+    config:
+      uri: http://localhost:8888
+  rabbitmq:
+    password: guest
+    port: '5672'
+    host: 192.168.99.100
+    username: guest
diff --git a/discovery-server/pom.xml b/discovery-server/pom.xml
@@ -22,10 +22,14 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-config</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

diff --git a/discovery-server/src/main/resources/application.yaml b/discovery-server/src/main/resources/application.yaml
@@ -4,3 +4,9 @@ eureka:
     fetch-registry: false
 server:
   port: 8761
+spring:
+  application:
+    name: discovery-server
+  cloud:
+    config:
+      uri: http://localhost:8888
diff --git a/inventory-service/pom.xml b/inventory-service/pom.xml
@@ -30,7 +30,14 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/inventory-service/src/main/resources/application.yaml b/inventory-service/src/main/resources/application.yaml
@@ -1,11 +1,6 @@
-server:
-  port: 8083
 spring:
-  data:
-    mongodb:
-      uri: mongodb://${mongo.host}/inventory-service
   application:
     name: inventory-service
-mongo:
-  host: ${DOCKER_MONGO_HOST:localhost:27017}
-
+  cloud:
+    config:
+      uri: http://localhost:8888
diff --git a/notification-service/pom.xml b/notification-service/pom.xml
@@ -24,10 +24,20 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-config</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/notification-service/src/main/resources/application.yaml b/notification-service/src/main/resources/application.yaml
@@ -1,5 +1,11 @@
-server:
-  port: 0
 spring:
   application:
     name: notification-service
+  cloud:
+    config:
+      uri: http://localhost:8888
+  rabbitmq:
+    password: guest
+    port: '5672'
+    host: 192.168.99.100
+    username: guest