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-fat.properties | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-fat.properties b/kidgrow-config/src/main/resources/application-fat.properties
index 854f337..7256a68 100644
--- a/kidgrow-config/src/main/resources/application-fat.properties
+++ b/kidgrow-config/src/main/resources/application-fat.properties
@@ -51,4 +51,14 @@
kidgrow.audit-log.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
-kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
\ No newline at end of file
+kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
+
+
+## C\u7AEF\u4EA7\u54C1\u516C\u4F17\u53F7\u914D\u7F6E\u4FE1\u606F
+wechat.apiUrl=https://api.weixin.qq.com
+wechat.mp.appid=fat-wx1cc7074ce3014652
+wechat.mp.secret=fat-0fa9eb188ae52aa8c2380744109f161c
+
+## C\u7AEF\u4EA7\u54C1\u5C0F\u7A0B\u5E8F\u914D\u7F6E\u4FE1\u606F
+wechat.miniapp.appid=fat-wx87654dd4adb165f3
+wechat.miniapp.secret=fat-6ed7bad82fc479f333de647cceca5c72
\ No newline at end of file
--
Gitblit v1.8.0