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

1、VoIp泛收日志查询条件修正；

Browse Source 
2、回调类配置PXY 可信证书配置和PXY证书吊销列表删除多余字段
This commit is contained in:
zhangdongxu
2018-11-07 17:21:53 +08:00
parent 4eb616580e
commit 7887e1b90a
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
View File

@@ -81,7 +81,7 @@ public class NtcCollectVoipLog implements Serializable{
protected String searchRtpDIp;//RTP服务端ip
protected String searchRtpSIp;//RTP客户端ip
protected String searchSipDIp;//SIP服务端ip
protected String searchDipDIp;//SIP客户端ip
protected String searchSipSIp;//SIP客户端ip
protected String searchCapIp;//处理机IP
protected String searchFoundStartTime;//开始发现时间
protected String searchFoundEndTime;//结束发现时间
@@ -394,12 +394,12 @@ public class NtcCollectVoipLog implements Serializable{
this.searchSipDIp = searchSipDIp;
}
@JsonIgnore
public String getSearchDipDIp() {
return searchDipDIp;
public String getSearchSipSIp() {
return searchSipSIp;
}
public void setSearchDipDIp(String searchDipDIp) {
this.searchDipDIp = searchDipDIp;
public void setSearchSipSIp(String searchSipSIp) {
this.searchSipSIp = searchSipSIp;
}
@JsonIgnore
public String getSearchCapIp() {

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

@@ -194,7 +194,6 @@
<t:field fieldType="Number" srcName="certId" dstName="cfg_id" isRequired="true" isCfgId="true"/>
<t:field fieldType="String" srcName="certName" dstName="cert_name" isRequired="true"/>
<t:field fieldType="String" srcName="certFile" dstName="cert_file" isRequired="true"/>
<t:field fieldType="Number" srcName="contentLength" dstName="content_length" isRequired="true"/>
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
<t:field fieldType="String" srcName="certFile" dstName="redisFile_private_cert_file" isRequired="true"/>
@@ -206,7 +205,6 @@
<t:field fieldType="Number" srcName="crlId" dstName="cfg_id" isRequired="true" isCfgId="true"/>
<t:field fieldType="String" srcName="certId" dstName="cert_id" isRequired="true"/>
<t:field fieldType="String" srcName="crlFile" dstName="crl_file" isRequired="true"/>
<t:field fieldType="Number" srcName="contentLength" dstName="content_length" isRequired="true"/>
<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
<t:field fieldType="String" srcName="crlFile" dstName="redisFile_private_crl_file" isRequired="true"/>

4
src/main/resources/maatXml/applicationConfig-maatRedis.xml
View File

@@ -202,7 +202,7 @@
<p:maatType service="640">
<p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[cfg_id];\t;[cert_name];\t;[cert_file];\t;[content_length];\t;[is_valid];\t;[redisFile_private_cert_file];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>
<p:valueExpression>[cfg_id];\t;[cert_name];\t;[cert_file];\t;[is_valid];\t;[redisFile_private_cert_file];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>
</p:expressions>
<p:sequences>
<p:operation>1</p:operation>
@@ -223,7 +223,7 @@
<p:maatType service="641">
<p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[cfg_id];\t;[cert_id];\t;[crl_file];\t;[content_length];\t;[is_valid];\t;[redisFile_private_crl_file];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>
<p:valueExpression>[cfg_id];\t;[cert_id];\t;[crl_file];\t;[is_valid];\t;[redisFile_private_crl_file];\t;[service];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>
</p:expressions>
<p:sequences>
<p:operation>1</p:operation>