补充注释，优化代码

src/main/java/cn/quantgroup/xyqb/service/user/impl/LockIpv4ServiceImpl.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.exception.PasswordErrorLimitException;
 import cn.quantgroup.xyqb.service.user.ILockIpv4Service;
 import cn.quantgroup.xyqb.util.DateUtils;
+import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -48,13 +49,17 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         }
     }
 
+    /**
+     * 对白名单之外的所有公有、私有IP执行错误计数
+     * @param ipv4
+     */
     @Override
     public void countErrorByIpv4(String ipv4) {
         // Todo -- 全天候开放监控
         /*if(!ValidationUtil.isAtDangerousTime()){
           return;
         }*/
-        if (StringUtils.isNotBlank(ipv4) && !ValidationUtil.validateLocalIpv4(ipv4)) {
+        if (ValidationUtil.validateIpv4(ipv4) && !IPUtil.whiteOf(ipv4)) {
             String ipv4Key = getErrorIpKey(ipv4);
             if(!stringRedisTemplate.hasKey(ipv4Key)){
                 // 计数周期1分钟
@@ -88,13 +93,17 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         LOGGER.info("Lock_ipv4: locked error ip access:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, minutes);
     }
 
+    /**
+     * 对白名单之外的所有公有、私有IP执行成功计数
+     * @param ipv4
+     */
     @Override
     public void countSuccessByIpv4(String ipv4) {
         // Todo -- 全天候开放监控
         /*if(!ValidationUtil.isAtDangerousTime()){
           return;
         }*/
-        if (StringUtils.isNotBlank(ipv4) && !ValidationUtil.validateLocalIpv4(ipv4)) {
+        if (ValidationUtil.validateIpv4(ipv4) && !IPUtil.whiteOf(ipv4)) {
             String ipv4Key = getSuccessIpKey(ipv4);
             if(!stringRedisTemplate.hasKey(ipv4Key)){
                 // 计数周期1分钟

src/main/java/cn/quantgroup/xyqb/util/IPUtil.java

@@ -28,7 +28,7 @@ public class IPUtil {
    */
   private static final Set<String> whiteAddr = Sets.newHashSet();
   static {
-    String[] ips = {"192.168.3.", "192.168.4.", "172.16.", "172.20.", "172.30."};
+    String[] ips = {"172.16.", "172.20.", "172.30.", "192.168.3.", "192.168.4."};
     whiteAddr.addAll(Arrays.asList(ips));
   }
 

src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java

@@ -18,7 +18,7 @@ public class ValidationUtil {
   private static String phoneRegExp = "^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9])|(19[0-9]))\\d{8}$";
   private static String chineseNameRegExp = "^[\u4e00-\u9fa5]+(\\.|·)?[\u4e00-\u9fa5]+$";
   private static String ipv4RegExp = "^((2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)\\.){3}(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)$";
-  private static String localIpv4RegExp = "^172(\\.(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)){3}$";
+  private static String localIpv4RegExp = "^((172\\.(1[0-6]|2[0-9]|3[01]))|(192\\.168|169\\.254)|((127|10)\\.(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)))(\\.(2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)){2}$";
 
   private static Pattern phonePattern = Pattern.compile(phoneRegExp);
   private static Pattern chinesePattern = Pattern.compile(chineseNameRegExp);