Merge branch 'div'

yujian

2019-04-18 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f

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

@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;

import com.yeshi.fanli.entity.bus.user.UserConnectHistory;

@@ -915,26 +916,22 @@
      }

      phone = phone.replaceAll(" ", "");



      // // 苹果应用商店上线测试号码

      // if ("17316780233".equalsIgnoreCase(phone) &&

      // "258168".equalsIgnoreCase(vcode)) {

      // ;

      // } else {

      //

      // if (StringUtil.isNullOrEmpty(vcode)) {

      // throw new UserAccountException(1, "请输入验证码");

      // }

      //

      // String oldVcode = redisManager.getSMSVCode(phone,

      // SMSHistory.TYPE_LOGIN);

      // LogHelper.test("----------------------登录验证码： " + oldVcode);

      // if (StringUtil.isNullOrEmpty(oldVcode) ||

      // !oldVcode.equalsIgnoreCase(vcode)) {

      // throw new UserAccountException(1, "验证码错误，重新输入");

      // }

      // }

      // redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      // 苹果应用商店上线测试号码

      if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {

         ;

      } else {



         if (StringUtil.isNullOrEmpty(vcode)) {

            throw new UserAccountException(1, "请输入验证码");

         }



         String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

         LogHelper.test("----------------------登录验证码： " + oldVcode);

         if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

            throw new UserAccountException(1, "验证码错误，重新输入");

         }

      }

		
      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

@@ -947,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);