From b8d6d171db912514e6b18fc4054c26bd4da5369c Mon Sep 17 00:00:00 2001
From: yizzuide <fu837014586@163.com>
Date: Tue, 6 Sep 2022 03:03:59 +0800
Subject: [PATCH] chore(*): Update doc.

---
 Milkomeda/src/main/resources/META-INF/additional.properties | 4 ++--
 MilkomedaDemo/src/main/resources/application.yml            | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Milkomeda/src/main/resources/META-INF/additional.properties b/Milkomeda/src/main/resources/META-INF/additional.properties
index 88049018..e68e6797 100644
--- 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
index b75fd1da..5b1e715d 100644
--- 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: