feat($Consul): enable Consul config center

enable Consul config center BREAKING CHANGE: enable Consul config center
johnnymillergh · Feb 5, 2021 · 9887360 · 9887360
1 parent 289bb1e
commit 9887360
Show file tree

Hide file tree

Showing 41 changed files with 153 additions and 180 deletions.
diff --git a/api-gateway/src/main/resources/application-development-docker.yml b/api-gateway/src/main/resources/application-development-docker.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.development
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.development:9411
   devtools:

diff --git a/api-gateway/src/main/resources/application-development-local.yml b/api-gateway/src/main/resources/application-development-local.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: localhost
-      port: 8500
   zipkin:
     base-url: http://localhost:9411
   devtools:

diff --git a/api-gateway/src/main/resources/application-production.yml b/api-gateway/src/main/resources/application-production.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.production
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.production:9411
   devtools:

diff --git a/api-gateway/src/main/resources/application-stage.yml b/api-gateway/src/main/resources/application-stage.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.stage
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.stage:9411
   devtools:

diff --git a/api-gateway/src/main/resources/application-test.yml b/api-gateway/src/main/resources/application-test.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.test
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.test:9411
   devtools:

diff --git a/api-gateway/src/main/resources/application.yml b/api-gateway/src/main/resources/application.yml
@@ -4,8 +4,6 @@ server:
     uri-encoding: @project.build.sourceEncoding@
 
 spring:
-  application:
-    name: @project.artifactId@
   profiles:
     active: @env@
   mvc:
@@ -18,21 +16,10 @@ spring:
       probability: 1.0
   cloud:
     consul:
-      config:
-        enabled: true
-        prefix: config
-        # `default-context` should be equal to Spring application name
-        default-context: ${spring.application.name}
-        profile-separator: "-"
-        format: YAML
-        data-key: "data"
-        watch:
-          enabled: true
-          delay: 1000
       discovery:
         register: true
-        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-${spring.application.name}
-        service-name: ${spring.application.name}
+        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-@project.artifactId@
+        service-name: @project.artifactId@
         port: ${server.port}
         prefer-ip-address: true
         ip-address: ${spring.cloud.client.ip-address}

diff --git a/api-gateway/src/main/resources/bootstrap.yml b/api-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: @project.artifactId@
+  cloud:
+    consul:
+      host: "should-be-passed-by-java-opts"
+      port: 8500
+      config:
+        enabled: true
+        prefix: config
+        # `default-context` should be equal to Spring application name
+        default-context: @project.artifactId@
+        profile-separator: '::'
+        format: YAML
+        data-key: "data"
+        watch:
+          enabled: true
+          delay: 1000
diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.development
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.development:9411
   devtools:

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: localhost
-      port: 8500
   zipkin:
     base-url: http://localhost:9411
   devtools:

diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.production
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.production:9411
   devtools:

diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.stage
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.stage:9411
   devtools:

diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.test
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.test:9411
   devtools:

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -4,8 +4,6 @@ server:
     uri-encoding: @project.build.sourceEncoding@
 
 spring:
-  application:
-    name: @project.artifactId@
   profiles:
     active: @env@
   mvc:
@@ -30,21 +28,10 @@ spring:
       file-size-threshold: 0
   cloud:
     consul:
-      config:
-        enabled: true
-        prefix: config
-        # `default-context` should be equal to Spring application name
-        default-context: ${spring.application.name}
-        profile-separator: "-"
-        format: YAML
-        data-key: "data"
-        watch:
-          enabled: true
-          delay: 1000
       discovery:
         register: true
-        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-${spring.application.name}
-        service-name: ${spring.application.name}
+        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-@project.artifactId@
+        service-name: @project.artifactId@
         port: ${server.port}
         prefer-ip-address: true
         ip-address: ${spring.cloud.client.ip-address}
@@ -57,7 +44,6 @@ spring:
       minIdle: 10
       max-active: 20
       max-wait: 60000
-      time-between-eviction-runs-millis: 10000
       min-evictable-idle-time-millis: 600000
       max-evictable-idle-time-millis: 900000
       validation-query: SELECT 1
@@ -174,7 +160,7 @@ maf:
         - "/*/v2/api-docs/**"
         - "/webjars/**"
         - "/doc.html"
-    included-package-for-http-api-scan: ${project.property.base-package}
+    included-package-for-http-api-scan: ${maf.project-property.base-package}
 
 # Customize JWT configuration for development environment.
 jwt:

