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 - cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, - - action = #{action,jdbcType=INTEGER}, - - do_log = #{doLog,jdbcType=INTEGER}, - - is_valid = #{isValid,jdbcType=INTEGER}, - - is_audit = #{isAudit,jdbcType=INTEGER}, - creator_id = #{creatorId,jdbcType=INTEGER}, create_time = #{createTime,jdbcType=TIMESTAMP}, - - 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}, + 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}, 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=::-::