From adb9c43c902e94275f8d9b155c376900279acfb4 Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 17 Sep 2020 11:31:05 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E4=BF=AE=E6=94=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=83=BD=E5=8A=9B=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../valids/impl/ValidAddCapacityInfoImpl.java          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java b/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java
index 57fe86a6..f594bf0b 100644
--- a/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java
+++ b/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java
@@ -47,7 +47,7 @@ public class ValidAddCapacityInfoImpl implements ConstraintValidator<ValidAddCap
      */
     private String getFieldName(ConstraintValidatorContext ctx) {
         return ((ConstraintValidatorContextImpl) ctx).getConstraintViolationCreationContexts()
-            .get(0).getPath().getLeafNode().getName();
+                .get(0).getPath().getLeafNode().getName();
     }
 
 
@@ -60,13 +60,14 @@ public class ValidAddCapacityInfoImpl implements ConstraintValidator<ValidAddCap
      */
     @Override
     public boolean isValid(AddCapacityInfo addCapacityInfo, ConstraintValidatorContext ctx) {
+        int sum = 0;
         boolean ret = true;
 
         if (addCapacityInfo == null || addCapacityInfo.getCapacityType() == null) {
             // 重新设置消息
             ctx.disableDefaultConstraintViolation();
             ctx.buildConstraintViolationWithTemplate(this.message + " 字段 " + getFieldName(ctx) + " 不能为null")
-                .addConstraintViolation();
+                    .addConstraintViolation();
 
             return false;
         }
@@ -92,9 +93,14 @@ public class ValidAddCapacityInfoImpl implements ConstraintValidator<ValidAddCap
                 for (String s : addCapacityInfo.getProtectIp().split(DisposeConfigValue.SPLIT_CHAR)) {
                     if (!Pattern.matches(ConstValue.IP_ADDR_SEGMENT_REG, s.replace(" ", ""))) {
                         errMsg.add("字段 protectIp 包含非法值: " + s);
+                        sum += 1;
                         break;
                     }
                 }
+
+                if(sum > 0){
+                    ret = false;
+                }
             }
 
             if (addCapacityInfo.getReserveNetflow() == null) {