1、接口date类型去掉时区，并将日期格式设置为yyyy-MM-dd HH:mm:ss；
2、添加配置日志总量统计服务接口示例； 3、为DNS响应策略配置(service=65)和DNS欺骗地址(service=65)添加配置文件；
This commit is contained in:
zhangdongxu
@@ -4,6 +4,7 @@
|
||||
xsi:schemaLocation="http://www.w3school.com.cn commonSourcesSchema.xsd">
|
||||
<t:commonSource serviceIds="3,4,25,28,29">
|
||||
<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"/>
|
||||
@@ -21,6 +22,7 @@
|
||||
</t:commonSource>
|
||||
<t:commonSource serviceIds="261,262,263,264,389,390,391,392">
|
||||
<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="String" srcName="dstFile" dstName="dst_file" isRequired="true"/>
|
||||
<t:field fieldType="String" srcName="dstFileMd5" dstName="dst_file_md5" isRequired="true"/>
|
||||
@@ -31,6 +33,7 @@
|
||||
</t:commonSource>
|
||||
<t:commonSource serviceIds="265,266,393,394">
|
||||
<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="String" srcName="description" dstName="description" isRequired="true"/>
|
||||
<t:field fieldType="Number" srcName="level" dstName="level" range="0-100" defaultVal="0"/>
|
||||
@@ -48,6 +51,45 @@
|
||||
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
|
||||
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
|
||||
</t:commonSource>
|
||||
<t:commonSource serviceIds="64">
|
||||
<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="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="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"/>
|
||||
<t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip" isRequired="true"/>
|
||||
<t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/>
|
||||
<t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/>
|
||||
<t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true" regexp="[0|6|17]"/>
|
||||
<t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/>
|
||||
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
|
||||
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
|
||||
</t:commonSource>
|
||||
<t:commonSource serviceIds="65">
|
||||
<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="reqStrateId" dstName="req_strate_id" isRequired="true" range="100-"/>
|
||||
<t:field fieldType="String" srcName="strateName" dstName="strate_name" isRequired="true"/>
|
||||
<t:field fieldType="Number" srcName="resGroup1Id" dstName="res_group_1_id" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup1Num" dstName="res_group_1_num" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup2Id" dstName="res_group_2_id" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup2Num" dstName="res_group_2_num" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup3Id" dstName="res_group_3_id" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup3Num" dstName="res_group_3_num" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup4Id" dstName="res_group_4_id" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup4Num" dstName="res_group_4_num" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup5Id" dstName="res_group_5_id" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="resGroup5Num" dstName="res_group_5_num" defaultVal="0"/>
|
||||
<t:field fieldType="Number" srcName="minTtl" dstName="min_ttl" isRequired="true"/>
|
||||
<t:field fieldType="Number" srcName="maxTtl" dstName="max_ttl" isRequired="true"/>
|
||||
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
|
||||
</t:commonSource>
|
||||
</t:commonSources>
|
||||
|
||||
|
||||
|
||||
@@ -11,19 +11,26 @@
|
||||
<xs:complexType>
|
||||
<xs:attribute name="srcName" type="xs:string" use="required">
|
||||
<xs:annotation>
|
||||
<xs:documentation><![CDATA[源字段名]]>
|
||||
<xs:documentation><![CDATA[源字段名，接口传入json串中的Key]]>
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="dstName" type="xs:string" use="required">
|
||||
<xs:annotation>
|
||||
<xs:documentation><![CDATA[目的字段名]]>
|
||||
<xs:documentation><![CDATA[目的字段名，需要传给服务接口中的Key]]>
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="fieldType" use="required">
|
||||
<xs:annotation>
|
||||
<xs:documentation><![CDATA[字段类型]]>
|
||||
<xs:documentation>
|
||||
<![CDATA[字段类型，目前只有String、Date、Number、IP、Port多种类型，
|
||||
其中Date、Number、IP、Port有格式验证,具体验证内容如下:
|
||||
Date:格式为yyyy-MM-dd HH:mm:ss;
|
||||
Number:value必须为数值类型;
|
||||
IP:根据指定的addrType(4|6)来验证IP是否与类型是否一致，如果未指定IP类型，不验证与ipType是否一致,仅验证是否是ip格式;
|
||||
Port:必须是合法的端口，取值范围为0-65535。
|
||||
]]>
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
<xs:simpleType>
|
||||
@@ -31,14 +38,15 @@
|
||||
<xs:enumeration value="String"></xs:enumeration>
|
||||
<xs:enumeration value="Date"></xs:enumeration>
|
||||
<xs:enumeration value="Number"></xs:enumeration>
|
||||
<xs:enumeration value="IP"></xs:enumeration>
|
||||
<xs:enumeration value="IP">
|
||||
</xs:enumeration>
|
||||
<xs:enumeration value="Port"></xs:enumeration>
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="range" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation><![CDATA[取值范围]]>
|
||||
<xs:documentation><![CDATA[取值范围，最小值-最大值，可以单独指定最大或最小值，如：最小值为100 range="100-"]]>
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
|
||||
@@ -9,11 +9,11 @@ jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg==
|
||||
jdbc.product.driver=oracle.jdbc.driver.OracleDriver
|
||||
#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180))))
|
||||
#jdbc.product.url=jdbc:oracle:thin:@10.0.6.212:1523:app
|
||||
jdbc.product.url=jdbc:oracle:thin:@10.0.6.165:1521:orcl
|
||||
jdbc.product.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
#jdbc.product.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
#jdbc.product.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
|
||||
jdbc.product.username=kaz_maat
|
||||
#jdbc.product.username=zdx
|
||||
#jdbc.product.username=kaz_maat
|
||||
jdbc.product.username=zdx
|
||||
#jdbc.product.username=dfxj_2015
|
||||
#jdbc.product.username=gk_pz
|
||||
#jdbc.product.username=z2_5x9pz
|
||||
@@ -21,31 +21,31 @@ jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw==
|
||||
jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A==
|
||||
|
||||
jdbc.log.driver=oracle.jdbc.driver.OracleDriver
|
||||
jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app
|
||||
jdbc.log.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
#jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl
|
||||
jdbc.log.username=gk_log
|
||||
jdbc.log.username=zdx
|
||||
#jdbc.log.username=z2_5x9logb
|
||||
jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
|
||||
jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
|
||||
|
||||
jdbc.logA.driver=oracle.jdbc.driver.OracleDriver
|
||||
jdbc.logA.url=jdbc:oracle:thin:@10.0.6.212:1523:app
|
||||
jdbc.logA.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
#jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl
|
||||
jdbc.logA.username=gk_log_a
|
||||
jdbc.logA.username=zdx
|
||||
#jdbc.logA.username=z2_5x9loga
|
||||
jdbc.logA.key=SXHfLUwzPw0cQEc1wzwM4w==
|
||||
jdbc.logA.password=auvtDoVZpGP6P4OqfBrWAg==
|
||||
|
||||
jdbc.logC.driver=oracle.jdbc.driver.OracleDriver
|
||||
jdbc.logC.url=jdbc:oracle:thin:@10.0.6.212:1523:app
|
||||
jdbc.logC.username=gk_log_c
|
||||
jdbc.logC.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
jdbc.logC.username=zdx
|
||||
jdbc.logC.key=MvwfUIYP0nLyiQeprHB/5A==
|
||||
jdbc.logC.password=3HXvsqpbOoNBIkHDS5c9Aw==
|
||||
|
||||
jdbc.jk.driver=oracle.jdbc.driver.OracleDriver
|
||||
jdbc.jk.url=jdbc:oracle:thin:@10.0.6.212:1523:app
|
||||
jdbc.jk.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl
|
||||
#jdbc.jk.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
|
||||
jdbc.jk.username=gk_jk
|
||||
jdbc.jk.username=zdx
|
||||
#jdbc.jk.username=z2_5x9jk
|
||||
jdbc.jk.key=+FaavsHgQ0qBSebsAoochw==
|
||||
jdbc.jk.password=wBrNar7gX/iQR7IyCSHuSg==
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<p:maatType service="3;4;25;28;29">
|
||||
<p:expressions>
|
||||
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
|
||||
<p:valueExpression>[cfg_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]</p:valueExpression>
|
||||
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]</p:valueExpression>
|
||||
</p:expressions>
|
||||
<p:sequences>
|
||||
<p:operation>1</p:operation>
|
||||
@@ -66,10 +66,51 @@
|
||||
</p:expressions>
|
||||
</p:maatType>
|
||||
|
||||
<p:maatType service="64">
|
||||
<p:expressions>
|
||||
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
|
||||
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[policyGroup];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]</p:valueExpression>
|
||||
</p:expressions>
|
||||
<p:sequences>
|
||||
<p:operation>1</p:operation>
|
||||
<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
|
||||
</p:sequences>
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
|
||||
</p:expressions>
|
||||
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
|
||||
</p:expressions>
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
|
||||
</p:expressions>
|
||||
</p:maatType>
|
||||
|
||||
<p:maatType service="65">
|
||||
<p:expressions>
|
||||
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
|
||||
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid]</p:valueExpression>
|
||||
</p:expressions>
|
||||
<p:sequences>
|
||||
<p:operation>1</p:operation>
|
||||
<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
|
||||
</p:sequences>
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
|
||||
</p:expressions>
|
||||
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
|
||||
</p:expressions>
|
||||
<p:expressions>
|
||||
<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
|
||||
</p:expressions>
|
||||
</p:maatType>
|
||||
<p:maatType service="832">
|
||||
<p:expressions>
|
||||
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
|
||||
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[policy_group];\t;[addr_type];\t;[ip];\t;[port];\t;[user_region];\t;[location];\t;[is_valid];\t;[op_time
|
||||
<p:valueExpression>[cfg_id];\t;[service];\t;[action];\t;[policy_group];\t;[addr_type];\t;[ip];\t;[port];\t;[user_region];\t;[location];\t;[is_valid];\t;[op_time]
|
||||
</p:valueExpression>
|
||||
</p:expressions>
|
||||
<p:sequences>
|
||||
|
||||
@@ -80,13 +80,15 @@ service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;
|
||||
1057=10:LIMIT_COMPILE;11:LIMIT_GROUP;12:LIMIT_IP;18:NTC_IP_RANGE
|
||||
1058=10:LIMIT_COMPILE;11:LIMIT_GROUP;14:LIMIT_DOMAIN;18:NTC_IP_RANGE
|
||||
|
||||
unMaatService=3:32;4:96;25:32;28:32;29:32;261:16;262:16;263:16;264:16;265:16;266:16;389:1;390:1;391:1;392:1;393:1;394:1;832:96;
|
||||
unMaatService=3:32;4:96;25:32;28:32;29:32;64:16;65:16;261:16;262:16;263:16;264:16;265:16;266:16;389:1;390:1;391:1;392:1;393:1;394:1;832:96;
|
||||
|
||||
3=0:INLINE_IP_CB
|
||||
4=0:INLINE_IP_CB
|
||||
25=0:INLINE_IP_CB
|
||||
28=0:INLINE_IP_CB
|
||||
29=0:INLINE_IP_CB
|
||||
64=0:NTC_DNS_FAKE_IP_CB
|
||||
65=0:NTC_DNS_RES_STRATEGY
|
||||
261=0:MM_SAMPLE_AUDIO
|
||||
262=0:MM_SAMPLE_VIDEO
|
||||
263=0:MM_SAMPLE_PIC
|
||||
@@ -105,7 +107,7 @@ unMaatService=3:32;4:96;25:32;28:32;29:32;261:16;262:16;263:16;264:16;265:16;266
|
||||
##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个
|
||||
#系统简称对应的redisDBIndex: NTC(1-255):2 MM(256-511):3 PXY(512-767):4 IR(768-1023):5 DK(1024-1279):6 阀门:7
|
||||
#APP 0x400-0x420 目前配置入到NTC系统对应的库中
|
||||
serviceDBIndex=1:2,3,4,6;2:2,3,4,6;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;143:2;144:2;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4;513:4,2;528:4;529:4;544:4;545:4;560:4;561:4;3:2,7;4:2,7;25:2;28:2;29:2;261:3;262:3;263:3;264:3;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:5,7;768:4;1024:2,6;1040:2,6;1041:2,6;1056:2,6;1057:6;1058:6,2
|
||||
serviceDBIndex=1:2,3,4,6;2:2,3,4,6;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;143:2;144:2;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4;513:4,2;528:4;529:4;544:4;545:4;560:4;561:4;3:2,7;4:2,7;25:2;28:2;29:2;64:2;65:2;261:3;262:3;263:3;264:3;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:5,7;768:4;1024:2,6;1040:2,6;1041:2,6;1056:2,6;1057:6;1058:6,2
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user