From 67f311be5d75450de39ab8b25181c1c7dc11a151 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 七月 2019 15:33:29 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 8919295..9185a59 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
@@ -992,6 +992,7 @@
if (exec == null || exec.size() == 0) {
throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
} else {
+
// 鏌ヨ鏄惁瀛樺湪璇ョ數璇濆巻鍙茬敤鎴�
UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);
if (userInfo != null) {
@@ -1015,11 +1016,13 @@
e.printStackTrace();
}
}
+
return userInfo;
}
} catch (Exception e) {
e.printStackTrace();
} finally {
+ jedis.del(watchKey);
jedis.unwatch();
jedisPool.returnResource(jedis);
}
@@ -1102,6 +1105,7 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
+ jedis.del(watchKey);
jedis.unwatch();
jedisPool.returnResource(jedis);
}
--
Gitblit v1.8.0