From 8ea75b6f027f18f6daf229e43928f78b49740f79 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:51:36 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-config/src/main/resources/application-dev.properties | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 2e67eb5..6986243 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -15,7 +15,7 @@
spring.redis.timeout=5000
#rabbitmq\u914D\u7F6E
-kidgrow.rabbitmq.host=182.92.99.224
+kidgrow.rabbitmq.host=192.168.2.240
kidgrow.rabbitmq.port=5672
kidgrow.rabbitmq.username=liuke
kidgrow.rabbitmq.password=kidgrow2020
@@ -72,4 +72,19 @@
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/
+
+## \u5FAE\u4FE1\u7EDF\u4E00URL
+wechat.apiUrl=https://api.weixin.qq.com
+
+## 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=dev-wx1cc7074ce3014652
+wechat.xigao.mp.secret=dev-0fa9eb188ae52aa8c2380744109f161c
+
+## 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
--
Gitblit v1.8.0