Merge branch 'div'

yujian

2019-04-18 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -931,8 +931,7 @@
            throw new UserAccountException(1, "验证码错误，重新输入");

         }

      }

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);



		
      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

@@ -945,6 +944,13 @@
      if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {

         throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }

		
		
      // 清空限制

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      // 清理次数

      redisManager.removeCommonString("sendMSNLoginCount" + phone);

		


      // 查询是否存在该电话历史用户

      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);