From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

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

diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 0a1053a..9f0bbad 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
@@ -74,11 +74,19 @@
 ##  appUrl \u9759\u6001\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84
 appUrl=http://192.168.2.240/upload/
 
-## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
+## \u5FAE\u4FE1\u7EDF\u4E00URL
 wechat.apiUrl=https://api.weixin.qq.com
-wechat.mp.appid=dev-wx1cc7074ce3014652
-wechat.mp.secret=dev-0fa9eb188ae52aa8c2380744109f161c
 
-## C\u7AEF\u4EA7\u54C1\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
-wechat.miniapp.appid=dev-wx87654dd4adb165f3
-wechat.miniapp.secret=dev-6ed7bad82fc479f333de647cceca5c72
\ No newline at end of file
+## H\u7AEF\u4EA7\u54C1\u9AA8\u9F84\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
+wechat.miniapp.appid=wx5a9bc7ebd13eb6cc
+wechat.miniapp.secret=c16d8e42e42137bd7ba6e6999f226803
+
+## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
+wechat.xigao.mp.appid=wx1cc7074ce3014652
+wechat.xigao.mp.secret=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=wx0f3a6409155f1bac
+wechat.screening.applets.secret=ce485ae3192bb6a6cd68ce140ac81327
+health_url_net=http://192.168.2.22/
\ No newline at end of file

--
Gitblit v1.8.0