Merge branch 'master' into 20171201_uuid

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

@@ -91,8 +91,8 @@ public class CaptchaNewValidateAdvisor {
         Long countPhone = countPhone(phoneNo);
         Long countDeviceId = countDeviceId(deviceId);
         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, request.getRemoteAddr());
                 return pjp.proceed();