From d7a58eb17814af2a16ee13afaf93acda09745ed9 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 22 Jul 2020 22:10:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-config/src/main/resources/application-dev.properties | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index fed6ed1..d95fee5 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -9,6 +9,7 @@
# \u662F\u5426\u5F00\u542FRedis\u7F13\u5B58 true\u5F00\u542F false \u5173\u95ED
spring.redis.open=true
spring.redis.host=192.168.2.240
+#spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=kidgrow
spring.redis.timeout=5000
@@ -48,7 +49,10 @@
##### \u5BA1\u8BA1\u65E5\u5FD7\u914D\u7F6E
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
-kidgrow.audit-log.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+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.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/
\ No newline at end of file
--
Gitblit v1.8.0