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

1、为IP域配置和回调类配置添加addrType为4OVER、6OVER4三种IP类型；

Browse Source 
2、redis.port改回6379；
This commit is contained in:
zhangdongxu
2018-07-20 17:56:31 +08:00
parent 75f136b567
commit 827338f7aa
7 changed files with 214 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/commonSources/applicationConfig-parser.xml
View File

@@ -15,9 +15,9 @@
<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
<t:field fieldType="Number" srcName="action" dstName="action" isRequired="true"/>
<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id" isRequired="true" />
<t:field fieldType="Number" srcName="addrType" dstName="addr_type" isRequired="true" regexp="[4|6]"/>
<t:field fieldType="IP" srcName="srcIp" dstName="src_ip" isRequired="true"/>
<t:field fieldType="IP" srcName="maskSrcIp" dstName="mask_src_ip" isRequired="true"/>
<t:field fieldType="Number" srcName="addrType" dstName="addr_type" isRequired="true" regexp="^([4|6]{1})|46|64|10$"/>
<t:field fieldType="IP" srcName="srcIp" dstName="src_ip" isRequired="true" isSrcInfo="true"/>
<t:field fieldType="IP" srcName="maskSrcIp" dstName="mask_src_ip" isRequired="true" isSrcInfo="true"/>
<t:field fieldType="Port" srcName="srcPort" dstName="src_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Port" srcName="maskSrcPort" dstName="mask_src_port" isRequired="true" range="0-65535"/>
<t:field fieldType="IP" srcName="dstIp" dstName="dst_ip" isRequired="true"/>
@@ -90,9 +90,9 @@
<t:field fieldType="Number" srcName="action" dstName="action" isRequired="true"/>
<t:field fieldType="Number" srcName="cfgId" dstName="cfg_id" isRequired="true" />
<t:field fieldType="Number" srcName="policyGroup" dstName="policy_group" isRequired="true" defaultVal="0"/>
<t:field fieldType="Number" srcName="addrType" dstName="addr_type" isRequired="true" regexp="[4|6]"/>
<t:field fieldType="IP" srcName="srcIp" dstName="src_ip" isRequired="true"/>
<t:field fieldType="IP" srcName="maskSrcIp" dstName="mask_src_ip" isRequired="true"/>
<t:field fieldType="Number" srcName="addrType" dstName="addr_type" isRequired="true" regexp="^([4|6]{1})|46|64|10$"/>
<t:field fieldType="IP" srcName="srcIp" dstName="src_ip" isRequired="true" isSrcInfo="true"/>
<t:field fieldType="IP" srcName="maskSrcIp" dstName="mask_src_ip" isRequired="true" isSrcInfo="true"/>
<t:field fieldType="Port" srcName="srcPort" dstName="src_port" isRequired="true" range="0-65535"/>
<t:field fieldType="Port" srcName="maskSrcPort" dstName="mask_src_port" isRequired="true" range="0-65535"/>
<t:field fieldType="IP" srcName="dstIp" dstName="dst_ip" isRequired="true"/>