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

8
src/main/resources/commonSources/applicationConfig-parser.schema.xsd
View File

@@ -39,6 +39,8 @@
<xs:enumeration value="Date"></xs:enumeration>
<xs:enumeration value="Number"></xs:enumeration>
<xs:enumeration value="IP">
<![CDATA[IP类型数据，如果格式可能为4OVER6或6OVER4,需要添加isSrcInfo="true"
]]>
</xs:enumeration>
<xs:enumeration value="Port"></xs:enumeration>
</xs:restriction>
@@ -68,6 +70,12 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="isSrcInfo" type="xs:boolean">
<xs:annotation>
<xs:documentation><![CDATA[IP类型数据，如果格式可能为4OVER6或6OVER4,通过isSrcInfo="true"指定源IP信息]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>

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"/>

2
src/main/resources/jdbc.properties
View File

@@ -64,7 +64,7 @@ bonecp.hive.statementsCacheSize=100
#####################################################################################################################################
redis.host=10.0.6.249
#redis.host=192.168.10.205
redis.port=6381
redis.port=6379
redis.pass=
redis.maxIdle=5
redis.maxTotal=250