Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);

      }