perf($Consul): reduce duplicate application configuration YAML files

johnnymillergh · Feb 3, 2022 · a9c3237 · a9c3237
1 parent f883d81
commit a9c3237
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 33 deletions.
diff --git a/auth-center/auth-center-bootstrap/src/main/resources/application.yml b/auth-center/auth-center-bootstrap/src/main/resources/application.yml
@@ -7,8 +7,36 @@ server:
     context-path:
 
 spring:
+  application:
+    name: @project.parent.artifactId@
   profiles:
     active: @environment@
+  config:
+    import: "consul:${spring.cloud.consul.host}:${spring.cloud.consul.port}"
+  cloud:
+    # https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/index.html#spring-cloud-consul-config
+    consul:
+      host: "should-be-passed-by-java-opts"
+      port: 8500
+      config:
+        # `default-context` should not be modified, keeps "application" for common configuration.
+        # Properties in the config/application folder are applicable to all applications using consul for configuration.
+        profile-separator: "::"
+        format: YAML
+        data-key: "data"
+        watch:
+          enabled: true
+          delay: 1000
+        prefixes:
+          - config
+      discovery:
+        register: true
+        instance-id: ${spring.application.name}-${spring.cloud.client.hostname}-${vcap.application.instance_id:${spring.application.instance_id:${random.value}}}
+        service-name: ${spring.application.name}
+        port: ${server.port}
+        prefer-ip-address: true
+        ip-address: ${spring.cloud.client.ip-address}
+        health-check-critical-timeout: 15s
   mvc:
     throw-exception-if-no-handler-found: true
   jackson:
@@ -29,16 +57,6 @@ spring:
       # `file-size-threshold` specifies the size threshold after which files will be written to disk.
       # The default is 0. We set it as 0 too.
       file-size-threshold: 0
-  cloud:
-    consul:
-      discovery:
-        register: true
-        instance-id: ${spring.application.name}-${spring.cloud.client.hostname}-${vcap.application.instance_id:${spring.application.instance_id:${random.value}}}
-        service-name: ${spring.application.name}
-        port: ${server.port}
-        prefer-ip-address: true
-        ip-address: ${spring.cloud.client.ip-address}
-        health-check-critical-timeout: 15s
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     dynamic:
@@ -148,6 +166,8 @@ mybatis-plus:
 
 logging:
   config: classpath:logback-configuration/logback-${spring.profiles.active}.xml
+  level:
+    org.springframework.boot.context.config: TRACE
 
 maf:
   project-properties:

diff --git a/auth-center/auth-center-bootstrap/src/main/resources/bootstrap.yml b/auth-center/auth-center-bootstrap/src/main/resources/bootstrap.yml
diff --git a/...micro-service/api-gateway/application.yml → ...fig-on-consul/api-gateway/application.yml b/...micro-service/api-gateway/application.yml → ...fig-on-consul/api-gateway/application.yml
diff --git a/...ources/application-development-docker.yml → ...cation/application-development-docker.yml b/...ources/application-development-docker.yml → ...cation/application-development-docker.yml
@@ -37,6 +37,13 @@ redis:
       port: 6379
       password: maf@redis
 
+minio:
+  endpoint: http://maf-minio
+  port: 9000
+  access-key: maf_minio_root_user
+  secret-key: jm@minio
+  bucket-name: maf
+
 maf:
   configuration:
     swagger-enabled: true
diff --git a/...sources/application-development-local.yml → ...ication/application-development-local.yml b/...sources/application-development-local.yml → ...ication/application-development-local.yml
@@ -37,10 +37,12 @@ redis:
       port: 6380
       password: maf@redis
 
-logging:
-  level:
-    com.baomidou: DEBUG
-    com.jmsoftware: DEBUG
+minio:
+  endpoint: http://localhost
+  port: 9000
+  access-key: maf_minio_root_user
+  secret-key: jm@minio
+  bucket-name: maf
 
 maf:
   configuration:

diff --git a/...main/resources/application-production.yml → ...ul/application/application-production.yml b/...main/resources/application-production.yml → ...ul/application/application-production.yml
@@ -37,6 +37,13 @@ redis:
       port: 6379
       password: maf@redis
 
+minio:
+  endpoint: http://maf-minio
+  port: 9000
+  access-key: maf_minio_root_user
+  secret-key: jm@minio
+  bucket-name: maf
+
 maf:
   configuration:
     swagger-enabled: false
diff --git a/.../src/main/resources/application-stage.yml → ...-consul/application/application-stage.yml b/.../src/main/resources/application-stage.yml → ...-consul/application/application-stage.yml
@@ -37,6 +37,13 @@ redis:
       port: 6379
       password: maf@redis
 
+minio:
+  endpoint: http://maf-minio
+  port: 9000
+  access-key: maf_minio_root_user
+  secret-key: jm@minio
+  bucket-name: maf
+
 maf:
   configuration:
     swagger-enabled: false
diff --git a/...p/src/main/resources/application-test.yml → ...n-consul/application/application-test.yml b/...p/src/main/resources/application-test.yml → ...n-consul/application/application-test.yml
@@ -37,6 +37,13 @@ redis:
       port: 6379
       password: maf@redis
 
+minio:
+  endpoint: http://maf-minio
+  port: 9000
+  access-key: maf_minio_root_user
+  secret-key: jm@minio
+  bucket-name: maf
+
 maf:
   configuration:
     swagger-enabled: true
diff --git a/...micro-service/auth-center/application.yml → ...fig-on-consul/auth-center/application.yml b/...micro-service/auth-center/application.yml → ...fig-on-consul/auth-center/application.yml
diff --git a/...ion/micro-service/maf-mis/application.yml → ...-config-on-consul/maf-mis/application.yml b/...ion/micro-service/maf-mis/application.yml → ...-config-on-consul/maf-mis/application.yml
diff --git a/.../micro-service/oss-center/application.yml → ...nfig-on-consul/oss-center/application.yml b/.../micro-service/oss-center/application.yml → ...nfig-on-consul/oss-center/application.yml
diff --git a/...service/spring-boot-admin/application.yml → ...-consul/spring-boot-admin/application.yml b/...service/spring-boot-admin/application.yml → ...-consul/spring-boot-admin/application.yml