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 | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 33e475d..6986243 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -14,6 +14,16 @@
spring.redis.password=kidgrow
spring.redis.timeout=5000
+#rabbitmq\u914D\u7F6E
+kidgrow.rabbitmq.host=192.168.2.240
+kidgrow.rabbitmq.port=5672
+kidgrow.rabbitmq.username=liuke
+kidgrow.rabbitmq.password=kidgrow2020
+kidgrow.rabbitmq.exchangeName=BoneAgeEvaluation
+kidgrow.rabbitmq.queueName=test_queue
+kidgrow.rabbitmq.routingKeyName=Kidgrow2020
+kidgrow.rabbitmq.virtual-host=kidgrow
+
#\u963F\u91CCDruid\u914D\u7F6E
kidgrow.druid.loginname=admin
kidgrow.druid.loginpwd=123456
@@ -37,6 +47,13 @@
kidgrow.fdfs.web-url=127.0.0.1
kidgrow.fdfs.trackerList=${kidgrow.fdfs.web-url}:22122
+####\u963F\u91CCOSS\u914D\u7F6E
+kidgrow.oss.access-key=LTAI4FennfcwZupz3B6hkK3N
+kidgrow.oss.accessKeySecret=NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
+kidgrow.oss.endpoint=123.kidgrow.cloud
+kidgrow.oss.bucketName=kidgrow
+kidgrow.oss.domain=http://123.kidgrow.cloud/
+
##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A
kidgrow.trace.enable=true
@@ -50,6 +67,24 @@
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
kidgrow.audit-log.datasource.driver-class-name=com.mysql.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.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center_${spring.profiles.active}?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}
+
+## appUrl \u9759\u6001\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84
+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