From b92f672511421c4f1b673242ef6ac5b186d10d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 09 Dec 2020 09:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

---
 kidgrow-config/src/main/resources/application-dev.properties |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 6986243..bb73239 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -50,9 +50,9 @@
 ####\u963F\u91CCOSS\u914D\u7F6E
 kidgrow.oss.access-key=LTAI4FennfcwZupz3B6hkK3N
 kidgrow.oss.accessKeySecret=NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
-kidgrow.oss.endpoint=123.kidgrow.cloud
+kidgrow.oss.endpoint=open.oss.kidgrow.cloud
 kidgrow.oss.bucketName=kidgrow
-kidgrow.oss.domain=http://123.kidgrow.cloud/
+kidgrow.oss.domain=https://open.oss.kidgrow.cloud/
 
 ##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A
 kidgrow.trace.enable=true
@@ -84,7 +84,9 @@
 ## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
 wechat.xigao.mp.appid=dev-wx1cc7074ce3014652
 wechat.xigao.mp.secret=dev-0fa9eb188ae52aa8c2380744109f161c
+wechat.xigao.mp.token=c83AR9oqRAJNg83A
 
 ## C\u7AEF\u4EA7\u54C1\u53EF\u7231\u9AD8\u7B5B\u67E5\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
 wechat.screening.applets.appid=wx5a9bc7ebd13eb6cc
-wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
\ No newline at end of file
+wechat.screening.applets.secret=c16d8e42e42137bd7ba6e6999f226803
+health_url_net=http://192.168.2.22/
\ No newline at end of file

--
Gitblit v1.8.0