Merge branch 'master' into 20180130-geetest

src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java

@@ -7,6 +7,7 @@ import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.util.DateUtils;
+import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -266,7 +267,7 @@ public class SmsController implements IBaseController {
       return JsonResult.buildErrorStateResult("您设备已经达到获取今天验证码上限", null);
     }
     // IP上限检查
-    if (getIPVerificationCount > IP_MAX_PER_DAY) {
+    if (!IPUtil.whiteOf(clientIp) && getIPVerificationCount > IP_MAX_PER_DAY) {
       LOGGER.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
       return JsonResult.buildErrorStateResult("您当前ip已经达到获取今天短信验证码上限", null);
     }
@@ -348,7 +349,7 @@ public class SmsController implements IBaseController {
       return JsonResult.buildErrorStateResult("您设备已经达到获取今天语音验证码上限", null);
     }
     // IP上限检查
-    if (getIPVerificationCount > IP_MAX_PER_DAY) {
+    if (!IPUtil.whiteOf(clientIp) && getIPVerificationCount > IP_MAX_PER_DAY) {
       LOGGER.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
       return JsonResult.buildErrorStateResult("您当前ip已经达到获取今天语音验证码上限", null);
     }