1、接口date类型去掉时区,并将日期格式设置为yyyy-MM-dd HH:mm:ss;

2、添加配置日志总量统计服务接口示例;
3、为DNS响应策略配置(service=65)和DNS欺骗地址(service=65)添加配置文件;
This commit is contained in:
zhangdongxu
2018-06-22 10:48:53 +08:00
parent 2185421a3b
commit ec90d8867b
21 changed files with 560 additions and 159 deletions

View File

@@ -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>

View File

@@ -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>