From ecea8849ad29ccc204d4994f6eeef5cd5064d0cc Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 14:03:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-config/src/main/resources/bootstrap.properties |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kidgrow-config/src/main/resources/bootstrap.properties b/kidgrow-config/src/main/resources/bootstrap.properties
index 971d7b5..3c1bf26 100644
--- a/kidgrow-config/src/main/resources/bootstrap.properties
+++ b/kidgrow-config/src/main/resources/bootstrap.properties
@@ -1,10 +1,15 @@
 ########################## bootstrap\u7EA7\u522B\u901A\u7528\u914D\u7F6E ##########################
 # \u9ED8\u8BA4\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=fat
+spring.profiles.active=uat
 
 ##### spring-boot-actuator\u914D\u7F6E
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 
 ##### \u5141\u8BB8bean\u8986\u76D6
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
+
+#####\u5B57\u7B26\u7C7B\u578B#####
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
\ No newline at end of file

--
Gitblit v1.8.0