Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

 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,25 +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, "验证码错误，重新输入");

         }

      }

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);



      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);