perf($Consul): move more common configurations to application config

johnnymillergh · Feb 3, 2022 · c207cc5 · c207cc5
1 parent 9568372
commit c207cc5
Show file tree

Hide file tree

Showing 6 changed files with 580 additions and 128 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
@@ -37,14 +37,6 @@ spring:
         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:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: Asia/Hong_Kong
-  sleuth:
-    sampler:
-      probability: 1.0
   servlet:
     multipart:
       # `location` specifies the directory where uploaded files will be stored. When not specified,
@@ -57,119 +49,9 @@ 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
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    dynamic:
-      primary: master_1
-      druid:
-        # connection pool size will be determined by DruidDataSourceCreatorPostProcessor.java
-        max-wait: 60000
-        min-evictable-idle-time-millis: 600000
-        max-evictable-idle-time-millis: 900000
-        validation-query: SELECT 1
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-        pool-prepared-statements: true
-        max-pool-prepared-statement-per-connection-size: 20
-        keep-alive: true
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      filters: stat,wall,log4j2
-      filter:
-        stat:
-          enabled: true
-          db-type: mysql
-          log-slow-sql: true
-          slow-sql-millis: 2000
-        slf4j:
-          enabled: true
-          statement-log-error-enabled: true
-          statement-create-after-log-enabled: false
-          statement-close-after-log-enabled: false
-          result-set-open-after-log-enabled: false
-          result-set-close-after-log-enabled: false
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-        session-stat-enable: true
-        session-stat-max-count: 1000
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: maf_druid_password
-        allow:
-  redis:
-    database: 0
-    timeout: 10000ms
-    client-type: LETTUCE
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  quartz:
-    job-store-type: JDBC
-    jdbc:
-      initialize-schema: NEVER
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceId: AUTO
-          jobStore:
-            tablePrefix: QRTZ_
-            isClustered: true
-            clusterCheckinInterval: 3000
-            useProperties: false
-
-feign:
-  circuitbreaker:
-    enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-  client:
-    config:
-      default:
-        connectTimeout: 5000
-        readTimeout: 10000
-        loggerLevel: full
-  compression:
-    request:
-      enabled: true
-    response:
-      enabled: true
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: ALWAYS
-
-mybatis-plus:
-  global-config:
-    db-config:
-      logic-delete-field: deleted
-  configuration:
-    map-underscore-to-camel-case: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  # mapper-locations should start with `classpath*` prefix
-  # when project is based on Maven multi-module to load XML mapper in different jar
-  mapper-locations: classpath*:/mapper/**/*Mapper.xml
 
 logging:
   config: classpath:logback-configuration/logback-${spring.profiles.active}.xml
-  level:
-    org.springframework.boot.context.config: TRACE
 
 maf:
   project-properties:

diff --git a/...nfiguration/micro-service-config-on-consul/application/application-development-docker.yml b/...nfiguration/micro-service-config-on-consul/application/application-development-docker.yml
@@ -4,12 +4,63 @@
 # 2. Properties in the config/application folder are applicable to all applications using consul for configuration.
 
 spring:
-  zipkin:
-    base-url: http://maf-zipkin:9411
+  mvc:
+    throw-exception-if-no-handler-found: true
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: Asia/Hong_Kong
+  sleuth:
+    sampler:
+      probability: 1.0
   devtools:
     add-properties: true
+  zipkin:
+    base-url: http://maf-zipkin:9411
   datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: stat,wall,log4j2
+      filter:
+        stat:
+          enabled: true
+          db-type: mysql
+          log-slow-sql: true
+          slow-sql-millis: 2000
+        slf4j:
+          enabled: true
+          statement-log-error-enabled: true
+          statement-create-after-log-enabled: false
+          statement-close-after-log-enabled: false
+          result-set-open-after-log-enabled: false
+          result-set-close-after-log-enabled: false
+      web-stat-filter:
+        enabled: true
+        url-pattern: /*
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+        session-stat-enable: true
+        session-stat-max-count: 1000
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+        login-username: root
+        login-password: maf_druid_password
+        allow:
     dynamic:
+      primary: master_1
+      druid:
+        # connection pool size will be determined by DruidDataSourceCreatorPostProcessor.java
+        max-wait: 60000
+        min-evictable-idle-time-millis: 600000
+        max-evictable-idle-time-millis: 900000
+        validation-query: SELECT 1
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+        pool-prepared-statements: true
+        max-pool-prepared-statement-per-connection-size: 20
+        keep-alive: true
       datasource:
         master_1:
           url: jdbc:mysql://maf-mysql-server-source:3306/muscle_and_fitness?useSSL=true&useUnicode=true
@@ -31,6 +82,30 @@ spring:
     port: 5672
     username: maf_rabbitmq_su
     password: maf@rabbitmq
+  redis:
+    database: 0
+    timeout: 10000ms
+    client-type: LETTUCE
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+  quartz:
+    job-store-type: JDBC
+    jdbc:
+      initialize-schema: NEVER
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceId: AUTO
+          jobStore:
+            tablePrefix: QRTZ_
+            isClustered: true
+            clusterCheckinInterval: 3000
+            useProperties: false
 
 redis:
   master:
@@ -48,3 +123,42 @@ minio:
   access-key: maf_minio_root_user
   secret-key: jm@minio
   bucket-name: maf
+
+feign:
+  circuitbreaker:
+    enabled: true
+  httpclient:
+    enabled: false
+  okhttp:
+    enabled: true
+  client:
+    config:
+      default:
+        connectTimeout: 5000
+        readTimeout: 10000
+        loggerLevel: full
+  compression:
+    request:
+      enabled: true
+    response:
+      enabled: true
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-field: deleted
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  # mapper-locations should start with `classpath*` prefix
+  # when project is based on Maven multi-module to load XML mapper in different jar
+  mapper-locations: classpath*:/mapper/**/*Mapper.xml