Merge branch 'master' into feature/20171201-real-ip

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaNewValidateAdvisor.java

@@ -93,8 +93,8 @@ public class CaptchaNewValidateAdvisor {
         Long countDeviceId = countDeviceId(deviceId);
         IPUtil.logIp(LOGGER, request);
         LOGGER.info("使用图形验证码, registerFrom={}, clientIp={},手机号次数:{},设备次数:{},ip次数:{},phone:{}", registerFrom, clientIp,countPhone,countDeviceId,countIP,phoneNo);
-        if (countIP > Constants.Image_Need_Count || countPhone > Constants.Image_Need_Count || countDeviceId > Constants.Image_Need_Count) {
-
+        //if (countIP > Constants.Image_Need_Count || countPhone > Constants.Image_Need_Count || countDeviceId > Constants.Image_Need_Count) {
+            if(true){
             if (shouldSkipCaptchaValidate(registerFrom, captchaId, captchaValue)) {
                 LOGGER.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, clientIp);
                 return pjp.proceed();

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -14,7 +14,6 @@ import cn.quantgroup.xyqb.exception.UserNotExistException;
 import cn.quantgroup.xyqb.exception.VerificationCodeErrorException;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
-import cn.quantgroup.xyqb.model.UserRegisterMqMessage;
 import cn.quantgroup.xyqb.model.UserStatistics;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
@@ -23,7 +22,6 @@ import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.*;
-import cn.quantgroup.xyqb.util.encrypt.MD5Util;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;