chore(*): Update doc.

yizzuide · Sep 5, 2022 · b8d6d17 · b8d6d17
1 parent 9541bc3
commit b8d6d17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Milkomeda/src/main/resources/META-INF/additional.properties b/Milkomeda/src/main/resources/META-INF/additional.properties
@@ -1,7 +1,7 @@
-# Create empty map with response addition yml config.
+# Create empty map with response addition in yml config.
 collections.emptyMap={}
 
-# Create empty list with response addition yml config.
+# Create empty list with response addition in yml config.
 collections.emptyList=[]
 
 # Calculated value is equality

diff --git a/MilkomedaDemo/src/main/resources/application.yml b/MilkomedaDemo/src/main/resources/application.yml
@@ -40,6 +40,9 @@ spring:
   # Springboot 2.3: 优雅关机等待时间
   lifecycle:
     timeout-per-shutdown-phase: 20s
+  # Springboot 2.1: Bean重复定义是否覆盖
+  main:
+    allow-bean-definition-overriding: false
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     druid: