From 0f9a0a76b170bceac867dd5cd009e518ac6646e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 20 十一月 2019 11:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/resource/env-dev/redis.properties b/fanli/src/main/resource/env-dev/redis.properties
index 6d173d2..8c93cf2 100644
--- a/fanli/src/main/resource/env-dev/redis.properties
+++ b/fanli/src/main/resource/env-dev/redis.properties
@@ -1,7 +1,7 @@
 redis.addr=192.168.1.253
 redis.port=6379
 redis.auth=123456
-redis.max_active=1024
+redis.max_total=1024
 redis.max_idle=200
 redis.max_wait=10000
 redis.timeout=5000

--
Gitblit v1.8.0