gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
zhanghongqing
2018-10-18 10:28:45 +08:00
parent 02f121e53a 796de73bca
commit 60de40563a
2 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -909,61 +909,33 @@
update cfg_index_info update cfg_index_info
<set > <set >
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="cfgDesc != null and cfgDesc != ''" >
cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
</if>
<if test="action != null" >
action = #{action,jdbcType=INTEGER}, action = #{action,jdbcType=INTEGER},
</if>
<if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
</if>
<if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER}, is_valid = #{isValid,jdbcType=INTEGER},
</if>
<if test="isAudit != null" >
is_audit = #{isAudit,jdbcType=INTEGER}, is_audit = #{isAudit,jdbcType=INTEGER},
</if>
<if test="creatorId != null" > <if test="creatorId != null" >
creator_id = #{creatorId,jdbcType=INTEGER}, creator_id = #{creatorId,jdbcType=INTEGER},
</if> </if>
<if test="createTime != null and createTime != ''" > <if test="createTime != null and createTime != ''" >
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="editorId != null" > editor_id = #{editorId,jdbcType=INTEGER},
editor_id = #{editorId,jdbcType=INTEGER}, edit_time = #{editTime,jdbcType=TIMESTAMP},
</if> service_id = #{serviceId,jdbcType=INTEGER},
edit_time = #{editTime,jdbcType=TIMESTAMP}, request_id = #{requestId,jdbcType=INTEGER},
<if test="serviceId != null" > is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
service_id = #{serviceId,jdbcType=INTEGER}, classify = #{classify,jdbcType=VARCHAR},
</if> attribute = #{attribute,jdbcType=VARCHAR},
<if test="requestId != null" > lable = #{lable,jdbcType=VARCHAR},
request_id = #{requestId,jdbcType=INTEGER}, area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR},
</if> function_id = #{functionId,jdbcType=INTEGER},
<if test="isAreaEffective != null" > user_region1 = #{userRegion1,jdbcType=VARCHAR},
is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, user_region2 = #{userRegion2,jdbcType=VARCHAR},
</if> user_region3 = #{userRegion3,jdbcType=VARCHAR},
<if test="classify != null and classify != ''" > user_region4 = #{userRegion4,jdbcType=VARCHAR},
classify = #{classify,jdbcType=VARCHAR}, user_region5 = #{userRegion5,jdbcType=VARCHAR},
</if> dns_strategy_id = #{dnsStrategyId,jdbcType=INTEGER},
<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},
</trim> </trim>
</set> </set>
where cfg_id = #{cfgId,jdbcType=BIGINT} where cfg_id = #{cfgId,jdbcType=BIGINT}

5
src/main/resources/nis.properties
View File

@@ -501,8 +501,9 @@ droprate=Droprate
bandwidth=Bandwidth bandwidth=Bandwidth
intercept_domain_intensity=DOMAIN_INTENSITY intercept_domain_intensity=DOMAIN_INTENSITY
#IP\u9ed8\u8ba4\u503c #IP\u9ed8\u8ba4\u503c
ipv4_default_ip_value=\:\: ipv4_default_ip_value=0.0.0.0
ipv4_default_ip_subnet_value=0.0.0.0/32 ipv6_default_ip_value=\:\:
ipv4_default_ip_subnet_value=0.0.0.0/16
ipv6_default_ip_subnet_value=::/128 ipv6_default_ip_subnet_value=::/128
ipv4_default_ip_range_value=0.0.0.0-0.0.0.0 ipv4_default_ip_range_value=0.0.0.0-0.0.0.0
ipv6_default_ip_range_value=::-:: ipv6_default_ip_range_value=::-::