diff --git a/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java b/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
index 8479133..40fb393 100644
--- a/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
+++ b/src/main/java/com/nis/domain/restful/NtcCollectVoipLog.java
@@ -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() {
diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml
index 971723d..cf008c4 100644
--- a/src/main/resources/commonSources/applicationConfig-parser.xml
+++ b/src/main/resources/commonSources/applicationConfig-parser.xml
@@ -194,7 +194,6 @@
-
@@ -206,7 +205,6 @@
-
diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
index 2dfc020..c913c57 100644
--- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml
+++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml
@@ -202,7 +202,7 @@
EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]
- [cfg_id];\t;[cert_name];\t;[cert_file];\t;[content_length];\t;[is_valid];\t;[redisFile_private_cert_file];\t;[service];\t;[op_time]; 0;\n
+ [cfg_id];\t;[cert_name];\t;[cert_file];\t;[is_valid];\t;[redisFile_private_cert_file];\t;[service];\t;[op_time]; 0;\n
1
@@ -223,7 +223,7 @@
EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]
- [cfg_id];\t;[cert_id];\t;[crl_file];\t;[content_length];\t;[is_valid];\t;[redisFile_private_crl_file];\t;[service];\t;[op_time]; 0;\n
+ [cfg_id];\t;[cert_id];\t;[crl_file];\t;[is_valid];\t;[redisFile_private_crl_file];\t;[service];\t;[op_time]; 0;\n
1