Merge branch 'master' into 20171201_uuid

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

@@ -103,7 +103,8 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
             }
             Long count = stringRedisTemplate.opsForValue().increment(ipv4Key, 1L);
             LOGGER.info("Lock_ipv4: count success ip access: ip={}, count={}", ipv4, count);
-            // Todo -- 误伤业务方，暂时下线[比如网贷之家：121.40.207.133] -- lockSuccessIpv4(ipv4, count);
+            // 恢复规则，观察 // Todo -- 误伤业务方，暂时下线[比如网贷之家：121.40.207.133] -- lockSuccessIpv4(ipv4, count);
+            lockSuccessIpv4(ipv4, count);
         }
     }