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/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index a5fae9c..63f9ea9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -1069,7 +1069,7 @@
 		} finally {
 			jedis.del(watchKey);
 			jedis.unwatch();
-			jedisPool.returnResource(jedis);
+			jedis.close();
 		}
 		throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
 	}
@@ -1174,7 +1174,7 @@
 		} finally {
 			jedis.del(watchKey);
 			jedis.unwatch();
-			jedisPool.returnResource(jedis);
+			jedis.close();
 		}
 		throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
 	}

--
Gitblit v1.8.0