From a277a4b29d85379381417a3e1de58e65252584c8 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Thu, 18 Oct 2018 10:18:03 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6IP=E9=BB=98=E8=AE=A4=E5=80=BC=20(2)Packet,Whi?=
 =?UTF-8?q?telist=20IP=E7=9A=84update=E6=96=B9=E6=B3=95=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E9=83=A8=E5=88=86if=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/IpCfgDao.xml    | 60 +++++--------------
 src/main/resources/nis.properties             |  5 +-
 2 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 6e4d05aa8..4f150623e 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -909,61 +909,33 @@
     update cfg_index_info
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null" >
         action = #{action,jdbcType=INTEGER},
-      </if>
-      <if test="doLog != null" >
         do_log = #{doLog,jdbcType=INTEGER},
-      </if>
-      <if test="isValid != null" >
         is_valid = #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null" >
         is_audit = #{isAudit,jdbcType=INTEGER},
-      </if>
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
       </if>
       <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="editorId != null" >
-        editor_id = #{editorId,jdbcType=INTEGER},
-      </if>
-      edit_time = #{editTime,jdbcType=TIMESTAMP},
-      <if test="serviceId != null" >
-        service_id = #{serviceId,jdbcType=INTEGER},
-      </if>
-      <if test="requestId != null" >
-        request_id = #{requestId,jdbcType=INTEGER},
-      </if>
-      <if test="isAreaEffective != null" >
-        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
-      </if>
-      <if test="classify != null and classify != ''" >
-        classify = #{classify,jdbcType=VARCHAR},
-      </if>
-      <if test="attribute != null and attribute != ''" >
-        attribute = #{attribute,jdbcType=VARCHAR},
-      </if>
-      <if test="lable != null and lable != ''" >
-        lable = #{lable,jdbcType=VARCHAR},
-      </if>
-      <if test="areaEffectiveIds != null" >
-        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
-      </if>
-      <if test="functionId != null" >
-        function_id =  #{functionId,jdbcType=INTEGER},
-      </if>
-        user_region1 = #{userRegion1,jdbcType=VARCHAR},
-        user_region2 = #{userRegion2,jdbcType=VARCHAR},
-        user_region3 = #{userRegion3,jdbcType=VARCHAR},
-        user_region4 = #{userRegion4,jdbcType=VARCHAR},
-        user_region5 = #{userRegion5,jdbcType=VARCHAR},
-        dns_strategy_id =  #{dnsStrategyId,jdbcType=INTEGER},
+      	editor_id = #{editorId,jdbcType=INTEGER},
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+	    service_id = #{serviceId,jdbcType=INTEGER},
+	    request_id = #{requestId,jdbcType=INTEGER},
+	    is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+	    classify = #{classify,jdbcType=VARCHAR},
+	    attribute = #{attribute,jdbcType=VARCHAR},
+	    lable = #{lable,jdbcType=VARCHAR},
+	    area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+	    function_id =  #{functionId,jdbcType=INTEGER},
+	    user_region1 = #{userRegion1,jdbcType=VARCHAR},
+	    user_region2 = #{userRegion2,jdbcType=VARCHAR},
+	    user_region3 = #{userRegion3,jdbcType=VARCHAR},
+	    user_region4 = #{userRegion4,jdbcType=VARCHAR},
+	    user_region5 = #{userRegion5,jdbcType=VARCHAR},
+	    dns_strategy_id =  #{dnsStrategyId,jdbcType=INTEGER},
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 35b683ea0..c5e22f073 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -501,8 +501,9 @@ droprate=Droprate
 bandwidth=Bandwidth
 intercept_domain_intensity=DOMAIN_INTENSITY
 #IP\u9ed8\u8ba4\u503c
-ipv4_default_ip_value=\:\:
-ipv4_default_ip_subnet_value=0.0.0.0/32
+ipv4_default_ip_value=0.0.0.0
+ipv6_default_ip_value=\:\:
+ipv4_default_ip_subnet_value=0.0.0.0/16
 ipv6_default_ip_subnet_value=::/128
 ipv4_default_ip_range_value=0.0.0.0-0.0.0.0
 ipv6_default_ip_range_value=::-::