From 967f911721e3a7473ac9d6c90e533453751f3243 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 29 Oct 2020 10:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-config/src/main/resources/application-open.properties |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/kidgrow-config/src/main/resources/application-open.properties b/kidgrow-config/src/main/resources/application-open.properties
index 8ad5957..24bc82e 100644
--- a/kidgrow-config/src/main/resources/application-open.properties
+++ b/kidgrow-config/src/main/resources/application-open.properties
@@ -71,4 +71,14 @@
 kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
 
 ##### \u79FB\u52A8\u7AEF\u4E0A\u4F20\u5149\u7247Web\u5E94\u7528URL
-appUrl=http://open.upload.kidgrow.cloud/
\ No newline at end of file
+appUrl=http://open.upload.kidgrow.cloud/
+
+
+## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
+wechat.apiUrl=https://api.weixin.qq.com
+wechat.mp.appid=open-wx1cc7074ce3014652
+wechat.mp.secret=open-0fa9eb188ae52aa8c2380744109f161c
+
+## C\u7AEF\u4EA7\u54C1\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
+wechat.miniapp.appid=open-wx87654dd4adb165f3
+wechat.miniapp.secret=open-6ed7bad82fc479f333de647cceca5c72
\ No newline at end of file

--
Gitblit v1.8.0