From 0019bfde4bb8188bc7d8d9ae7878d117c7bd539c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/resource/env-dev/redis.properties b/fanli/src/main/resource/env-dev/redis.properties
index dac30e9..dc9e603 100644
--- a/fanli/src/main/resource/env-dev/redis.properties
+++ b/fanli/src/main/resource/env-dev/redis.properties
@@ -1,9 +1,9 @@
-#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.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