From 121c5ee5345d366ae4aadf7901af9b0678dbb7a8 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 23 二月 2020 00:24:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/resource/env-dev/redis.properties |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/resource/env-dev/redis.properties b/fanli/src/main/resource/env-dev/redis.properties
index 07af829..dac30e9 100644
--- a/fanli/src/main/resource/env-dev/redis.properties
+++ b/fanli/src/main/resource/env-dev/redis.properties
@@ -1,6 +1,9 @@
-redis.addr=192.168.1.253
-redis.port=6379
-redis.auth=123456
+#redis.addr=192.168.1.253
+#redis.port=6379
+#redis.auth=123456
+redis.addr=193.112.34.40
+redis.port=6379
+redis.auth=weikou2014
 redis.max_total=1024
 redis.max_idle=200
 redis.max_wait=10000

--
Gitblit v1.8.0