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-dev.properties | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index a0ce526..3d80c8c 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -72,4 +72,13 @@
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
## appUrl \u9759\u6001\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84
-appUrl=http://192.168.2.240/upload/
\ No newline at end of file
+appUrl=http://192.168.2.240/upload/
+
+## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
+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=wx5a9bc7ebd13eb6cc
+wechat.miniapp.secret=c16d8e42e42137bd7ba6e6999f226803
\ No newline at end of file
--
Gitblit v1.8.0