diff --git a/auth-center/src/main/resources/bootstrap.yml b/auth-center/src/main/resources/bootstrap.yml
@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: @project.artifactId@
+  cloud:
+    consul:
+      host: "should-be-passed-by-java-opts"
+      port: 8500
+      config:
+        enabled: true
+        prefix: config
+        # `default-context` should be equal to Spring application name
+        default-context: @project.artifactId@
+        profile-separator: '::'
+        format: YAML
+        data-key: "data"
+        watch:
+          enabled: true
+          delay: 1000
diff --git a/docker/config/auth-center/application.yml b/docker/config/auth-center/application.yml
@@ -0,0 +1 @@
+greeting: "Hello from Consul config center!"
diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/exercise-mis/src/main/resources/application-development-docker.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.development
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.development:9411
   devtools:

diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/exercise-mis/src/main/resources/application-development-local.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: localhost
-      port: 8500
   zipkin:
     base-url: http://localhost:9411
   devtools:

diff --git a/exercise-mis/src/main/resources/application-production.yml b/exercise-mis/src/main/resources/application-production.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.production
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.production:9411
   devtools:

diff --git a/exercise-mis/src/main/resources/application-stage.yml b/exercise-mis/src/main/resources/application-stage.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.stage
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.stage:9411
   devtools:

diff --git a/exercise-mis/src/main/resources/application-test.yml b/exercise-mis/src/main/resources/application-test.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.test
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.test:9411
   devtools:

diff --git a/exercise-mis/src/main/resources/application.yml b/exercise-mis/src/main/resources/application.yml
@@ -30,21 +30,10 @@ spring:
       file-size-threshold: 0
   cloud:
     consul:
-      config:
-        enabled: true
-        prefix: config
-        # `default-context` should be equal to Spring application name
-        default-context: ${spring.application.name}
-        profile-separator: "-"
-        format: YAML
-        data-key: "data"
-        watch:
-          enabled: true
-          delay: 1000
       discovery:
         register: true
-        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-${spring.application.name}
-        service-name: ${spring.application.name}
+        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-@project.artifactId@
+        service-name: @project.artifactId@
         port: ${server.port}
         prefer-ip-address: true
         ip-address: ${spring.cloud.client.ip-address}
@@ -171,7 +160,7 @@ maf:
         - "/*/v2/api-docs/**"
         - "/webjars/**"
         - "/doc.html"
-    included-package-for-http-api-scan: ${project.property.base-package}
+    included-package-for-http-api-scan: ${maf.project-property.base-package}
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/bootstrap.yml b/exercise-mis/src/main/resources/bootstrap.yml
@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: @project.artifactId@
+  cloud:
+    consul:
+      host: "should-be-passed-by-java-opts"
+      port: 8500
+      config:
+        enabled: true
+        prefix: config
+        # `default-context` should be equal to Spring application name
+        default-context: @project.artifactId@
+        profile-separator: '::'
+        format: YAML
+        data-key: "data"
+        watch:
+          enabled: true
+          delay: 1000
diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.development
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.development:9411
   devtools:

diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: localhost
-      port: 8500
   zipkin:
     base-url: http://localhost:9411
   devtools:

diff --git a/muscle-mis/src/main/resources/application-production.yml b/muscle-mis/src/main/resources/application-production.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.production
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.production:9411
   devtools:

diff --git a/muscle-mis/src/main/resources/application-stage.yml b/muscle-mis/src/main/resources/application-stage.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.stage
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.stage:9411
   devtools:

diff --git a/muscle-mis/src/main/resources/application-test.yml b/muscle-mis/src/main/resources/application-test.yml
@@ -1,8 +1,4 @@
 spring:
-  cloud:
-    consul:
-      host: maf.consul-service-registry.test
-      port: 8500
   zipkin:
     base-url: http://maf.zipkin.test:9411
   devtools:

diff --git a/muscle-mis/src/main/resources/application.yml b/muscle-mis/src/main/resources/application.yml
@@ -18,21 +18,10 @@ spring:
       probability: 1.0
   cloud:
     consul:
-      config:
-        enabled: true
-        prefix: config
-        # `default-context` should be equal to Spring application name
-        default-context: ${spring.application.name}
-        profile-separator: "-"
-        format: YAML
-        data-key: "data"
-        watch:
-          enabled: true
-          delay: 1000
       discovery:
         register: true
-        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-${spring.application.name}
-        service-name: ${spring.application.name}
+        instance-id: ${spring.cloud.client.hostname}-${spring.cloud.client.ip-address}-${server.port}-@project.artifactId@
+        service-name: @project.artifactId@
         port: ${server.port}
         prefer-ip-address: true
         ip-address: ${spring.cloud.client.ip-address}
@@ -172,7 +161,7 @@ maf:
         - "/*/v2/api-docs/**"
         - "/webjars/**"
         - "/doc.html"
-    included-package-for-http-api-scan: ${project.property.base-package}
+    included-package-for-http-api-scan: ${maf.project-property.base-package}
 
 sftp:
   client: