Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

src/main/java/com/nis/domain/PageLog.java

@@ -34,7 +34,7 @@ public class PageLog<T> {
 	
 	private long count;// 总记录数，设置为“-1”表示不查询总数
 	private int first;// 首页索引
-//	private int last;// 尾页索引
+	private int last;// 尾页索引
 	private int prev;// 上一页索引
 	private int next;// 下一页索引
 	
@@ -42,8 +42,8 @@ public class PageLog<T> {
 	private boolean firstPage;//是否是第一页
 	private boolean lastPage;//是否是最后一页
 
-//	private int length = 8;// 显示页面长度
-//	private int slider = 1;// 前后显示页面长度
+	private int length = 8;// 显示页面长度
+	private int slider = 1;// 前后显示页面长度
 	
 	private List<T> list = new ArrayList<T>();
 	
@@ -266,7 +266,49 @@ public class PageLog<T> {
 				
 		//1
 		this.first = 1;
-		
+		// 控制接口是否启用count last
+		if (this.count!=0) {
+			this.last = (int)(count / (this.pageSize < 1 ? 20 : this.pageSize) + first - 1);
+			
+			if (this.count % this.pageSize != 0 || this.last == 0) {
+				this.last++;
+			}
+
+			if (this.last < this.first) {
+				this.last = this.first;
+			}
+			
+			if (this.pageNo <= 1) {
+				this.pageNo = this.first;
+				this.firstPage=true;
+			}
+
+			if (this.pageNo >= this.last) {
+				this.pageNo = this.last;
+				this.lastPage=true;
+			}
+
+			if (this.pageNo < this.last - 1) {
+				this.next = this.pageNo + 1;
+			} else {
+				this.next = this.last;
+			}
+
+			if (this.pageNo > 1) {
+				this.prev = this.pageNo - 1;
+			} else {
+				this.prev = this.first;
+			}
+			
+			//2
+			if (this.pageNo < this.first) {// 如果当前页小于首页
+				this.pageNo = this.first;
+			}
+
+			if (this.pageNo > this.last) {// 如果当前页大于尾页
+				this.pageNo = this.last;
+			}
+		}else {
 		//首页
 		if (this.pageNo <= 1) {
 			this.pageNo = this.first;
@@ -293,7 +335,7 @@ public class PageLog<T> {
 		if (this.pageNo < this.first) {// 如果当前页小于首页
 			this.pageNo = this.first;
 		}
-
+	}
 		
 	}
 	
@@ -303,14 +345,92 @@ public class PageLog<T> {
 	 */
 	@Override
 	public String toString() {
-		
+		StringBuilder sb = new StringBuilder();
+		// 控制接口返回count last 切换分页
+		if (this.count!=0) {
+			if(list != null && list.isEmpty()) {
+				return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
+			}
+			if (pageNo == first) {// 如果是首页
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			}
 
+			int begin = pageNo - (length / 2);
+
+			if (begin < first) {
+				begin = first;
+			}
+
+			int end = begin + length - 1;
+
+			if (end >= last) {
+				end = last;
+				begin = end - length + 1;
+				if (begin < first) {
+					begin = first;
+				}
+			}
+
+			if (begin > first) {
+				int i = 0;
+				for (i = first; i < first + slider && i < begin; i++) {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+				if (i < begin) {
+					sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				}
+			}
+
+			for (int i = begin; i <= end; i++) {
+				if (i == pageNo) {
+					sb.append("<li class=\"active\"><a href=\"javascript:\">" + (i + 1 - first)
+							+ "</a></li>\n");
+				} else {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+			}
+
+			if (last - end > slider) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				end = last - slider;
+			}
+
+			for (int i = end + 1; i <= last; i++) {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+						+ (i + 1 - first) + "</a></li>\n");
+			}
+
+			if (pageNo == last) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
+						+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			}
+
+			sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
+			sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
+			sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
+			sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
+
+			sb.insert(0,"<ul>\n").append("</ul>\n");
+			
+			sb.append("<div style=\"clear:both;\"></div>");
+
+//			sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
+			
+		}else {
+		
 		if(list != null && list.isEmpty()&&pageNo<=1) {
 			return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
 		}
 		
 
-		StringBuilder sb = new StringBuilder();
 		
 		sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+first+","+pageSize+",'"+funcParam+"');\">"+requestContext.getMessage("firstPage")+"</a></li>\n");
 		if (pageNo == first) {// 如果是首页
@@ -335,7 +455,7 @@ public class PageLog<T> {
 		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
 		sb.append("<div style=\"clear:both;\"></div>");
-
+		}
 		return sb.toString();
 	}
 	
@@ -413,7 +533,21 @@ public class PageLog<T> {
 		return first;
 	}
 
-
+	/**
+	 * 尾页索引
+	 * @return
+	 */
+	public int getLast() {
+		return last;
+	}
+	/**
+	 * 获取页面总数
+	 * @return getLast();
+	 */
+	@JsonIgnore
+	public int getTotalPage() {
+		return getLast();
+	}
 	/**
 	 * 是否为第一页
 	 * @return

src/main/java/com/nis/domain/callback/ProxyObjTrustedCa.java

@@ -0,0 +1,132 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjTrustedCa {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer certId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String certFile;
+	@Expose
+	private String certName;
+	@Expose
+	private Integer crlId; //crlId compileId crl使用
+	@Expose
+	private String crlFile;//crlFile crl使用
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	public String getCertName() {
+		return certName;
+	}
+	public void setCertName(String certName) {
+		this.certName = certName;
+	}
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyObjTrustedCaCrl.java

@@ -0,0 +1,115 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjTrustedCaCrl {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Long certId; //cert compileId
+	@Expose
+	private Integer crlId; //cert compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String crlFile;
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	public Long getCertId() {
+		return certId;
+	}
+	public void setCertId(Long certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/configuration/AppFeatureIndex.java

@@ -29,7 +29,7 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	private static final long serialVersionUID = -8069201965300255275L;
 	private static final String tableName="app_feature_index";
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
-	@ExcelField(title="social_app",sort=2)
+	@ExcelField(title="social_app",sort=3)
 	private String appName;
 	private Integer specServiceId;
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code

src/main/java/com/nis/domain/configuration/AppStringFeatureCfg.java

@@ -26,28 +26,64 @@ public class AppStringFeatureCfg extends BaseCfg<AppStringFeatureCfg> {
 	private static final long serialVersionUID = 8677301658049443801L;
 	private static final String tableName="app_string_feature_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	private Integer compileId;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
 	private String bytes;
+	@ExcelField(title="URL",sort=201)
 	private String cfgKeywords;
 	private String appName;
 
+	/**
+	 * 表达式类型
+	 */
 	@Expose
-	@ExcelField(title="expression_type")
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202)
 	@SerializedName("exprType")
 	protected Integer exprType ;
-
+	/**
+	 * 匹配方式
+	 */
 	@Expose
-	@ExcelField(title="match_method")
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=203)
 	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
-
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=204)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=205)
+	protected Integer isCaseInsenstive;
+	/**
+	 * 是否hex二进制
+	 */
 	@Expose
-	@ExcelField(title="whether_hexbinary")
 	@SerializedName("isHexbin")
 	protected Integer isHexbin;
+	
+	
+
+	public Integer getIsHex() {
+		return isHex;
+	}
+
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
 
 	public Integer getExprType() {
 		return exprType;

src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java

@@ -24,6 +24,7 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 	
 	private static final String tableName="app_topic_domain_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	private Integer compileId;
 	@Expose
 	private String ratelimit;

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -72,7 +72,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * GK类型
 	 */
 	@Expose
-	@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
+	@ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
 	protected Integer action;
 	/**
 	 * 有效标识

src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java

@@ -0,0 +1,40 @@
+package com.nis.domain.configuration;
+
+
+/**
+ * 可信证书
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_cert";
+	private String issuer; //颁发者
+	private String certFile; 
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}

src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCrl.java

@@ -0,0 +1,49 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 吊销证书列表
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCrl extends BaseCfg<PxyObjTrustedCaCrl> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_crl";
+	private String issuer; //颁发者
+	private Integer certId; //证书Id 默认证书为空
+	private String crlFile; //crlFile
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}

src/main/java/com/nis/domain/log/NtcCollectVoipLog.java

@@ -0,0 +1,438 @@
+package com.nis.domain.log;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * 
+ * @ClassName:NtcCollectVoipLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author zdx
+ * @date 2018年11月5日 下午5:50:18
+ * @version V1.0
+ */
+public class NtcCollectVoipLog<T> extends BaseEntity<T> {
+
+	private static final long serialVersionUID = -2189520672838652485L;
+
+	@ApiModelProperty(value = "节目ID", required = true)
+	protected String pid;
+
+	@ApiModelProperty(value = "发现时间", required = true)
+	protected Date foundTime;
+	@ApiModelProperty(value = "接收时间", required = true)
+	protected Date recvTime;
+	@ApiModelProperty(value = "处理机IP", required = true)
+	protected String capIp;
+	@ApiModelProperty(value = "VOIP协议", required = true)
+	protected String voipProtocol;
+	@ApiModelProperty(value = "RTP服务端ip地址", required = true)
+	protected String rtpDIp;
+	@ApiModelProperty(value = "RTP客户端ip地址", required = true)
+	protected String rtpSIp;
+	@ApiModelProperty(value = "RTP服务端端口", required = true)
+	protected Integer rtpDPort;
+	@ApiModelProperty(value = "RTP客户端端口", required = true)
+	protected Integer rtpSPort;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器IP", required = true)
+	protected String fromToStoreIp;
+	@ApiModelProperty(value = "主叫VOIP语音文件存放服务器URL", required = true)
+	protected String fromToStoreUrl;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器IP", required = true)
+	protected String toFromStoreIp;
+	@ApiModelProperty(value = "被叫VOIP语音文件存放服务器URL", required = true)
+	protected String toFromStoreUrl;
+	@ApiModelProperty(value = "VOIP通话时长（秒）", required = true)
+	protected String duation;
+	@ApiModelProperty(value = "SIP服务端ip地址", required = true)
+	protected String sipDIp;
+	@ApiModelProperty(value = "SIP客户端ip地址", required = true)
+	protected String sipSIp;
+	@ApiModelProperty(value = "SIP服务端端口", required = true)
+	protected Integer sipDPort;
+	@ApiModelProperty(value = "SIP客户端端口", required = true)
+	protected Integer sipSPort;
+	@ApiModelProperty(value = "SIP会话ID", required = true)
+	protected String callId;
+	@ApiModelProperty(value = "SIP请求URI", required = true)
+	protected String requestUri;
+	@ApiModelProperty(value = "SIP主叫VOIP账号", required = true)
+	protected String callingAccount;
+	@ApiModelProperty(value = "SIP被叫VOIP账号", required = true)
+	protected String calledAccount;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String contacts;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String via;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String route;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String recordRoute;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String userAgent;
+	@ApiModelProperty(value = "SIP相应字段", required = true)
+	protected String server;
+	
+	
+	protected Integer functionId;
+	protected Integer action;
+	
+	protected String date;//配置界面日志总量查询时间
+	protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识
+	protected String orderBy;//排序参数
+	
+	protected String searchVoipProtocol;//协议类型
+	protected String searchRtpDIp;//RTP服务端ip
+	protected String searchRtpSIp;//RTP客户端ip
+	protected String searchSipDIp;//SIP服务端ip
+	protected String searchSipSIp;//SIP客户端ip
+	protected String searchCapIp;//处理机IP
+	protected String searchFoundStartTime;//开始发现时间
+	protected String searchFoundEndTime;//结束发现时间
+	
+	public NtcCollectVoipLog() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @return the voipProtocol
+	 */
+	public String getVoipProtocol() {
+		return voipProtocol;
+	}
+
+	/**
+	 * @param voipProtocol
+	 *            the voipProtocol to set
+	 */
+	public void setVoipProtocol(String voipProtocol) {
+		this.voipProtocol = voipProtocol;
+	}
+
+	public String getDuation() {
+		return duation;
+	}
+
+	public void setDuation(String duation) {
+		this.duation = duation;
+	}
+
+	public String getCallingAccount() {
+		return callingAccount;
+	}
+
+	public void setCallingAccount(String callingAccount) {
+		this.callingAccount = callingAccount;
+	}
+
+	public String getCalledAccount() {
+		return calledAccount;
+	}
+
+	public void setCalledAccount(String calledAccount) {
+		this.calledAccount = calledAccount;
+	}
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public Date getFoundTime() {
+		return foundTime;
+	}
+
+	public void setFoundTime(Date foundTime) {
+		this.foundTime = foundTime;
+	}
+
+	public Date getRecvTime() {
+		return recvTime;
+	}
+
+	public void setRecvTime(Date recvTime) {
+		this.recvTime = recvTime;
+	}
+
+	public String getCapIp() {
+		return capIp;
+	}
+
+	public void setCapIp(String capIp) {
+		this.capIp = capIp;
+	}
+
+	public String getRtpDIp() {
+		return rtpDIp;
+	}
+
+	public void setRtpDIp(String rtpDIp) {
+		this.rtpDIp = rtpDIp;
+	}
+
+	public String getRtpSIp() {
+		return rtpSIp;
+	}
+
+	public void setRtpSIp(String rtpSIp) {
+		this.rtpSIp = rtpSIp;
+	}
+
+	public Integer getRtpDPort() {
+		return rtpDPort;
+	}
+
+	public void setRtpDPort(Integer rtpDPort) {
+		this.rtpDPort = rtpDPort;
+	}
+
+	public Integer getRtpSPort() {
+		return rtpSPort;
+	}
+
+	public void setRtpSPort(Integer rtpSPort) {
+		this.rtpSPort = rtpSPort;
+	}
+
+	public String getFromToStoreIp() {
+		return fromToStoreIp;
+	}
+
+	public void setFromToStoreIp(String fromToStoreIp) {
+		this.fromToStoreIp = fromToStoreIp;
+	}
+
+	public String getFromToStoreUrl() {
+		return fromToStoreUrl;
+	}
+
+	public void setFromToStoreUrl(String fromToStoreUrl) {
+		this.fromToStoreUrl = fromToStoreUrl;
+	}
+
+	public String getToFromStoreIp() {
+		return toFromStoreIp;
+	}
+
+	public void setToFromStoreIp(String toFromStoreIp) {
+		this.toFromStoreIp = toFromStoreIp;
+	}
+
+	public String getToFromStoreUrl() {
+		return toFromStoreUrl;
+	}
+
+	public void setToFromStoreUrl(String toFromStoreUrl) {
+		this.toFromStoreUrl = toFromStoreUrl;
+	}
+
+	public String getSipDIp() {
+		return sipDIp;
+	}
+
+	public void setSipDIp(String sipDIp) {
+		this.sipDIp = sipDIp;
+	}
+
+	public String getSipSIp() {
+		return sipSIp;
+	}
+
+	public void setSipSIp(String sipSIp) {
+		this.sipSIp = sipSIp;
+	}
+
+	public Integer getSipDPort() {
+		return sipDPort;
+	}
+
+	public void setSipDPort(Integer sipDPort) {
+		this.sipDPort = sipDPort;
+	}
+
+	public Integer getSipSPort() {
+		return sipSPort;
+	}
+
+	public void setSipSPort(Integer sipSPort) {
+		this.sipSPort = sipSPort;
+	}
+
+	public String getCallId() {
+		return callId;
+	}
+
+	public void setCallId(String callId) {
+		this.callId = callId;
+	}
+
+	public String getRequestUri() {
+		return requestUri;
+	}
+
+	public void setRequestUri(String requestUri) {
+		this.requestUri = requestUri;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getVia() {
+		return via;
+	}
+
+	public void setVia(String via) {
+		this.via = via;
+	}
+
+	public String getRoute() {
+		return route;
+	}
+
+	public void setRoute(String route) {
+		this.route = route;
+	}
+
+	public String getRecordRoute() {
+		return recordRoute;
+	}
+
+	public void setRecordRoute(String recordRoute) {
+		this.recordRoute = recordRoute;
+	}
+
+	public String getUserAgent() {
+		return userAgent;
+	}
+
+	public void setUserAgent(String userAgent) {
+		this.userAgent = userAgent;
+	}
+
+	public String getServer() {
+		return server;
+	}
+
+	public void setServer(String server) {
+		this.server = server;
+	}
+	@JsonIgnore
+	public String getSearchVoipProtocol() {
+		return searchVoipProtocol;
+	}
+
+	public void setSearchVoipProtocol(String searchVoipProtocol) {
+		this.searchVoipProtocol = searchVoipProtocol;
+	}
+	@JsonIgnore
+	public String getSearchRtpDIp() {
+		return searchRtpDIp;
+	}
+
+	public void setSearchRtpDIp(String searchRtpDIp) {
+		this.searchRtpDIp = searchRtpDIp;
+	}
+	@JsonIgnore
+	public String getSearchRtpSIp() {
+		return searchRtpSIp;
+	}
+
+	public void setSearchRtpSIp(String searchRtpSIp) {
+		this.searchRtpSIp = searchRtpSIp;
+	}
+	@JsonIgnore
+	public String getSearchSipDIp() {
+		return searchSipDIp;
+	}
+
+	public void setSearchSipDIp(String searchSipDIp) {
+		this.searchSipDIp = searchSipDIp;
+	}
+	
+	public String getSearchSipSIp() {
+		return searchSipSIp;
+	}
+
+	public void setSearchSipSIp(String searchSipSIp) {
+		this.searchSipSIp = searchSipSIp;
+	}
+
+	@JsonIgnore
+	public String getSearchCapIp() {
+		return searchCapIp;
+	}
+
+	public void setSearchCapIp(String searchCapIp) {
+		this.searchCapIp = searchCapIp;
+	}
+	@JsonIgnore
+	public String getSearchFoundStartTime() {
+		return searchFoundStartTime;
+	}
+
+	public void setSearchFoundStartTime(String searchFoundStartTime) {
+		this.searchFoundStartTime = searchFoundStartTime;
+	}
+
+	@JsonIgnore
+	public String getSearchFoundEndTime() {
+		return searchFoundEndTime;
+	}
+
+	public void setSearchFoundEndTime(String searchFoundEndTime) {
+		this.searchFoundEndTime = searchFoundEndTime;
+	}
+
+	public Integer getFunctionId() {
+		return functionId;
+	}
+
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+
+	public Integer getAction() {
+		return action;
+	}
+
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+
+	public String getDate() {
+		return date;
+	}
+
+	public void setDate(String date) {
+		this.date = date;
+	}
+
+	public String getIsLogTotalSearch() {
+		return isLogTotalSearch;
+	}
+
+	public void setIsLogTotalSearch(String isLogTotalSearch) {
+		this.isLogTotalSearch = isLogTotalSearch;
+	}
+
+	public String getOrderBy() {
+		return orderBy;
+	}
+
+	public void setOrderBy(String orderBy) {
+		this.orderBy = orderBy;
+	}
+	
+}

src/main/java/com/nis/util/ConfigDictUtils.java

@@ -1,5 +1,6 @@
 package com.nis.util;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -14,10 +15,12 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.web.dao.SysDictDao;
 import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
+import com.nis.web.dao.configuration.PxyObjKeyringDao;
 import com.nis.web.dao.configuration.WebsiteCfgDao;
 import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.service.SpringContextHolder;
@@ -37,6 +40,7 @@ public class ConfigDictUtils {
 	private final static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
 	private final static SpecificServiceCfgDao specificServiceCfgDao = SpringContextHolder.getBean(SpecificServiceCfgDao.class);
 	private final static WebsiteCfgDao websiteCfgDao = SpringContextHolder.getBean(WebsiteCfgDao.class);
+	private final static PxyObjKeyringDao pxyObjKeyringDao = SpringContextHolder.getBean(PxyObjKeyringDao.class);
 
 	/**
 	 * 根据主键查询配置详情
@@ -177,4 +181,26 @@ public class ConfigDictUtils {
 		}
 		return httpBodyKeyword;
 	}
+	/**
+	 * 根据compileId获取配置内容
+	 * @param compileId
+	 * @return
+	 */
+	public static String getTrustedCrlByCerId(Integer certId ) {
+		String crlFIle="";
+		try {
+			if(!StringUtil.isEmpty(certId)){
+				PxyObjTrustedCaCrl crl=new PxyObjTrustedCaCrl();
+				crl.setCertId(certId);
+				crl=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crl);
+				if(crl != null ){
+					crlFIle=crl.getCrlFile();
+				}
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return crlFIle;
+	}
 }

src/main/java/com/nis/util/Constants.java

@@ -442,6 +442,7 @@ public final class Constants {
 	public static final String NTC_MMFACE_RECOGNIZATION_LOG = Configurations.getStringProperty("mmFaceRecognizationLog", "");
 	public static final String NTC_MMSAMPLEVOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", "");
 	public static final String PXY_HTTP_LOG = Configurations.getStringProperty("pxyHttpLog", "");
+	public static final String NTC_COLLECT_VOIP_LOG = Configurations.getStringProperty("ntcCollectVoipLog", "");
 	
 	//报表类型,1-	配置命中总量业务
 	public static final Integer BUSINESSTYPE_CONFIG=Configurations.getIntProperty("businesstype_config", 1);

src/main/java/com/nis/web/controller/BaseController.java

@@ -831,7 +831,7 @@ public class BaseController {
 		if (entry.getCfgId() != null) {
 			params.put("searchCfgId", entry.getCfgId());
 		}
-		if (entry.getOrderBy() != null&&entry.getOrderBy()!="") {
+		if (StringUtils.isNotBlank(entry.getOrderBy())) {
 			params.put("orderBy", entry.getOrderBy());
 		}
 	}

src/main/java/com/nis/web/controller/SystemController.java

@@ -1,11 +1,20 @@
 package com.nis.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.nis.domain.SysMenu;
+import com.nis.util.StringUtil;
+import com.nis.web.security.UserUtils;
+
+@Controller
 @RequestMapping("${adminPath}/sys/")
 public class SystemController  extends BaseController{
 	
@@ -14,7 +23,76 @@ public class SystemController  extends BaseController{
 		return "/sys/sysIndex";
 	}
 	
-	
+	@RequestMapping("help")
+	public String help(HttpServletRequest request, HttpServletResponse response,ModelMap model){
+		List<SysMenu> menuList = UserUtils.getMenuList();
+		List<SysMenu>  newList = new ArrayList();
+		for(SysMenu menu:menuList){
+			if(menu.getIsTop()==1 && !StringUtil.isEmpty(menu.getChildren())){
+				boolean topShow = false;
+				for(SysMenu second:menu.getChildren()){
+					boolean secondShow = false;
+					if(!StringUtil.isEmpty(second.getChildren())&&second.getIsShow()==1){
+						for(SysMenu third:second.getChildren()){
+							boolean thirdShow = false;
+							if(!StringUtil.isEmpty(third.getChildren())&&third.getIsShow()==1){
+								for(SysMenu fourth:third.getChildren()){
+									if(!StringUtil.isEmpty(fourth.getMenuBg())&&fourth.getIsShow()==1){
+										newList.add(fourth);
+										thirdShow = true;
+										secondShow = true;
+									}
+								}
+							}else{
+								if(!StringUtil.isEmpty(third.getMenuBg())&&third.getIsShow()==1){
+									thirdShow = true;
+									secondShow = true;
+								}
+							}
+							if(thirdShow){
+								newList.add(third);
+							}
+						}
+						
+						if(secondShow){
+							newList.add(second);
+							topShow = true;
+						}
+						
+					}else{
+						if(!StringUtil.isEmpty(second.getMenuBg())&&second.getIsShow()==1){
+							topShow = true;
+						}
+					}
+				}
+				if(topShow){
+					newList.add(menu);
+				}
+				
+			}
+			
+			/*if(menu.getChildren()!=null && menu.getChildren().size()>0 && menu.getIsShow()==1){
+				newList.add(menu);
+			}else if(menu.getMenuBg()!=null && !"".equals(menu.getMenuBg())){
+				newList.add(menu);
+			}else if(menu.getId()==1){
+				newList.add(menu);
+			}*/
+			
+			/*if((menu.getParentIds().startsWith("0,1,86,") 
+					|| menu.getId()==86
+					||menu.getId()==0
+					||menu.getId()==1)
+					&& menu.getIsShow()==1
+					){
+				System.out.println(menu.getParentIds());
+				newList.add(menu);
+			}*/
+			
+		}
+		model.addAttribute("menuList",newList);
+		return "/help";
+	}
 	
 
 }

src/main/java/com/nis/web/controller/basics/AsnIpController.java

@@ -163,13 +163,8 @@ public class AsnIpController extends BaseController{
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<AsnIpCfg> pageInfo=new Page<AsnIpCfg>(request, response,"r");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<AsnIpCfg> page = asnIpCfgService.findPage(pageInfo, entity);
 				for (AsnIpCfg asnIp : page.getList()) {
 					asnIp.setIsIssued(String.valueOf(asnIp.getIsValid()));

src/main/java/com/nis/web/controller/configuration/AppCfgController.java

@@ -1279,15 +1279,15 @@ public class AppCfgController extends BaseController {
 	public String updateAppTopicDomainCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
 		try {
 			appCfgService.updateAppTopicDomainCfgValid(isValid,ids,functionId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("app主题网站删除失败",e);
 			if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
 				e.printStackTrace();
-				addMessage(redirectAttributes,"request_service_failed");
+				addMessage(redirectAttributes,"error","request_service_failed");
 			}else {
 				e.printStackTrace();
-				addMessage(redirectAttributes,"delete_failed");
+				addMessage(redirectAttributes,"error","delete_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+functionId;
@@ -1360,7 +1360,7 @@ public class AppCfgController extends BaseController {
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
 			}else {
-				addMessage(redirectAttributes,"save_failed");
+				addMessage(redirectAttributes,"error","save_failed");
 			}
 		}
 		
@@ -1427,7 +1427,7 @@ public class AppCfgController extends BaseController {
 	
 	//ip配置导出
 			@RequestMapping(value = "exportIpAddr")
-			public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -1445,13 +1445,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
 						for(AppPolicyCfg policy:page.getList()){
 							SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -1515,14 +1510,14 @@ public class AppCfgController extends BaseController {
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("ip addr export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
 		
 			//top
 			@RequestMapping(value = "exportTop")
-			public void exporttop(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportTop(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")AppTopicDomainCfg entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -1540,13 +1535,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppTopicDomainCfg> pageInfo=new Page<AppTopicDomainCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppTopicDomainCfg> page = appCfgService.findAppTopicDomainList(pageInfo, entity);
 						for (int i = 0; i < page.getList().size(); i++) {
 							AppTopicDomainCfg appTop=page.getList().get(i);
@@ -1555,21 +1545,21 @@ public class AppCfgController extends BaseController {
 						}
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class);
-						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("top export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
 			
 			//appIp配置导出
 			@RequestMapping(value = "exportAppIp")
-			public void exportAppip(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportAppIp(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")AppIpCfg entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -1589,13 +1579,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppIpCfg> pageInfo=new Page<AppIpCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppIpCfg> page = appCfgService.findAppIpList(pageInfo, entity);
 						for(AppIpCfg appIp:page.getList()){
 							SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId());
@@ -1603,14 +1588,14 @@ public class AppCfgController extends BaseController {
 						}
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), AppIpCfg.class);
-						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("appIp export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -1637,13 +1622,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppHttpCfg> pageInfo=new Page<AppHttpCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppHttpCfg> page = appCfgService.findAppHttpList(pageInfo, entity);
 						for(AppHttpCfg http:page.getList()){
 							http.setIsHex(http.getIsHexbin());
@@ -1655,14 +1635,14 @@ public class AppCfgController extends BaseController {
 						
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), AppHttpCfg.class);
-						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("http export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -1689,13 +1669,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppDomainCfg> pageInfo=new Page<AppDomainCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppDomainCfg> page = appCfgService.findAppDomainList(pageInfo, entity);
 						for(AppDomainCfg domain:page.getList()){
 							domain.setIsHex(domain.getIsHexbin());
@@ -1706,14 +1681,14 @@ public class AppCfgController extends BaseController {
 						
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), AppDomainCfg.class);
-						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
-					logger.error("http export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					logger.error("Domain export failed",e);
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -1740,13 +1715,8 @@ public class AppCfgController extends BaseController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<AppSslCertCfg> pageInfo=new Page<AppSslCertCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<AppSslCertCfg> page = appCfgService.findAppSslList(pageInfo, entity);
 						for(AppSslCertCfg ssl:page.getList()){
 							ssl.setIsHex(ssl.getIsHexbin());
@@ -1757,14 +1727,14 @@ public class AppCfgController extends BaseController {
 						}
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), AppSslCertCfg.class);
-						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+						String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("App ssl export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}

src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java

@@ -260,7 +260,7 @@ public class AppFeatureCfgController extends BaseController {
 	
 	//appfeature配置导出
 	@RequestMapping(value = "exportFeature")
-	public void exportAppSsl(Model model,HttpServletRequest  request,HttpServletResponse response,
+	public void exportFeature(Model model,HttpServletRequest  request,HttpServletResponse response,
 			@ModelAttribute("cfg")AppFeatureIndex entity,String ids,RedirectAttributes redirectAttributes){
 		try {
 			//export data info
@@ -280,24 +280,19 @@ public class AppFeatureCfgController extends BaseController {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<AppFeatureIndex> pageInfo=new Page<AppFeatureIndex>(request, response,"r");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(pageInfo, entity);
 				for(AppFeatureIndex feature:page.getList()){
 					SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());
 					feature.setAppName(app.getSpecServiceName());
 				}
-				String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,action,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
-				String appComplexNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+				String cfgIndexInfoNoExport=",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+				String appComplexNoExport=",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
 						+ ",config_time,editor,edit_time,auditor,audit_time"
 						+",letter,whether_area_block,classification,attribute,label"
 						+",userregion1,userregion2,userregion3,userregion4,userregion5,";
-				String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+				String ipPortInfoNoExport=",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
 						+ ",config_time,editor,edit_time,auditor,audit_time"
 						+",letter,whether_area_block,classification,attribute,label"
 						+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
@@ -306,52 +301,59 @@ public class AppFeatureCfgController extends BaseController {
 				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 				List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
 				List<AppComplexFeatureCfg> keywordList=new ArrayList<AppComplexFeatureCfg>();
+				List<AppStringFeatureCfg> strList=new ArrayList<AppStringFeatureCfg>();
 				for (AppFeatureIndex cfg : page.getList()) {
 					 Map<String, List> maps=appMultiFeatureCfgService.exportFeature(cfg);
-					 keywordList.addAll(maps.get("APP_KEYWORDS"));
+					 if(entity.getFunctionId()!=567){
+						 keywordList.addAll(maps.get("APP_KEYWORDS"));
+					 }else{
+						 strList.addAll(maps.get("APP_DK_GL"));
+					 }
 					 ipList.addAll(maps.get("APP_IP_RANGE"));
 				}
-				keywordList=replaceKeyList(keywordList);
 				dataMap.put(entity.getMenuNameCode(), page.getList());
 				if(entity.getFunctionId()!=564 && entity.getFunctionId()!=567 ){
+					keywordList=replaceKeyList(keywordList);
 					titleList.add("APP_IP_RANGE");
 					classMap.put("APP_IP_RANGE", IpPortCfg.class);
 					noExportMap.put("APP_IP_RANGE",ipPortInfoNoExport);
 					dataMap.put("APP_IP_RANGE", ipList);
-					if(entity.getFunctionId()==563){
+				}
+				if(entity.getFunctionId()==563){
 						titleList.add("APP_PAYLOAD");
 						classMap.put("APP_PAYLOAD", AppComplexFeatureCfg.class);
 						noExportMap.put("APP_PAYLOAD",appComplexNoExport);
 						dataMap.put("APP_PAYLOAD", keywordList);
-					}else if(entity.getFunctionId()==565){
+				}else if(entity.getFunctionId()==565){
 						titleList.add("APP_HTTP");
 						classMap.put("APP_HTTP", AppComplexFeatureCfg.class);
 						noExportMap.put("APP_HTTP",appComplexNoExport);
 						dataMap.put("APP_HTTP", keywordList);
-					}else if(entity.getFunctionId()==566){
+				}else if(entity.getFunctionId()==566){
 						titleList.add("APP_SSL");
 						classMap.put("APP_SSL", AppComplexFeatureCfg.class);
 						noExportMap.put("APP_SSL",appComplexNoExport);
 						dataMap.put("APP_SSL", keywordList);
-					}else if(entity.getFunctionId()==564){
+				}else if(entity.getFunctionId()==564){
+						keywordList=replaceKeyList(keywordList);
 						titleList.add("APP_DNS");
 						classMap.put("APP_DNS", AppComplexFeatureCfg.class);
 						noExportMap.put("APP_DNS",appComplexNoExport);
 						dataMap.put("APP_DNS", keywordList);
-					}else if(entity.getFunctionId()==567){
+				}else if(entity.getFunctionId()==567){
+						strList=replaceFeatureList(strList);
 						appComplexNoExport=appComplexNoExport+"district,";
-						titleList.add("APP_DK_GL");
-						classMap.put("APP_DK_GL", AppComplexFeatureCfg.class);
-						noExportMap.put("APP_DK_GL",appComplexNoExport);
-						dataMap.put("APP_DK_GL", keywordList);
-					}
+						titleList.add("APP_DK");
+						classMap.put("APP_DK", AppStringFeatureCfg.class);
+						noExportMap.put("APP_DK",appComplexNoExport);
+						dataMap.put("APP_DK", strList);
 				}
 				
 			/*}*/
 			this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 		} catch (Exception e) {
 			logger.error("Appfeature export failed",e);
-			addMessage(redirectAttributes,  "export_failed");
+			addMessage(redirectAttributes,"error","export_failed");
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
@@ -366,4 +368,15 @@ public class AppFeatureCfgController extends BaseController {
 		return list;
 	}
 	
+	public static List<AppStringFeatureCfg> replaceFeatureList(List<AppStringFeatureCfg> list){
+		for (int i = 0; i < list.size(); i++) {
+			AppStringFeatureCfg  base=(AppStringFeatureCfg)list.get(i);
+			base.setIsHex(base.getIsHexbin());
+			base.setIsCaseInsenstive(base.getIsHexbin());
+			base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
+	 }
+		return list;
+	}
+	
+	
 }

src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java

@@ -201,7 +201,7 @@ public class BasicProtocolController extends BaseController {
 	public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
 		try {
 			appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("基础协议信息保存失败",e);
 			if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
@@ -217,7 +217,7 @@ public class BasicProtocolController extends BaseController {
 	
 	//ip配置导出
 		@RequestMapping(value = "exportIpAddr")
-		public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -235,13 +235,8 @@ public class BasicProtocolController extends BaseController {
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
 					for(AppPolicyCfg policy:page.getList()){
 						SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -284,7 +279,7 @@ public class BasicProtocolController extends BaseController {
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {
 				logger.error("ip addr export failed",e);
-				addMessage(redirectAttributes,  "export_failed");
+				addMessage(redirectAttributes,"error","export_failed");
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java

@@ -234,7 +234,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	
 	//ip配置导出
 	@RequestMapping(value = "exportIpAddr")
-	public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+	public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 			@ModelAttribute("cfg")AppPolicyCfg entity,String ids,RedirectAttributes redirectAttributes){
 		try {
 			//export data info
@@ -252,13 +252,8 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<AppPolicyCfg> pageInfo=new Page<AppPolicyCfg>(request, response,"a");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(pageInfo, entity);
 				for(AppPolicyCfg policy:page.getList()){
 					SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
@@ -322,7 +317,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 			this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 		} catch (Exception e) {
 	 		logger.error("TunnelBehavior export failed",e);
-			addMessage(redirectAttributes,  "export_failed");
+			addMessage(redirectAttributes,"error","export_failed");
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}

src/main/java/com/nis/web/controller/configuration/GroupAreaController.java

@@ -84,10 +84,10 @@ public class GroupAreaController extends BaseController {
 	public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
 		try {
 			groupAreaService.deldete(ids,isValid);
-			addMessage(redirectAttributes, "delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败",e);
-			addMessage(redirectAttributes, "delete_failed");
+			addMessage(redirectAttributes,"error","delete_failed");
 		}
 		return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
 	}

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -63,22 +63,22 @@ public class RequestInfoController extends BaseController{
 				// 保存用户信息
 				logger.info(requestInfo.getId()+"修改成功");
 				requestInfoService.saveOrUpdate(requestInfo);
-				addMessage(redirectAttributes, "save_success");
+				addMessage(redirectAttributes,"success","save_success");
 			}else{
 				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
 					logger.info(requestInfo.getRequestNumber()+"重复数据");
-					addMessage(model, "save_failed");
+					addMessage(model,"error","save_failed");
 					return form(requestInfo, model);
 				}
 				// 保存用户信息
 				requestInfoService.saveOrUpdate(requestInfo);
-				addMessage(redirectAttributes, "save_success");
+				addMessage(redirectAttributes,"success","save_success");
 				logger.info(requestInfo.getId()+"保存成功");
 			}
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			e.printStackTrace();
-			addMessage(model, "save_failed");
+			addMessage(model,"error","save_failed");
 		}
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 	}
@@ -105,7 +105,7 @@ public class RequestInfoController extends BaseController{
     public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
     	requestInfoService.requestExamine(exId);
-    	addMessage(redirectAttributes, "save_success");
+    	addMessage(redirectAttributes,"success","save_success");
     	return "redirect:" + adminPath + "/cfg/request/list?repage";
     	
     }
@@ -119,7 +119,7 @@ public class RequestInfoController extends BaseController{
 	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
 		requestInfoService.requestExamineNo(noId);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success","save_success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
 	}
@@ -133,7 +133,7 @@ public class RequestInfoController extends BaseController{
 	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
 		requestInfoService.requestCancelExamine(canclelId);
-		addMessage(redirectAttributes, "save_success");
+		addMessage(redirectAttributes,"success","save_success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
 	}
@@ -147,7 +147,7 @@ public class RequestInfoController extends BaseController{
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
 		requestInfoService.delete(delId);
-		addMessage(redirectAttributes, "delete_success");
+		addMessage(redirectAttributes,"success","delete_success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
 	}

src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java

@@ -147,13 +147,8 @@ public class DnsIpCfgController extends BaseController {
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<DnsIpCfg> pageInfo=new Page<DnsIpCfg>(request, response,"r");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<DnsIpCfg> page = dnsIpCfgService.findPage(pageInfo, entity);
 					for (int i = 0; i < page.getList().size(); i++) {
 					    if(StringUtil.isEmpty(page.getList().get(i).getDnsStrategyName())){

src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java

@@ -169,13 +169,8 @@ public class DnsResStrategyController extends BaseController  {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<DnsResStrategy> pageInfo=new Page<DnsResStrategy>(request, response,"r");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<DnsResStrategy> page = dnsResStrategyService.findPage(pageInfo, entity);
 				for (int i = 0; i < page.getList().size(); i++) {
 					page.getList().get(i).setMiTtlmax(String.valueOf(page.getList().get(i).getMinTtl())+"-"+String.valueOf(page.getList().get(i).getMaxTtl()));

src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java

@@ -208,7 +208,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 			for(String id :idArray){
 				try {
 					ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
-				} catch (MaatConvertException e) {
+				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("SNAT地址池管理配置下发失败："+e.getMessage());
 					if(e instanceof MaatConvertException) {
@@ -230,10 +230,10 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 			if(!StringUtil.isEmpty(ids)){
 				ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
 			}
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"success","delete_success");
 		}catch(Exception e){
 			logger.error(e);
-			addMessage(redirectAttributes,"delete_failed");
+			addMessage(redirectAttributes,"error","delete_failed");
 		}
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
 	}
@@ -285,13 +285,8 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 					}else{*/
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						Page<IpMultiplexPoolCfg> pageInfo=new Page<IpMultiplexPoolCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(pageInfo, entity);
 						page.setList(ipMultiplexPoolCfgService.getIsp(page.getList()));
 						titleList.add(entity.getMenuNameCode());
@@ -303,7 +298,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("snat export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -329,13 +324,8 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 							}else{*/
 								//条件导出数据大于最大导出数，只导出最大导出条数
 								Page<IpMultiplexPoolCfg> pageInfo=new Page<IpMultiplexPoolCfg>(request, response,"r");
-								if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-									pageInfo.setPageNo(1);
-									pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-								}else{
-									pageInfo.setPageNo(1);
-									pageInfo.setPageSize(-1);
-								}
+								pageInfo.setPageNo(1);
+								pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 								Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(pageInfo, entity);
 								titleList.add(entity.getMenuNameCode());
 								classMap.put(entity.getMenuNameCode(), IpMultiplexPoolCfg.class);
@@ -346,7 +336,7 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 							this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 						} catch (Exception e) {
 							logger.error("dnat export failed",e);
-							addMessage(redirectAttributes,  "export_failed");
+							addMessage(redirectAttributes,"error","export_failed");
 						}
 						//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 					}

src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java

@@ -129,24 +129,19 @@ public class DdosCfgController extends BaseController {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<DdosIpCfg> pageInfo=new Page<DdosIpCfg>(request, response,"r");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), DdosIpCfg.class);
-				String cfgIndexInfoNoExport=",client_ip,client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+				String cfgIndexInfoNoExport=",client_ip,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 				dataMap.put(entity.getMenuNameCode(), page.getList());
 			/*}*/
 			this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 		} catch (Exception e) {
 			logger.error("ddos export failed",e);
-			addMessage(redirectAttributes,  "export_failed");
+			addMessage(redirectAttributes,"error","export_failed");
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -223,13 +223,8 @@ public class IpMultiplexController extends CommonController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<BaseIpCfg> pageInfo=new Page<BaseIpCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
 						for (BaseIpCfg baseIp : page.getList()) {
 							if(StringUtil.isEmpty(baseIp.getGroupName())){
@@ -246,7 +241,7 @@ public class IpMultiplexController extends CommonController {
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("snat export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -274,13 +269,8 @@ public class IpMultiplexController extends CommonController {
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<BaseIpCfg> pageInfo=new Page<BaseIpCfg>(request, response,"r");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<BaseIpCfg> page = ipCfgService.findPage(pageInfo, entity);//
 						for (BaseIpCfg baseIp : page.getList()) {
 							if(StringUtil.isEmpty(baseIp.getGroupName())){
@@ -297,7 +287,7 @@ public class IpMultiplexController extends CommonController {
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("dnat export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}

src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java

@@ -209,7 +209,7 @@ public class AvContentController extends BaseController  {
 			for(String id :idArray){
 				try {
 					avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime);
-				} catch (MaatConvertException e) {
+				} catch ( Exception e) {
 					if(e instanceof MaatConvertException) {
 						e.printStackTrace();
 						logger.error("VOIP配置下发失败："+e.getMessage());;
@@ -563,7 +563,7 @@ public class AvContentController extends BaseController  {
 			,HttpServletResponse response
 			,@ModelAttribute("cfg")CfgIndexInfo entity
 			,RedirectAttributes redirectAttributes){
-		if(entity.getIpPort()== null){
+		/*if(entity.getIpPort()== null){
 			entity.setIpPort(new IpPortCfg());
 		}
 		if(entity.getAvContUrlCfgList()== null){
@@ -571,7 +571,7 @@ public class AvContentController extends BaseController  {
 		}
 		if(entity.getNtcSubscribeIdCfg()==null){
 			entity.setNtcSubscribeIdCfg(new NtcSubscribeIdCfg());
-		}
+		}*/
 		Page<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
 		model.addAttribute("page", page);
 		initPageCondition(model,entity);
@@ -616,11 +616,11 @@ public class AvContentController extends BaseController  {
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
 				logger.error("Stream Media 信息保存失败",e);
-				addMessage(redirectAttributes,"request_service_failed");
+				addMessage(redirectAttributes,"error","request_service_failed");
 			}else {
 				e.printStackTrace();
 				logger.error("Stream Media 信息保存失败",e);
-				addMessage(redirectAttributes,"save_failed");
+				addMessage(redirectAttributes,"error","save_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId();
@@ -902,7 +902,7 @@ public class AvContentController extends BaseController  {
 	
 	//stream配置导出
 	@RequestMapping(value = "exportStream")
-	public void exportsteam(Model model,HttpServletRequest  request,HttpServletResponse response,
+	public void exportStream(Model model,HttpServletRequest  request,HttpServletResponse response,
 			@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 		try {
 			//export data info
@@ -922,13 +922,8 @@ public class AvContentController extends BaseController  {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				if(entity.getIpPort()== null){
 					entity.setIpPort(new IpPortCfg());
 				}
@@ -992,7 +987,7 @@ public class AvContentController extends BaseController  {
 	
 	//voip配置导出
 		@RequestMapping(value = "exportVoip")
-		public void exportvoip(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportVoip(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -1012,13 +1007,8 @@ public class AvContentController extends BaseController  {
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"r");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					if(entity.getIpPort()== null){
 						entity.setIpPort(new IpPortCfg());
 					}

src/main/java/com/nis/web/controller/configuration/ntc/AvController.java

@@ -469,7 +469,7 @@ public class AvController extends BaseController  {
 	
 	//ysp配置导出
 	@RequestMapping(value = "exportYsp")
-	public void exportysp(Model model,HttpServletRequest  request,HttpServletResponse response,
+	public void exportYsp(Model model,HttpServletRequest  request,HttpServletResponse response,
 			@ModelAttribute("cfg")AvFileSampleCfg entity,String ids,RedirectAttributes redirectAttributes){
 		try {
 			//export data info
@@ -489,13 +489,8 @@ public class AvController extends BaseController  {
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<AvFileSampleCfg> pageInfo=new Page<AvFileSampleCfg>(request, response,"a");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class);

src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java

@@ -157,7 +157,7 @@ public class BgpCfgController extends BaseController{
 	
 	//bgp配置导出
 		@RequestMapping(value = "exportbgp")
-		public void exportdns(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportbgp(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -177,13 +177,8 @@ public class BgpCfgController extends BaseController{
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<CfgIndexInfo> page = bgpCfgService.getBgpList(pageInfo, entity);
 					titleList.add(entity.getMenuNameCode());
 					titleList.add("NTC_IP");
@@ -229,7 +224,7 @@ public class BgpCfgController extends BaseController{
 				/*}*/
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {
-				logger.error("dns export failed",e);
+				logger.error("bgp export failed",e);
 				addMessage(redirectAttributes,"error","export_failed");
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();

src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java

@@ -85,11 +85,11 @@ public class FileTransferCfgController  extends BaseController{
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
 				logger.error("ftp信息保存失败",e);
-				addMessage(redirectAttributes,"request_service_failed");
+				addMessage(redirectAttributes,"error","request_service_failed");
 			}else {
 				e.printStackTrace();
 				logger.error("ftp信息保存失败",e);
-				addMessage(redirectAttributes,"save_failed");
+				addMessage(redirectAttributes,"error","save_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
@@ -148,11 +148,11 @@ public class FileTransferCfgController  extends BaseController{
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
 				logger.info("ftp配置删除失败："+e.getMessage());;
-				addMessage(redirectAttributes,"request_service_failed");
+				addMessage(redirectAttributes,"error","request_service_failed");
 			}else {
 				e.printStackTrace();
 				logger.error("ftp配置删除失败",e);
-				addMessage(redirectAttributes,"delete_failed");
+				addMessage(redirectAttributes,"error","delete_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+functionId;
@@ -171,16 +171,16 @@ public class FileTransferCfgController  extends BaseController{
 			entity.setFunctionId(functionId);
 			try {
 				fileTransferCfgService.auditFtpCfg(entity,isAudit);
-				addMessage(redirectAttributes,"audit_success");
-			} catch (MaatConvertException e) {
+				addMessage(redirectAttributes,"success","audit_success");
+			} catch ( Exception e) {
 				if(e instanceof MaatConvertException) {
 					e.printStackTrace();
 					logger.error("ftp配置下发失败："+e.getMessage());;
-					addMessage(redirectAttributes,"request_service_failed");
+					addMessage(redirectAttributes,"error","request_service_failed");
 				}else {
 					e.printStackTrace();
 					logger.error("ftp配置下发失败",e);
-					addMessage(redirectAttributes,"audit_failed");
+					addMessage(redirectAttributes,"error","audit_failed");
 				}
 			}
 		}
@@ -256,8 +256,6 @@ public class FileTransferCfgController  extends BaseController{
 			}			
 			fileTransferCfgService.saveOrUpdateFileDigestCfg(entity,result,areaCfgIds);
 			addMessage(redirectAttributes,"success","save_success");
-		} catch (MaatConvertException e) {
-			addMessage(redirectAttributes, "request_service_failed");
 		} catch ( Exception e) {
 			if(e instanceof MaatConvertException||e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
@@ -478,7 +476,7 @@ public class FileTransferCfgController  extends BaseController{
 	
 	//ftp配置导出
 			@RequestMapping(value = "exportftp")
-			public void exportdns(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportftp(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -498,13 +496,8 @@ public class FileTransferCfgController  extends BaseController{
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<CfgIndexInfo> page = fileTransferCfgService.getFtpList(pageInfo, entity);
 						titleList.add(entity.getMenuNameCode());
 						titleList.add("NTC_UNIVERSAL_IP");
@@ -559,14 +552,14 @@ public class FileTransferCfgController  extends BaseController{
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("ftp export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
 			
 			//p2p配置导出
 			@RequestMapping(value = "exportP2p")
-			public void exportp2p(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportP2p(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -586,13 +579,8 @@ public class FileTransferCfgController  extends BaseController{
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<CfgIndexInfo> page = fileTransferCfgService.getP2pList(pageInfo, entity);
 						
 						titleList.add(entity.getMenuNameCode());
@@ -652,7 +640,7 @@ public class FileTransferCfgController  extends BaseController{
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("p2p export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}
@@ -660,7 +648,7 @@ public class FileTransferCfgController  extends BaseController{
 			
 			//file配置导出
 			@RequestMapping(value = "exportFile")
-			public void exportfile(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportFile(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")FileDigestCfg entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -680,13 +668,8 @@ public class FileTransferCfgController  extends BaseController{
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<FileDigestCfg> pageInfo=new Page<FileDigestCfg>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<FileDigestCfg> page = fileTransferCfgService.getFileDigestList(pageInfo, entity);
 						titleList.add(entity.getMenuNameCode());
 						classMap.put(entity.getMenuNameCode(), FileDigestCfg.class);
@@ -697,7 +680,7 @@ public class FileTransferCfgController  extends BaseController{
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {
 					logger.error("file export failed",e);
-					addMessage(redirectAttributes,  "export_failed");
+					addMessage(redirectAttributes,"error","export_failed");
 				}
 				//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 			}

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -360,7 +360,7 @@ public class IpController extends BaseController{
 		}
 	//ip配置导出
 		@RequestMapping(value = "exportIpAddr")
-		public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -380,13 +380,8 @@ public class IpController extends BaseController{
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
 					titleList.add(entity.getMenuNameCode());
 					titleList.add("NTC_IP");

src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java

@@ -190,7 +190,7 @@ public class MailCfgController  extends BaseController{
 	
 	//mail配置导出
 		@RequestMapping(value = "exportmail")
-		public void exportdns(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportmail(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -210,13 +210,8 @@ public class MailCfgController  extends BaseController{
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<CfgIndexInfo> page = mailCfgService.getMailList(pageInfo, entity);
 					titleList.add(entity.getMenuNameCode());
 					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
@@ -281,7 +276,7 @@ public class MailCfgController  extends BaseController{
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {
 				logger.error("mail export failed",e);
-				addMessage(redirectAttributes,  "export_failed");
+				addMessage(redirectAttributes,"error","export_failed");
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -557,13 +557,8 @@ public class WebsiteController extends BaseController{
 					}else{*/
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
 						String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
@@ -685,13 +680,8 @@ public class WebsiteController extends BaseController{
 				//条件导出数据大于最大导出数，只导出最大导出条数
 				entity.setTableName(IpPortCfg.getTablename());
 				Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-				if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				}else{
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(-1);
-				}
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 				Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
 				for (int i = 0; i < page.getList().size(); i++) {
 					Properties msgProp = getMsgProp();
@@ -763,7 +753,7 @@ public class WebsiteController extends BaseController{
 	
 	//ssl配置导出
 		@RequestMapping(value = "exportSsl")
-		public String exportssl(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public String exportSsl(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -783,13 +773,8 @@ public class WebsiteController extends BaseController{
 				}else{*/
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(pageInfo, entity);
 					titleList.add(entity.getMenuNameCode());
 					titleList.add("NTC_UNIVERSAL_IP");

src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java

@@ -11,15 +11,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.taglibs.standard.functions.Functions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
@@ -29,7 +25,6 @@ import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.WhiteListIpTemplate;
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
@@ -278,7 +273,7 @@ public class WhiteListController extends CommonController{
 	
 	//ip配置导出
 			@RequestMapping(value = "exportIpAddr")
-			public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+			public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 					@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 				try {
 					//export data info
@@ -298,13 +293,8 @@ public class WhiteListController extends CommonController{
 						//条件导出数据大于最大导出数，只导出最大导出条数
 						entity.setTableName(IpPortCfg.getTablename());
 						Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-						if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-						}else{
-							pageInfo.setPageNo(1);
-							pageInfo.setPageSize(-1);
-						}
+						pageInfo.setPageNo(1);
+						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 						Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
 						titleList.add(entity.getMenuNameCode());
 						titleList.add("NTC_IP");
@@ -354,13 +344,8 @@ public class WhiteListController extends CommonController{
 								//条件导出数据大于最大导出数，只导出最大导出条数
 								entity.setTableName(IpPortCfg.getTablename());
 								Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-								if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-									pageInfo.setPageNo(1);
-									pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-								}else{
-									pageInfo.setPageNo(1);
-									pageInfo.setPageSize(-1);
-								}
+								pageInfo.setPageNo(1);
+								pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 								Page<CfgIndexInfo> page = domainService.getDomainList(pageInfo, entity);
 								titleList.add(entity.getMenuNameCode());
 								titleList.add("NTC_HTTP_URL");

src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java

@@ -251,7 +251,7 @@ public class HttpRedirectPolicyController extends BaseController{
 	
 	//http配置导出
 		@RequestMapping(value = "exportHttp")
-		public String exportHttp(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportHttp(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -271,13 +271,8 @@ public class HttpRedirectPolicyController extends BaseController{
 				}else{*/
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					
 					Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
 					Properties prop = getMsgProp();
@@ -313,7 +308,7 @@ public class HttpRedirectPolicyController extends BaseController{
 					}else if(entity.getFunctionId()==208){
 						cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-";
 					}else if(entity.getFunctionId()==209){
-						cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
+						cfgIndexInfoNoExport=",policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
 					}else if(entity.getFunctionId()==211){
 						cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 					 }
@@ -408,8 +403,8 @@ public class HttpRedirectPolicyController extends BaseController{
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {
 				logger.error("http export failed",e);
-				addMessage(redirectAttributes,  "export_failed");
+				addMessage(redirectAttributes,"error","export_failed");
 			}
-			return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
+			/*return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();*/
 		}
 }

src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java

@@ -147,7 +147,7 @@ public class InterceptController extends CommonController{
 			entity.setFunctionId(functionId);
 			try {
 				interceptCfgService.auditInterceptIpCfg(entity,isAudit);
-				addMessage(redirectAttributes,"audit_success");
+				addMessage(redirectAttributes,"success","audit_success");
 			} catch ( Exception e) {
 				logger.error("intercept ip audit failed",e);
 				if(e instanceof MaatConvertException) {
@@ -164,10 +164,10 @@ public class InterceptController extends CommonController{
 	public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		try {
 			interceptCfgService.updatInterceptValid(isValid,ids,functionId);
-			addMessage(redirectAttributes,"delete_success");
+			addMessage(redirectAttributes,"error","delete_success");
 		} catch (Exception e) {
 			logger.error("intercept ip delete failed",e);
-			addMessage(redirectAttributes,"delete_failed");
+			addMessage(redirectAttributes,"error","delete_failed");
 		}
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
 	}
@@ -196,7 +196,7 @@ public class InterceptController extends CommonController{
 	
 	//ip配置导出
 		@RequestMapping(value = "exportIpAddr")
-		public void exportIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+		public void exportIpAddr(Model model,HttpServletRequest  request,HttpServletResponse response,
 				@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
 			try {
 				//export data info
@@ -217,13 +217,8 @@ public class InterceptController extends CommonController{
 					//条件导出数据大于最大导出数，只导出最大导出条数
 					entity.setTableName(IpPortCfg.getTablename());
 					Page<CfgIndexInfo> pageInfo=new Page<CfgIndexInfo>(request, response,"a");
-					if(pageInfo.getCount()>Constants.MAX_EXPORT_SIZE){
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					}else{
-						pageInfo.setPageNo(1);
-						pageInfo.setPageSize(-1);
-					}
+					pageInfo.setPageNo(1);
+					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
 					Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
 					
 					//获取证书信息
@@ -242,12 +237,21 @@ public class InterceptController extends CommonController{
 						}
 						if(certificateList!=null){
 						if(entity.getFunctionId()==200|| entity.getFunctionId()==201){
+							 if(!StringUtil.isEmpty(str.getUserRegion1())){
+								 boolean flag=false;
 						     for (PxyObjKeyring pxyObjKeyring : certificateList) {
-								 if(str.getUserRegion2().equals(pxyObjKeyring.getCompileId())){
-									 str.setUserRegion2(pxyObjKeyring.getCfgDesc());
-								 }
+								 if(str.getUserRegion1().equals(String.valueOf(pxyObjKeyring.getCompileId()))){
+									 str.setUserRegion1(pxyObjKeyring.getCfgDesc());
+									 flag=true;
+									 break;
+								   }
+						    	 }
+						        if(!flag){
+						        	str.setUserRegion1(null);
+						        }
 						       } 
-							}	
+							}
+						
 						}
 					}
 					titleList.add(entity.getMenuNameCode());
@@ -307,7 +311,7 @@ public class InterceptController extends CommonController{
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {
 				logger.error("ip addr export failed",e);
-				addMessage(redirectAttributes,  "export_failed");
+				addMessage(redirectAttributes,"error","export_failed");
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java

@@ -120,7 +120,11 @@ public class PxyObjKeyringController extends BaseController  {
 		} catch (Exception e) {
 			validFlag=false;
 			logger.error("证书文件校验失败",e);
-			addMessage(redirectAttributes,"error",e.getMessage());
+			if(e instanceof MaatConvertException) {
+ 				addMessage(redirectAttributes,"error","request_service_failed");
+ 			}else {
+ 				addMessage(redirectAttributes,"error","save_failed");
+ 			}
 		}
  		
  		try{
@@ -163,7 +167,11 @@ public class PxyObjKeyringController extends BaseController  {
  		}catch (Exception e) {
  			validFlag=false;
  			logger.error("证书信息获取失败",e);
- 			addMessage(redirectAttributes,"error","save_failed");
+ 			if(e instanceof MaatConvertException) {
+ 				addMessage(redirectAttributes,"error","request_service_failed");
+ 			}else {
+ 				addMessage(redirectAttributes,"error","save_failed");
+ 			}
  		}
  		try{
  			if(validFlag){

src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java

@@ -86,6 +86,29 @@ public class TrafficStatisticsReportController extends BaseController {
 			List accountList=(List) map.get("accountList");
 			model.addAttribute("nasIpList", nasIpList);
 			model.addAttribute("accountList", accountList);
+			if(StringUtil.isBlank(account)&&accountList!=null&&accountList.size()>0&&!"3".equals(searchBusinessType)) {
+				Map accountMap = (Map) accountList.get(0);
+				String firstAccount=(String) accountMap.get("account");
+				String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount);
+				// 指定用户 查询
+				Gson usergson = new GsonBuilder().create();
+				userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
+				userList = (ArrayList) userJsonList.get("data");
+				model.addAttribute("userList", userList);
+				model.addAttribute("searchAccount", firstAccount);
+			}
+			if(StringUtil.isBlank(nasIp)&&nasIpList!=null&&nasIpList.size()>0&&!"2".equals(searchBusinessType)) {
+				Map IpMap = (Map) nasIpList.get(0);
+				String firstIp=(String) IpMap.get("nasIp");
+				String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp);
+				// 指定IP查询
+				Gson ipgson = new GsonBuilder().create();
+				ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
+				ipList = (ArrayList) ipJsonList.get("data");
+				model.addAttribute("ipList", ipList);
+				model.addAttribute("searchNasIp", firstIp);
+				
+			}
 			if("2".endsWith(searchBusinessType)&&!StringUtil.isBlank(account)) {
 				
 				String userString = HttpClientUtil.get(userUrl+"&searchAccount="+account);
@@ -94,6 +117,7 @@ public class TrafficStatisticsReportController extends BaseController {
 				userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
 				userList = (ArrayList) userJsonList.get("data");
 				model.addAttribute("userList", userList);
+				model.addAttribute("searchAccount", account);
 			}
 			if ("3".endsWith(searchBusinessType)&&!StringUtil.isBlank(nasIp)) {
 				String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+nasIp);
@@ -102,13 +126,14 @@ public class TrafficStatisticsReportController extends BaseController {
 				ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
 				ipList = (ArrayList) ipJsonList.get("data");
 				model.addAttribute("ipList", ipList);
+				model.addAttribute("searchNasIp", nasIp);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return "/dashboard/trafficUserBehavior";
 	}
-	public static void main(String[] args) {
+/*	public static void main(String[] args) {
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		HashMap<String, Object> m = new HashMap<String, Object>();
 		List list = new ArrayList();
@@ -128,5 +153,5 @@ public class TrafficStatisticsReportController extends BaseController {
 			e.printStackTrace();
 		}
 	}
-	
+	*/
 }

src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -81,7 +82,8 @@ public class DkBehaviorLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<DkBehaviorLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
+				page.setList(fromJson.getData().getList());
 				List<DkBehaviorLog> list = page.getList();
 				for (DkBehaviorLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/AppLogController.java

@@ -75,7 +75,7 @@ public class AppLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcAppLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcAppLog> list = page.getList();
 				for (NtcAppLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -50,7 +51,7 @@ public class BgpLogController extends BaseController {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
-					page.setList(fromJson.getData().getList());
+					BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 					List<NtcBGPLog> list = page.getList();
 					for (NtcBGPLog l : list) {
 						l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java

@@ -0,0 +1,156 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.NtcCollectVoipLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.CodeDicUtils;
+import com.nis.util.Constants;
+import com.nis.util.DateUtils;
+import com.nis.util.DictUtils;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+import com.nis.web.dao.dashboard.codedic.CodeResult;
+
+@Controller
+@RequestMapping(value = "${adminPath}/log/ntc/ntcCollectVoipLogs")
+public class CollectVoipLogController extends BaseController{
+
+	/**
+	 * voip泛收日志
+	 * @param model
+	 * @param entry
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ClientProtocolException
+	 * @throws IOException
+	 */
+	@RequestMapping(value={"list",""})
+	public String list(Model model,@ModelAttribute("log")NtcCollectVoipLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+		
+		try {
+			
+			PageLog<NtcCollectVoipLog> page = new PageLog<NtcCollectVoipLog>(request, response);
+			Map<String, Object> params=new HashMap<>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			//查询值判断
+			if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())
+					&& StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
+				params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
+				params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
+			} else {
+				// 判断是否是从配置界面过来的日志查询
+				if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
+					Calendar time = Calendar.getInstance();
+					time.add(Calendar.MINUTE, -5);
+					String searchEndTime = DateUtils.formatDateTime(time.getTime());
+					params.put("searchFoundEndTime", searchEndTime);
+					entry.setSearchFoundEndTime(searchEndTime);
+
+					time.add(Calendar.MINUTE, -5);
+					String searchStartTime = DateUtils.formatDateTime(time.getTime());
+					params.put("searchFoundStartTime", searchStartTime);
+					entry.setSearchFoundStartTime(searchStartTime);
+
+				} else {
+					// 设置默认查询当前时间及前五分钟
+					String endTime = DateUtils.getDateTime();
+					Date dateStart = new Date(new Date().getTime() - Constants.LOG_TIME_INTERVAL);
+					String startTime = DateUtils.formatDateTime(dateStart);
+					params.put("searchFoundStartTime", startTime);
+					params.put("searchFoundEndTime", endTime);
+					entry.setSearchFoundStartTime(startTime);
+					entry.setSearchFoundEndTime(endTime);
+				}
+				logger.info("searchFoundStartTime：" + params.get("searchFoundStartTime"));
+				logger.info("searchFoundEndTime：" + params.get("searchFoundEndTime"));
+			}
+
+			if (StringUtils.isNotBlank(entry.getVoipProtocol())) {
+				params.put("searchVoipProtocol", entry.getVoipProtocol());
+			}
+			if (StringUtils.isNotBlank(entry.getRtpDIp())) {
+				params.put("searchRtpDIp", entry.getRtpDIp());
+			}
+			if (StringUtils.isNotBlank(entry.getCapIp())) {
+				params.put("searchRtpSIp", entry.getCapIp());
+			}
+			if (StringUtils.isNotBlank(entry.getSipDIp())) {
+				params.put("searchSipDIp", entry.getSipDIp());
+			}
+			if (StringUtils.isNotBlank(entry.getSipSIp())) {
+				params.put("searchSipSIp", entry.getSipSIp());
+			}
+			if (StringUtils.isNotBlank(entry.getOrderBy())) {
+				params.put("orderBy", entry.getOrderBy());
+			}
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
+			//获取字典信息
+			List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
+			List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
+			List<CodeResult> appList=CodeDicUtils.getCodeList("appCode");
+			model.addAttribute("protocolList", protocolList);
+			model.addAttribute("behaviorList", behaviorList);
+			model.addAttribute("appList", appList);
+			
+			String url = "";
+			url = Constants.LOG_BASE_URL+Constants.NTC_COLLECT_VOIP_LOG;
+			String jsonString = HttpClientUtil.getMsg(url,params,request);
+			
+			GsonBuilder builder = new GsonBuilder();
+			builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
+
+				public Date deserialize(JsonElement json, java.lang.reflect.Type typeOfT,
+						JsonDeserializationContext context) throws JsonParseException {
+					return new Date(json.getAsJsonPrimitive().getAsLong());
+				}
+			});
+			Gson gson = builder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
+			//gson泛型支持
+			LogRecvData<NtcCollectVoipLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcCollectVoipLog>>(){}.getType());
+			
+			if (fromJson.getStatus().intValue() == 200) {
+				Page<NtcCollectVoipLog> data = fromJson.getData();
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
+				page.setList(fromJson.getData().getList());
+				model.addAttribute("page", page);
+				logger.info("查询VoIP泛收日志成功");
+			}
+		} catch (Exception e) {
+			logger.error("查询VoIP泛收日志失败", e);
+			addMessageLog(model, e.getMessage());
+		}
+		return "/log/ntc/collectVoipList";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java

@@ -1,7 +1,6 @@
 package com.nis.web.controller.log.ntc;
 
 import java.io.IOException;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -11,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -23,7 +23,6 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
@@ -33,7 +32,6 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
-import com.sun.jna.platform.win32.OaIdl.DATE;
 
 @Controller
 @RequestMapping(value = "${adminPath}/log/ntc/ntcDdosLogs")
@@ -87,7 +85,7 @@ public class DdosLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcDdosLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcDdosLog> list = page.getList();
 				for (NtcDdosLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java

@@ -56,7 +56,7 @@ public class DnsLogController extends BaseController {
 			LogRecvData<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>(){}.getType());
 			if (fromJson.getStatus().intValue() == 200) {
 //				BeanUtils.copyProperties(fromJson.getData(), page);
-				page.setList(fromJson.getData().getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcDnsLog> list = page.getList();
 				for (NtcDnsLog l : list) {
 					l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java

@@ -68,7 +68,7 @@ public class FtpLogController extends BaseController{
 			if (fromJson.getStatus().intValue() == 200) {
 //				BeanUtils.copyProperties(fromJson.getData(), page);
 				Page<NtcFtpLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcFtpLog> list = page.getList();
 				for (NtcFtpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java

@@ -56,7 +56,7 @@ public class HttpKeyLogController extends BaseController {
 			LogRecvData<NtcKeywordsUrlLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcKeywordsUrlLog>>(){}.getType());
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcKeywordsUrlLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcKeywordsUrlLog> list = page.getList();
 				for (NtcKeywordsUrlLog l : list) {
 					l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java

@@ -55,7 +55,7 @@ public class HttpLogController extends BaseController {
 			LogRecvData<NtcHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcHttpLog>>(){}.getType());
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcHttpLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcHttpLog> list = page.getList();
 				for (NtcHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/IpLogController.java

@@ -56,7 +56,7 @@ public class IpLogController extends BaseController {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
-//					BeanUtils.copyProperties(fromJson.getData(), page);
+					BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
 					page.setList(fromJson.getData().getList());
 					List<NtcIpLog> list = page.getList();
 					for (NtcIpLog l : list) {

src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java

@@ -67,6 +67,7 @@ public class IpsecLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				List<NtcIpsecLog> list = fromJson.getData().getList();
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
 				page.setList(list);
 				for (NtcIpsecLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java

@@ -53,7 +53,7 @@ public class L2tpLogController extends BaseController {
 			LogRecvData<NtcL2tpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<NtcL2tpLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<NtcL2tpLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcL2tpLog> list = fromPage.getList();
 				for (NtcL2tpLog log : list) {
 					log.setFunctionId(ntcL2tpLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MailLogController.java

@@ -51,7 +51,7 @@ public class MailLogController extends BaseController {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcMailLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcMailLog>>(){}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
-					page.setList(fromJson.getData().getList());
+					BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 					List<NtcMailLog> list = page.getList();
 					for (NtcMailLog l : list) {
 						l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmAvIpLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmAvIpLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmAvUrlLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcStreamMediaLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcStreamMediaLog> list = page.getList();
 				for (NtcStreamMediaLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -66,7 +67,7 @@ public class MmFileDigestLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmFileDigestLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmFileDigestLog> list = page.getList();
 				for (MmFileDigestLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmPicIpLogController extends BaseController {
 			LogRecvData<MmPicIpLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicIpLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmPicIpLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmPicIpLog> list = fromPage.getList();
 				for (MmPicIpLog log : list) {
 					log.setFunctionId(mmPicIpLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmPicUrlController extends BaseController{
 			LogRecvData<MmPicUrlLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmPicUrlLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmPicUrlLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmPicUrlLog> list = fromPage.getList();
 				for (MmPicUrlLog log : list) {
 					log.setFunctionId(mmPicUrlLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -53,7 +54,7 @@ public class MmPornAvSampleController extends BaseController {
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmAvIpLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
@@ -94,7 +95,7 @@ public class MmPornAvSampleController extends BaseController {
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmAvIpLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleAudioController extends BaseController{
 			LogRecvData<MmSampleAudioLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleAudioLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSampleAudioLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSampleAudioLog> list = fromPage.getList();
 				for (MmSampleAudioLog log : list) {
 					log.setFunctionId(sampleAudioLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleFaceController extends BaseController{
 			LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSamplePicLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleLogoController extends BaseController{
 			LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSamplePicLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java

@@ -1,3 +1,4 @@
+
 package com.nis.web.controller.log.ntc;
 
 import java.util.HashMap;
@@ -7,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +53,7 @@ public class MmSamplePicController extends BaseController{
 			LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSamplePicLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleSpeakerController extends BaseController{
 			LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSamplePicLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -51,7 +52,7 @@ public class MmSampleVideoController extends BaseController{
 			LogRecvData<MmSampleVideoLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleVideoLog>>() {}.getType());
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<MmSampleVideoLog> fromPage = fromJson.getData();
-				page.setList(fromPage.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmSampleVideoLog> list = fromPage.getList();
 				for (MmSampleVideoLog log : list) {
 					log.setFunctionId(sampleVideoLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java

@@ -1,6 +1,5 @@
 package com.nis.web.controller.log.ntc;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -10,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
-import org.aspectj.util.FileUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -58,7 +57,7 @@ public class MmSampleVoipLogController extends BaseController {
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmVoipLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipAccountLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmVoipLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipIpLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmVoipLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.http.client.ClientProtocolException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -65,7 +66,7 @@ public class MmVoipLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<MmVoipLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java

@@ -67,7 +67,7 @@ public class OpenVpnLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcOpenVpnLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcOpenVpnLog> list = page.getList();
 				for (NtcOpenVpnLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java

@@ -8,10 +8,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -47,7 +49,7 @@ public class P2pLogController extends BaseController {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcP2pLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcP2pLog>>(){}.getType());
 				if (fromJson.getStatus().intValue() == 200) {
-					page.setList(fromJson.getData().getList());
+					BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 					List<NtcP2pLog> list = page.getList();
 					for (NtcP2pLog l : list) {
 						l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java

@@ -54,6 +54,7 @@ public class PptpLogController extends BaseController {
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<NtcPptpLog> fromPage = fromJson.getData();
 				List<NtcPptpLog> list = fromPage.getList();
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
 				page.setList(list);
 				for (NtcPptpLog log : list) {
 					log.setFunctionId(ntcPptpLog.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/SshLogController.java

@@ -67,7 +67,7 @@ public class SshLogController extends BaseController{
 			
 			if (fromJson.getStatus().intValue() == 200) {
 				Page<NtcSshLog> data = fromJson.getData();
-				page.setList(data.getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<NtcSshLog> list = page.getList();
 				for (NtcSshLog l : list) {
 					l.setFunctionId(entry.getFunctionId());

src/main/java/com/nis/web/controller/log/ntc/SslLogController.java

@@ -58,6 +58,7 @@ public class SslLogController extends BaseController {
 			if(fromJson.getStatus().intValue() == 200) {
 				Page<NtcSslLog> fromPage = fromJson.getData();
 				List<NtcSslLog> list = fromPage.getList();
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});
 				page.setList(list);
 				for (NtcSslLog log : list) {
 					log.setFunctionId(ntcSslLog.getFunctionId());

src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -54,7 +54,7 @@ public class PxyHttpLogController extends BaseController {
 		
 			LogRecvData<PxyHttpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<PxyHttpLog>>(){}.getType());
 			if (fromJson.getStatus().intValue() == 200) {
-				page.setList(fromJson.getData().getList());
+				BeanUtils.copyProperties(fromJson.getData(), page, new String[] {"pageSize","pageNo"});page.setList(fromJson.getData().getList());
 				List<PxyHttpLog> list = page.getList();
 				for (PxyHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());

src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml

@@ -982,7 +982,7 @@
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    		AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
+	    		AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="district != null and district != ''">
 	    		AND r.DISTRICT =#{district,jdbcType=VARCHAR} 
@@ -1481,7 +1481,7 @@
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    		AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
+	    		AND REPLACE(r.CFG_KEYWORDS,'***and***','|') like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="district != null and district != ''">
 	    		AND r.DISTRICT =#{district,jdbcType=VARCHAR} 

src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml

@@ -271,27 +271,30 @@
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
 	    	<if test="complexStrCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from app_complex_feature_cfg f
+	    		AND r.compile_id in (select f.compile_id from app_complex_feature_cfg f
 	    		<where>
 	    			<if test="complexStrCfg.cfgKeywords != null and complexStrCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{complexStrCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-					<if test="complexStrCfg.district != null and complexStrCfg.district != ''">
-	    				and  f.district  like concat(concat('%',#{complexStrCfg.district,jdbcType=VARCHAR}),'%')
-		    		</if>
-	    		</where>
+				</where>
 	    		 )
 	    	</if>
 	    	<if test="strCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from app_string_feature_cfg f
+	    		AND r.compile_id in (select f.compile_id from app_string_feature_cfg f
 	    		<where>
 	    			<if test="strCfg.cfgKeywords != null and strCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    				REPLACE(f.cfg_keywords ,'***and***','|') like concat(concat('%',#{strCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
-					<if test="strCfg.district != null and strCfg.district != ''">
-	    				and  f.district  like concat(concat('%',#{strCfg.district,jdbcType=VARCHAR}),'%')
+				</where>
+	    		 )
+	    	</if>
+	    	<if test="ipCfg!=null">
+	    		AND r.compile_id in (select f.compile_id from app_ip_range_cfg f
+	    		<where>
+	    			<if test="ipCfg.destIpAddress != null and ipCfg.destIpAddress != ''">
+	    				f.dest_ip_address = #{ipCfg.destIpAddress,jdbcType=VARCHAR}
 		    		</if>
-	    		</where>
+				</where>
 	    		 )
 	    	</if>
 		  	<!-- 数据范围过滤 -->

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -387,11 +387,11 @@
 	    		</where>
 	    		 )
 	    	</if>
-	    	<if test="voipAccount != null">
-	    		AND r.compile_id in (SELECT s.compile_id FROM av_voip_account_cfg s
+	    	<if test="avContUrlCfg != null">
+	    		AND r.compile_id in (SELECT s.compile_id FROM av_cont_url_cfg s
 	    		<where>
-	    			<if test="voipAccount.cfgKeywords != null and voipAccount.cfgKeywords != ''">
-	    				REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%')
+	    			<if test="avContUrlCfg.cfgKeywords != null and avContUrlCfg.cfgKeywords != ''">
+	    				REPLACE(s.cfg_keywords,'***and***','|') LIKE concat(concat('%',#{avContUrlCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
 		    		</if>
 				</where>
 				)

src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.java

@@ -4,16 +4,24 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjTrustedCaCert;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
 @MyBatisDao
-public interface PxyObjKeyringDao extends CrudDao< PxyObjKeyring> {
+public interface PxyObjKeyringDao  extends CrudDao<PxyObjKeyring>{
 	List<PxyObjKeyring> findPage( PxyObjKeyring  pxyObjKeyring);
+	List<PxyObjTrustedCaCert> findTrustedCertPage( PxyObjTrustedCaCert  PxyObjTrustedCaCert);
 	List<PxyObjKeyring> findList(@Param("cfgId")Long cfgId
 			,@Param("isAudit")Integer isAudit
 			,@Param("isValid")Integer isValid,@Param("cfgType")String cfgType);
+	PxyObjTrustedCaCert getPxyObjTrustedCaCert(Long  id);
+	PxyObjTrustedCaCrl getPxyObjTrustedCaCrl(PxyObjTrustedCaCrl  entity);
+	void insertPxyObjTrustedCaCert(PxyObjTrustedCaCert PxyObjTrustedCaCert);
+	void updatePxyObjTrustedCaCert(PxyObjTrustedCaCert PxyObjTrustedCaCert);
+	void insertPxyObjTrustedCaCrl(PxyObjTrustedCaCrl pxyObjTrustedCaCrl);
+	void updatePxyObjTrustedCaCrl(PxyObjTrustedCaCrl pxyObjTrustedCaCrl);
 	
 }

src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml

@@ -38,6 +38,81 @@
 	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
 	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
 	  </resultMap>
+	  <resultMap id="PxyObjTrustedCaCertMap" type="com.nis.domain.configuration.PxyObjTrustedCaCert" >
+	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+	    <result column="cert_file" property="certFile" jdbcType="VARCHAR" />
+	    <result column="issuer" property="issuer" jdbcType="VARCHAR" />
+	    <result column="action" property="action" jdbcType="INTEGER" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+	    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+	    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+	    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+	    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+	    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+	    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+	    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+	    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+	    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+	    <result column="classify" property="classify" jdbcType="VARCHAR" />
+	    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+	    <result column="lable" property="lable" jdbcType="VARCHAR" />
+	    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+	    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+	    <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
+	  </resultMap>
+	  <resultMap id="PxyObjTrustedCaCrlMap" type="com.nis.domain.configuration.PxyObjTrustedCaCrl" >
+	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+	    <result column="crl_file" property="crlFile" jdbcType="VARCHAR" />
+	    <result column="cert_id" property="certId" jdbcType="BIGINT" />
+	    <result column="issuer" property="issuer" jdbcType="VARCHAR" />
+	    <result column="action" property="action" jdbcType="INTEGER" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+	    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+	    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+	    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+	    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+	    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+	    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+	    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+	    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+	    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+	    <result column="classify" property="classify" jdbcType="VARCHAR" />
+	    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+	    <result column="lable" property="lable" jdbcType="VARCHAR" />
+	    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+	    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+	  </resultMap>
+    <sql id="PxyObjTrustedCaCertColumns">
+		 r.cfg_id,r.cfg_desc
+	    ,r.cert_file
+	   , r.issuer
+		,r.cfg_type,r.action
+		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
+		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
+		,r.is_area_effective,r.classify,r.attribute,r.lable
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id,r.cancel_request_id
+	</sql>
+    <sql id="PxyObjTrustedCaCrlColumns">
+		 r.cfg_id,r.cfg_desc
+	    ,r.crl_file
+	    ,r.cert_id
+	   , r.issuer
+		,r.cfg_type,r.action
+		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
+		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
+		,r.is_area_effective,r.classify,r.attribute,r.lable
+		,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id
+	</sql>
     <sql id="PxyObjKeyringColumns">
 		 r.cfg_id,r.cfg_desc
 		, r.keyring_type
@@ -144,6 +219,89 @@
 				ORDER BY r.CFG_ID desc
 			</otherwise>
 		</choose>
+  </select>
+   <!-- 查出所有 有效数据-->
+      <select id="findTrustedCertPage" resultMap="PxyObjTrustedCaCertMap">
+		SELECT
+			<include refid="PxyObjTrustedCaCertColumns"/>
+		<trim prefix="," prefixOverrides=",">
+			,s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName
+		</trim>
+	    FROM  pxy_obj_trusted_ca_cert r
+	    left join sys_user s on r.creator_id=s.id
+		left join sys_user e on r.editor_id=e.id
+		left join sys_user u on r.auditor_id=u.id
+		left join request_info ri on r.request_id=ri.id
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
+	 		<if test="cfgId != null">
+	   			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	 		<if test="compileId != null">
+	   			AND r.compile_id=#{compileId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="issuer != null and issuer != ''">
+	    		AND r.issuer like concat(concat('%',#{issuer,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="action != null">
+	    		AND r.ACTION=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.CFG_ID desc
+			</otherwise>
+		</choose>
   </select>
    <!-- 查出所有 有效数据-->
       <select id="findList" resultMap="PxyObjKeyringMap">
@@ -174,6 +332,30 @@
    		</if>
 	    </where>
 	</select>
+   <!-- 查出所有 有效数据-->
+      <select id="getPxyObjTrustedCaCert" resultType="com.nis.domain.configuration.PxyObjTrustedCaCert">
+		SELECT
+			<include refid="PxyObjTrustedCaCertColumns"/>
+	    FROM pxy_obj_trusted_ca_cert r
+ 		where r.CFG_ID=#{id,jdbcType=BIGINT}
+	</select>
+   <!-- 查出所有 有效数据-->
+      <select id="getPxyObjTrustedCaCrl" resultType="com.nis.domain.configuration.PxyObjTrustedCaCrl">
+		SELECT
+			<include refid="PxyObjTrustedCaCrlColumns"/>
+	    FROM pxy_obj_trusted_ca_crl r
+ 		<where>
+ 			<if test="cfgId != null">
+   				AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+   			</if>	
+ 			<if test="certId != null">
+   				AND r.CERT_ID=#{certId,jdbcType=BIGINT}
+   			</if>	
+ 			<if test="issuer != null and issuer !=''">
+   				AND r.issuer=#{issuer,jdbcType=BIGINT}
+   			</if>	
+ 		</where>
+	</select>
 	<insert id="insert" parameterType="com.nis.domain.configuration.PxyObjKeyring" >
     insert into pxy_obj_keyring (
      CFG_ID,
@@ -246,8 +428,271 @@
     	#{compileId,jdbcType=INTEGER},
     	#{cfgRegionCode,jdbcType=INTEGER}
     )
+  </insert>
+	<insert id="insertPxyObjTrustedCaCert" parameterType="com.nis.domain.configuration.PxyObjTrustedCaCert" >
+    insert into pxy_obj_trusted_ca_cert (
+     CFG_ID,
+     CFG_DESC,
+     ACTION,
+     IS_VALID,
+     IS_AUDIT,
+     CREATOR_ID,
+    CREATE_TIME,
+    EDITOR_ID,
+    EDIT_TIME,
+    AUDITOR_ID,
+    AUDIT_TIME,
+   	SERVICE_ID,
+   	REQUEST_ID,
+   	IS_AREA_EFFECTIVE,
+   	CLASSIFY,
+    ATTRIBUTE,
+    LABLE,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+ 	cert_file, 
+	issuer, 
+	cfg_type,
+	compile_Id,
+    cfg_region_code
+    )values (
+   		#{cfgId,jdbcType=VARCHAR},
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+ 	 	#{certFile, jdbcType=VARCHAR},
+ 		#{issuer, jdbcType=VARCHAR},
+    	#{cfgType,jdbcType=VARCHAR},
+    	#{compileId,jdbcType=INTEGER},
+    	#{cfgRegionCode,jdbcType=INTEGER}
+    )
   </insert>
 	
+ <update id="updatePxyObjTrustedCaCert" parameterType="com.nis.domain.configuration.PxyObjTrustedCaCert" >
+    update pxy_obj_trusted_ca_cert
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="cfgType != null and cfgDesc != ''" >
+        cfg_type = #{cfgType,jdbcType=VARCHAR},
+      </if>
+      <if test="compileId != null " >
+        compile_Id = #{compileId,jdbcType=VARCHAR},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+       <if test="editTime != null  and editTime != ''" >
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
+      </if>
+       <if test="auditTime != null  and auditTime != ''" >
+     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null and classify != ''" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null and attribute != ''" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null and lable != ''" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="serviceId != null" >
+        service_id =  #{serviceId,jdbcType=INTEGER},
+      </if>
+       <if test="certFile != null and certFile !=''" >
+        cert_file =  #{certFile,jdbcType=VARCHAR},
+      </if>
+       <if test="issuer != null  and issuer !=''"  >
+        issuer =  #{issuer,jdbcType=VARCHAR},
+      </if>
+      </trim>
+    </set>
+    <where>
+       	and cfg_id =  #{cfgId,jdbcType=INTEGER}
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
+	<insert id="insertPxyObjTrustedCaCrl" parameterType="com.nis.domain.configuration.PxyObjTrustedCaCrl" >
+    insert into pxy_obj_trusted_ca_crl (
+     CFG_ID,
+     CFG_DESC,
+     ACTION,
+     IS_VALID,
+     IS_AUDIT,
+     CREATOR_ID,
+    CREATE_TIME,
+    EDITOR_ID,
+    EDIT_TIME,
+    AUDITOR_ID,
+    AUDIT_TIME,
+   	SERVICE_ID,
+   	REQUEST_ID,
+   	IS_AREA_EFFECTIVE,
+   	CLASSIFY,
+    ATTRIBUTE,
+    LABLE,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+ 	crl_file, 
+ 	cert_Id, 
+	issuer, 
+	cfg_type,
+	compile_Id,
+    cfg_region_code
+    )values (
+   		#{cfgId,jdbcType=VARCHAR},
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	#{isValid,jdbcType=INTEGER},
+    	#{isAudit,jdbcType=INTEGER},
+    	#{creatorId,jdbcType=INTEGER}, 
+   		#{createTime,jdbcType=TIMESTAMP},
+   		#{editorId,jdbcType=INTEGER},
+   		#{editTime,jdbcType=TIMESTAMP}, 
+   	 	#{auditorId,jdbcType=INTEGER},
+    	#{auditTime,jdbcType=TIMESTAMP},
+    	#{serviceId,jdbcType=INTEGER}, 
+    	#{requestId,jdbcType=INTEGER},
+    	#{isAreaEffective,jdbcType=INTEGER},
+    	#{classify,jdbcType=VARCHAR},
+    	#{attribute,jdbcType=VARCHAR},
+    	#{lable,jdbcType=VARCHAR},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+ 	 	#{crlFile, jdbcType=VARCHAR},
+ 	 	#{certId, jdbcType=INTEGER},
+ 		#{issuer, jdbcType=VARCHAR},
+    	#{cfgType,jdbcType=VARCHAR},
+    	#{compileId,jdbcType=INTEGER},
+    	#{cfgRegionCode,jdbcType=INTEGER}
+    )
+  </insert>
+	
+ <update id="updatePxyObjTrustedCaCrl" parameterType="com.nis.domain.configuration.PxyObjTrustedCaCrl" >
+    update pxy_obj_trusted_ca_crl
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="cfgType != null and cfgDesc != ''" >
+        cfg_type = #{cfgType,jdbcType=VARCHAR},
+      </if>
+      <if test="compileId != null " >
+        compile_Id = #{compileId,jdbcType=VARCHAR},
+      </if>
+      <if test="action != null" >
+        action = #{action,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null" >
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+       <if test="editTime != null  and editTime != ''" >
+      	edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorId != null" >
+        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
+      </if>
+       <if test="auditTime != null  and auditTime != ''" >
+     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="isAreaEffective != null" >
+        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
+      </if>
+      <if test="classify != null and classify != ''" >
+        classify = #{classify,jdbcType=VARCHAR},
+      </if>
+      <if test="attribute != null and attribute != ''" >
+        attribute = #{attribute,jdbcType=VARCHAR},
+      </if>
+      <if test="lable != null and lable != ''" >
+        lable = #{lable,jdbcType=VARCHAR},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>
+      <if test="serviceId != null" >
+        service_id =  #{serviceId,jdbcType=INTEGER},
+      </if>
+       <if test="crlFile != null and crlFile !=''" >
+        crl_file =  #{crlFile,jdbcType=VARCHAR},
+      </if>
+      <if test="issuer != null  and issuer !=''"  >
+        issuer =  #{issuer,jdbcType=VARCHAR},
+      </if>
+      </trim>
+    </set>
+    <where>
+    	<if test="cfgId != null" >
+        	and cfg_id =  #{cfgId,jdbcType=INTEGER}
+      	</if>
+    	<if test="certId != null" >
+        	and cert_id =  #{certId,jdbcType=INTEGER}
+      	</if>
+    	<if test="issuer != null  and issuer !=''"  >
+        	and issuer =  #{issuer,jdbcType=INTEGER}
+      	</if>
+    	<if test="functionId != null" >
+        	and function_id =  #{functionId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
  <update id="update" parameterType="com.nis.domain.configuration.PxyObjKeyring" >
     update pxy_obj_keyring
     <set >

src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml

@@ -159,10 +159,15 @@
 	    <include refid="ConfigIndex_Column" />
 	    <trim prefix="," prefixOverrides=",">
 			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
-			,ri.request_title as requestName,dns.cfg_desc as dns_strategy_name
+			,ri.request_title as requestName
+			<if test="functionId !=null and functionId == 7">
+		    	,dns.cfg_desc as dns_strategy_name
+		    </if>
 		</trim>
 	    FROM cfg_index_info a
-	    left join dns_res_strategy dns on a.dns_strategy_id=dns.cfg_id
+	    <if test="functionId !=null and functionId == 7">
+	    	left join dns_res_strategy dns on a.dns_strategy_id=dns.cfg_id
+	    </if>
 	    left join sys_user s on a.creator_id=s.id
 		left join sys_user e on a.editor_id=e.id
 		left join sys_user u on a.auditor_id=u.id

src/main/java/com/nis/web/service/BaseService.java

@@ -28,6 +28,8 @@ import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.callback.NtcDnsResStrategy;
 import com.nis.domain.callback.ProxyObjKeyring;
+import com.nis.domain.callback.ProxyObjTrustedCa;
+import com.nis.domain.callback.ProxyObjTrustedCaCrl;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
@@ -35,6 +37,8 @@ import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjTrustedCaCert;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
 import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
@@ -43,6 +47,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.IpUtil;
+import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 
 /**
@@ -959,6 +964,35 @@ public abstract class BaseService {
 		proxyObjKeyring.setOpTime(cfg.getAuditTime());
 		return proxyObjKeyring;
 	}
+	//可信证书
+	public List<ProxyObjTrustedCa> convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){
+		List<ProxyObjTrustedCa> proxyObjTrustedCas=new ArrayList<>();
+		ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa();
+		if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){
+			proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId()));
+			proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId());
+			proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId());
+			proxyObjTrustedCaCert.setCertName(cfgCert.getCfgDesc());
+			proxyObjTrustedCaCert.setCertFile(cfgCert.getCertFile());
+			proxyObjTrustedCaCert.setService(cfgCert.getServiceId());
+			proxyObjTrustedCaCert.setIsValid(cfgCert.getIsValid());
+			proxyObjTrustedCaCert.setOpTime(cfgCert.getAuditTime());
+			proxyObjTrustedCas.add(proxyObjTrustedCaCert);
+		}
+		if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){
+			proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId()));
+			proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId());
+			proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId());
+			proxyObjTrustedCaCert.setService(cfgCrl.getServiceId());
+			proxyObjTrustedCaCert.setIsValid(cfgCrl.getIsValid());
+			proxyObjTrustedCaCert.setOpTime(cfgCrl.getAuditTime());
+			proxyObjTrustedCaCert.setCrlId(cfgCrl.getCompileId());
+			proxyObjTrustedCaCert.setCrlFile(cfgCrl.getCrlFile());
+			proxyObjTrustedCas.add(proxyObjTrustedCaCert);
+		}
+		
+		return proxyObjTrustedCas;
+	}
 	//ip转换为callback用ip 
 	public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
 		NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();

src/main/java/com/nis/web/service/basics/AsnIpCfgService.java

@@ -80,8 +80,12 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveAsnIpBatch(Map<String,List<AsnIpCfg>> cfgs,int total) {
+		//需要通过删除域接口删除的ip集合
 		List<AsnIpCfg> toDelAsnIpCfgs=Lists.newArrayList();
+		//需要本地保存的IP集合
 		List<AsnIpCfg> toSaveAsnIpCfgs=Lists.newArrayList();
+		//需要通过新增域接口新增的ip集合
+		List<AsnIpCfg> toAddRegionAsnIpCfgs=Lists.newArrayList();
 		List<SysDataDictionaryItem> isImportAll=DictUtils.getDictList("IS_ASN_IP_IMPORT_ALL");
 		List<Integer> idList=ConfigServiceUtil.getId(3, total);
 		int ind=0;
@@ -103,6 +107,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 					cfg.setIsValid(Constants.VALID_NO);
 				else {
 					cfg.setIsValid(Constants.VALID_YES);
+					toAddRegionAsnIpCfgs.add(cfg);
 				}
 				ind++;	
 			}
@@ -119,8 +124,8 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 		if(toDelAsnIpCfgs.size()>0) {
 			asnIPRegionSendToMaat(toDelAsnIpCfgs,Constants.VALID_NO);
 		}
-		if(toSaveAsnIpCfgs.size()>0) {
-			asnIPRegionSendToMaat(toSaveAsnIpCfgs,Constants.VALID_YES);
+		if(toAddRegionAsnIpCfgs.size()>0) {
+			asnIPRegionSendToMaat(toAddRegionAsnIpCfgs,Constants.VALID_YES);
 		}
 	}
 	/**

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -311,8 +311,13 @@ public class AppMultiFeatureCfgService extends BaseService {
 	public Map<String, List>  exportFeature(AppFeatureIndex entity){
 		Map<String, List> dataMap=new HashMap<String, List>();
 		List<AppIpCfg> ipRangeList = appMultiFeatureCfgDao.getAppIpRangeCfg(entity.getCompileId(),entity.getFunctionId());
-		List<AppComplexFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppComplexFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
-		dataMap.put("APP_KEYWORDS", appKeyList);
+		if(entity.getFunctionId()!=567){
+			List<AppComplexFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppComplexFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
+			dataMap.put("APP_KEYWORDS", appKeyList);
+		}else{
+			List<AppStringFeatureCfg> appKeyList = appMultiFeatureCfgDao.getAppStringFeatureCfg(entity.getCompileId(),entity.getFunctionId(),null);
+			dataMap.put("APP_DK_GL", appKeyList);
+		}
 		dataMap.put("APP_IP_RANGE", ipRangeList);
 		return dataMap;
 	}

src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java

@@ -5,21 +5,29 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
 import com.nis.domain.callback.ProxyObjKeyring;
+import com.nis.domain.callback.ProxyObjTrustedCa;
+import com.nis.domain.callback.ProxyObjTrustedCaCrl;
 import com.nis.domain.configuration.PxyObjKeyring;
+import com.nis.domain.configuration.PxyObjTrustedCaCert;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.StringUtil;
+import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.configuration.PxyObjKeyringDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
+import oracle.sql.ARRAY;
+
 
 
 /**
@@ -31,6 +39,8 @@ import com.nis.web.service.BaseService;
 public class PxyObjKeyringService extends BaseService{
 	@Autowired
 	protected PxyObjKeyringDao pxyObjKeyringDao;
+	@Autowired
+    private ServiceDictInfoDao serviceDictInfoDao;
 	
 	
 	/**
@@ -46,6 +56,19 @@ public class PxyObjKeyringService extends BaseService{
 		page.setList(list);
 		return page;
 	}
+	/**
+	 * 查询分页数据
+	 * @param page 分页对象
+	 * @param entity
+	 * @return
+	 */
+	public Page<PxyObjTrustedCaCert> findTrustedCertPage(Page<PxyObjTrustedCaCert> page, PxyObjTrustedCaCert entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<PxyObjTrustedCaCert> list=pxyObjKeyringDao.findTrustedCertPage(entity);
+		page.setList(list);
+		return page;
+	}
 	public List<PxyObjKeyring> findPxyObjKeyrings(Long cfgId,Integer isValid,Integer isAudit,String cfgType) {
 		List<PxyObjKeyring> list=pxyObjKeyringDao.findList(cfgId,isValid,isAudit,cfgType);
 		return list;
@@ -59,6 +82,9 @@ public class PxyObjKeyringService extends BaseService{
 		}
 		return dnsResStrategy;
 	}
+	public PxyObjTrustedCaCert getPxyObjTrustedCaCert(Long id) {
+		return pxyObjKeyringDao.getPxyObjTrustedCaCert(id);
+	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdate(PxyObjKeyring entity){
 		Date createTime=new Date();
@@ -92,6 +118,163 @@ public class PxyObjKeyringService extends BaseService{
 			pxyObjKeyringDao.update(entity);
 		}
 	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void trustedCertsaveOrUpdate(PxyObjTrustedCaCert entity){
+		Date createTime=new Date();
+		setAreaEffectiveIds(entity);
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		//新增
+		if(StringUtil.isEmpty(entity.getCfgId())){
+			entity.initDefaultValue();
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+			}
+			pxyObjKeyringDao.insertPxyObjTrustedCaCert(entity);
+			//修改
+		}else{
+			Date editTime=new Date();
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			pxyObjKeyringDao.updatePxyObjTrustedCaCert(entity);
+			//修改主表cert配置时，需要修改子表crl配置信息
+			PxyObjTrustedCaCrl crlCfg =new PxyObjTrustedCaCrl();
+			BeanUtils.copyProperties(entity, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
+			entity=pxyObjKeyringDao.getPxyObjTrustedCaCert(entity.getCfgId());
+			crlCfg.setCertId(entity.getCompileId());
+			pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
+			
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void trustedCrlsaveOrUpdate(PxyObjTrustedCaCrl entity){
+		if(StringUtil.isEmpty(entity.getCertId())){
+			entity.setCertId(0);
+		}
+		Date createTime=new Date();
+		Integer oldCrlAudit=0;
+		Integer oldCompileId=0;
+		PxyObjTrustedCaCrl  oldCrl=pxyObjKeyringDao.getPxyObjTrustedCaCrl(entity);
+		
+		if(oldCrl != null){
+			entity.setCfgId(oldCrl.getCfgId());
+			entity.setCompileId(oldCrl.getCompileId());
+			oldCrlAudit=oldCrl.getIsAudit();
+			oldCompileId=oldCrl.getCompileId();
+		}
+		
+		//新增
+		if(StringUtil.isEmpty(entity.getCfgId())){
+			entity.initDefaultValue();
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			//调用服务接口获取compileId
+			List<Integer> compileIds = new ArrayList<Integer>();
+			try {
+				compileIds = ConfigServiceUtil.getId(1,1);
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+			}
+			if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+				entity.setCompileId(compileIds.get(0));
+			}
+			entity.setCreateTime(createTime);
+			entity.setCreatorId(UserUtils.getUser().getId());
+			//主表为审核通过，则直接修改审核信息
+			if(entity.getIsAudit().equals(1)){
+				entity.setAuditTime(createTime);
+				entity.setAuditorId(UserUtils.getUser().getId());
+			}
+			pxyObjKeyringDao.insertPxyObjTrustedCaCrl(entity);
+		}else{
+			Date editTime=new Date();
+			//主表为审核通过，则直接修改审核信息
+			if(entity.getIsAudit() == 1){
+				entity.setAuditTime(editTime);
+				entity.setAuditorId(UserUtils.getUser().getId());
+			//主表为未审核，直接修改修改人员信息
+			}else{
+				entity.setEditorId(UserUtils.getUser().getId());
+				entity.setEditTime(editTime);
+			}
+			//如之前crl为生效，则需要重新获取编译id
+			if(oldCrlAudit==1){
+				//调用服务接口获取compileId
+				List<Integer> compileIds = new ArrayList<Integer>();
+				try {
+					compileIds = ConfigServiceUtil.getId(1,1);
+				} catch (Exception e) {
+					e.printStackTrace();
+					logger.info("获取编译ID出错");
+					throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
+				}
+				if(compileIds != null && compileIds.size() >0  && compileIds.get(0) != 0){
+					entity.setCompileId(compileIds.get(0));
+				}
+			}
+			pxyObjKeyringDao.updatePxyObjTrustedCaCrl(entity);
+		}
+		
+		
+		//主表cert审核通过，crl配置需下发
+		if(entity.getIsAudit() == 1){
+			//crl之前为生效状态，需先失效
+			if(oldCrlAudit==1){
+				String json="";
+				List<ProxyObjTrustedCa> resStrategyList=new ArrayList<>();
+				resStrategyList=convertCallBackProxyObjTrustedCa(null,entity);
+				if( !StringUtil.isEmpty(resStrategyList)){
+					resStrategyList.get(0).setCrlId(oldCompileId);
+					resStrategyList.get(0).setId(Long.valueOf(oldCompileId));
+					resStrategyList.get(0).setCfgId(oldCompileId);
+					resStrategyList.get(0).setIsValid(0);
+				}
+				//调用服务接口取消配置
+				json=gsonToJson(resStrategyList);
+				logger.info("crl配置参数："+json);
+				//调用服务接口取消配置
+				try {
+					ToMaatResult result = ConfigServiceUtil.put(json, 2);
+					logger.info("crl配置响应信息："+result.getMsg());
+				} catch (Exception e) {
+					e.printStackTrace();
+					logger.info("crl配置失败");
+					throw e;
+				}
+			}
+			
+			String json="";
+			List<ProxyObjTrustedCa> ProxyObjTrustedCaList=new ArrayList<ProxyObjTrustedCa>();
+			ProxyObjTrustedCaList=convertCallBackProxyObjTrustedCa(null,entity);
+			//调用服务接口下发配置数据
+			json=gsonToJson(ProxyObjTrustedCaList);
+			logger.info("crl配置参数："+json);
+			//调用服务接口下发配置
+			try {
+				ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+				if(result!=null){
+					logger.info("crl配置下发响应信息："+result.getMsg());
+				}
+			} catch (Exception e) {
+				logger.error("crl配置下发失败",e);
+				throw e;
+			}
+			
+		}
+	}
 	
 	/**
 	 * 
@@ -168,6 +351,103 @@ public class PxyObjKeyringService extends BaseService{
 			}
 		}
 	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids compileIds
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void trustedCertDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			PxyObjTrustedCaCert entity = new PxyObjTrustedCaCert();
+			entity.setCfgId(Long.valueOf(id));
+			entity.setFunctionId(functionId);
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			pxyObjKeyringDao.updatePxyObjTrustedCaCert(entity);
+			//主表cert配置删除后，需删除crl子表配置
+			PxyObjTrustedCaCrl crlCfg =new PxyObjTrustedCaCrl();
+			BeanUtils.copyProperties(entity, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
+			entity=pxyObjKeyringDao.getPxyObjTrustedCaCert(entity.getCfgId());
+			crlCfg.setCertId(entity.getCompileId());
+			pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
+		}
+	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void trustedCertAudit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
+		PxyObjTrustedCaCrl crlCfg=new PxyObjTrustedCaCrl();
+		PxyObjTrustedCaCert cfg=new PxyObjTrustedCaCert();
+		cfg.setCfgId(Long.valueOf(id));
+		cfg.setIsValid(isValid);
+		cfg.setIsAudit(isAudit);
+		cfg.setEditTime(auditTime);
+		cfg.setEditorId(UserUtils.getUser().getId());
+		cfg.setAuditorId(UserUtils.getUser().getId());
+		cfg.setAuditTime(auditTime);
+		//修改主表cert 配置状态
+		pxyObjKeyringDao.updatePxyObjTrustedCaCert(cfg);
+		cfg=getPxyObjTrustedCaCert(cfg.getCfgId());
+		//修改子表crl 配置状态
+		BeanUtils.copyProperties(cfg, crlCfg, new String[]{"cfgId","serviceId","compileId","cfgType"});
+		crlCfg.setCertId(cfg.getCompileId());
+		pxyObjKeyringDao.updatePxyObjTrustedCaCrl(crlCfg);
+		crlCfg=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crlCfg);
+		
+		//失效配置，将子表的失效来函设置与主表相同
+		if(cfg.getIsAudit()==3){
+			//设置配置取消的来函信息
+			serviceDictInfoDao.auditCancleRequestInfo(cfg.getCancelRequestId(), 
+					"pxy_obj_trusted_ca_crl",
+					crlCfg.getCfgId().toString());
+		}
+		
+		String json="";
+		if(cfg.getIsAudit()==1){
+			List<ProxyObjTrustedCa> trustedCertList=new ArrayList<ProxyObjTrustedCa>();
+			//可信证书cert回调配置转换
+			trustedCertList=convertCallBackProxyObjTrustedCa(cfg,crlCfg);
+			//调用服务接口下发配置数据
+			json=gsonToJson(trustedCertList);
+			logger.info("可信证书（cert+crl）配置下发配置参数："+json);
+			//调用服务接口下发配置
+			try {
+				ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+				if(result!=null){
+					logger.info("可信证书（cert+crl）配置下发响应信息："+result.getMsg());
+				}
+			} catch (Exception e) {
+				logger.error("可信证书（cert+crl）配置下发失败",e);
+				throw e;
+			}
+		}else if(cfg.getIsAudit()==3){
+			List<ProxyObjTrustedCa> trustedCertList=new ArrayList<ProxyObjTrustedCa>();
+			//可信证书cert回调配置转换
+			trustedCertList=convertCallBackProxyObjTrustedCa(cfg,crlCfg);
+			//调用服务接口取消配置
+			json=gsonToJson(trustedCertList);
+			logger.info("可信证书（cert+crl）配置参数："+json);
+			//调用服务接口取消配置
+			try {
+				ToMaatResult result = ConfigServiceUtil.put(json, 2);
+				logger.info("可信证书配置响应信息："+result.getMsg());
+			} catch (Exception e) {
+				e.printStackTrace();
+				logger.error("可信证书配置失败");
+				throw e;
+			}
+		}
+	}
 }
 	
 	

src/main/resources/messages/message_zh_CN.properties

@@ -1319,7 +1319,6 @@ user_behavior_data=\u7528\u6237\u7edf\u8ba1
 ip_behavior_data=\u7528\u6237IP\u7edf\u8ba1
 not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d
 cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01
-request_uri=SIP\u8bf7\u6c42URIcert_not_match_domain=\u57DF\u540D\u4E0E\u6240\u9009\u8BC1\u4E66\u4FE1\u606F\u4E0D\u7B26\u5408\uFF01
 crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
 crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1
 cert_name=\u8BC1\u4E66\u540D\u79F0
@@ -1334,4 +1333,15 @@ sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
 sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
 sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
 sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
-call_id=SIP\u4f1a\u8bddID
+call_id=SIP\u4f1a\u8bddID
+collect_voip=VoIP \u6cdb\u6536
+rtp_d_ip=RTP\u670d\u52a1\u7aefIP\u5730\u5740
+rtp_s_ip=RTP\u5ba2\u6237\u7aefIP\u5730\u5740
+rtp_d_port=RTP\u670d\u52a1\u7aef\u7aef\u53e3
+rtp_s_port=RTP\u5ba2\u6237\u7aef\u7aef\u53e3
+sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
+sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
+sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
+sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
+call_id=SIP\u4f1a\u8bddID
+request_uri=SIP\u8bf7\u6c42URI

src/main/resources/nis.properties

@@ -269,6 +269,7 @@ pxyHttpLog=pxyHttpLogs
 mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs
 mmLogoDetectionLog=mmLogoDetectionLogs
 mmFaceRecognizationLog=mmFaceRecognizationLogs
+ntcCollectVoipLog=ntcCollectVoipLogs
 ########################################
 #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
 dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/
@@ -543,5 +544,5 @@ cert_validate_success_info=Successful
 #ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2
 ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
 ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
-#域名验证正则
+#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
 domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$

src/main/resources/sql/20181107/update_sys_menu

@@ -0,0 +1,37 @@
+alter table sys_menu modify column menu_bg varchar(1024) DEFAULT null COMMENT '原表示背景颜色，现用于记录功能帮助的URL信息';
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/ip_white_list' WHERE (`id`='607');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/ip_address' WHERE (`id`='609');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/DNS' WHERE (`id`='611');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_advanced' WHERE (`id`='612');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/stream_media' WHERE (`id`='624');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/voip' WHERE (`id`='628');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/audio_sample' WHERE (`id`='632');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/video_sample' WHERE (`id`='633');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/picture_sample' WHERE (`id`='634');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/voip_sample' WHERE (`id`='635');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/video_scene' WHERE (`id`='637');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/SSL' WHERE (`id`='680');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/Mail_advanced' WHERE (`id`='682');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/FTP' WHERE (`id`='694');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/BGP' WHERE (`id`='698');
+UPDATE sys_menu SET `menu_bg`='/online-help/ysp/file_digest' WHERE (`id`='701');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_redirect_policy' WHERE (`id`='725');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/app' WHERE (`id`='738');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/IP_feature_advance' WHERE (`id`='739');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/HTTP_feature_advance' WHERE (`id`='740');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/domain_feature_advance' WHERE (`id`='741');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/basic_protocol' WHERE (`id`='902');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/tunnel_behavior' WHERE (`id`='903');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_block_policy' WHERE (`id`='911');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_redirect_policy' WHERE (`id`='912');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_replace_policy' WHERE (`id`='913');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_monitor_policy' WHERE (`id`='914');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_whiteList_policy' WHERE (`id`='915');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/p2p' WHERE (`id`='991');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/ssl_feature_advance' WHERE (`id`='1001');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/DNS_feature_advance' WHERE (`id`='1086');
+UPDATE sys_menu SET `menu_bg`='/online-help/app/payload_feature_advance' WHERE (`id`='1087');
+UPDATE sys_menu SET `menu_bg`='/online-help/proxy/ip_intercept_policy' WHERE (`id`='1099');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_URL' WHERE (`id`='1102');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/Mail' WHERE (`id`='1140');
+UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_website' WHERE (`id`='1149');

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -104,13 +104,13 @@
 					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
 					           <div class="col-md-6">
 					               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-					               		<option value=""><spring:message code="select"/></option>
-					               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
-					               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
-					               			<option value="${requestInfo.id}" 
-					               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
-					               		</c:if>
-					               	</c:forEach>
+					               		<%-- <option value=""><spring:message code="select"/></option> --%>
+						               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
+						               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
+						               			<option value="${requestInfo.id}" 
+						               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
+						               		</c:if>
+						               	</c:forEach>
 					               </select>
 					           </div>
 					           <div for="requestId"></div>

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -26,7 +26,7 @@
 		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
 	</c:when>
 	<c:when test="${label eq 'export'}">
-		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',100000,'${searchUrl}')" data-toggle="tooltip" data-placement="top">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top">
 			<i class="fa fa-download"> <spring:message code="export"/></i>
 		</a>
 	</c:when>
@@ -364,6 +364,11 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 				column.push($(this).text().trim());
 			}
 		});
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+		  if($("#exportValue").val() != null && $("#exportValue").val() != ""){
+			url+="&"+$("#exportType").val()+"="+$("#exportValue").val();
+		  }
+		}
 		if(column){
 			url+="&columns="+column.toString();
 		}

src/main/webapp/WEB-INF/tlds/fns.tld

@@ -391,5 +391,13 @@
     <function-signature>java.lang.String getHttpBodyKeyword(java.lang.Integer)</function-signature>
     <example>${fns:getHttpBodyKeyword(compileId)}</example>
   </function>
+  <!-- 根据id获取配置关键字 -->
+    <function>
+    <description>根据compileId获取crl</description>
+    <name>getTrustedCrlByCerId</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.util.List getTrustedCrlByCerId(java.lang.Integer)</function-signature>
+    <example>${fns:getTrustedCrlByCerId(cerId)}</example>
+  </function>
   
 </taglib>

src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp

@@ -32,6 +32,12 @@
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
  	});
  	var edit=function(url){
  		var cked = $('tbody tr td input.i-checks:checkbox:checked');
@@ -84,6 +90,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/asn/list?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -144,7 +152,7 @@
 							 		<shiro:hasPermission name="asn:ip:config">
 							 			<sys:delRow url="${ctx}/basics/asn/updateForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/basics/asn/exportAsnIp?functionId=${cfg.functionId }" searchUrl="${ctx}/basics/asn/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/basics/asn/exportAsnIp?functionId=${cfg.functionId }&asnIpGroup=${cfg.asnIpGroup}" searchUrl="${ctx}/basics/asn/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
 							 		<%-- <shiro:hasPermission name="asn:ip:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -40,6 +40,12 @@
 			$("#specServiceIdName").val("");
 			$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
 		});
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 </script>
 
@@ -85,6 +91,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -143,7 +151,7 @@
 							 		<shiro:hasPermission name="app:domain:config">
 							 			<sys:delRow url="${ctx}/app/domainCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                    	<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                    	<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:domain:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -40,6 +40,13 @@
 			$("#specServiceIdName").val("");
 			$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
 		});
+		
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 </script>
 
@@ -85,6 +92,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -143,7 +152,7 @@
 							 		<shiro:hasPermission name="app:http:config">
 							 			<sys:delRow url="${ctx}/app/httpCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:http:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -43,6 +43,12 @@
 			$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
 		});
 		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
+		
 	}); 
 </script>
 
@@ -88,6 +94,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -147,7 +155,7 @@
 							 		<shiro:hasPermission name="app:ip:config">
 							 			<sys:delRow url="${ctx}/app/ipCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppIpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:ip:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp

@@ -12,6 +12,12 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.ipCfg.destIpAddress}"){
+			$("#intype").val("${cfg.ipCfg.destIpAddress}");
+		}else if("${cfg.strCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.strCfg.cfgKeywords}");
+		}else if("${cfg.complexStrCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.complexStrCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -84,6 +90,12 @@
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
 		}); 
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 </script>
 
@@ -119,7 +131,11 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
 						callback="page();" />
@@ -152,6 +168,15 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<c:if test="${cfg.functionId ne 564 && cfg.functionId ne 567}">
+													<form:option value="ipCfg.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
+												</c:if>
+												<c:if test="${cfg.functionId ne 567}">
+													<form:option value="complexStrCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												</c:if>
+												<c:if test="${cfg.functionId eq 567}">
+													<form:option value="strCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												</c:if>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
 									
@@ -176,7 +201,7 @@
 							 		<shiro:hasPermission name="${configPermissionName }">
 							 			<sys:delRow url="${ctx}/app/feature/multiFeatureCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/feature/updateAppFeatureCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="${confirmPermissionName }">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -87,6 +87,12 @@
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
 		});
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 </script>
 
@@ -132,6 +138,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -207,7 +215,7 @@
 							 		<shiro:hasPermission name="app:policy:config">
 							 			<sys:delRow url="${ctx}/app/policyCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppPolicyCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                     	<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> 
+                                     	<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> 
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:policy:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -40,6 +40,12 @@
 			$("#specServiceIdName").val("");
 			$("#specServiceIdName").attr("placeholder",'<spring:message code="social_app"/>');
 		});
+		
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 </script>
 
@@ -68,6 +74,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -126,7 +134,7 @@
 							 		<shiro:hasPermission name="app:ssl:config">
 							 			<sys:delRow url="${ctx}/app/sslCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:ssl:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -37,6 +37,13 @@
 			$("#searchForm")[0].reset();
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
+		
+
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+					 if($("#intype").val() != null && $("#intype").val() != ""){
+						$("#exportValue").val($("#intype").val());
+				  } 
+				}
 	}); 
 </script>
 
@@ -65,6 +72,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -123,7 +132,7 @@
 							 		<shiro:hasPermission name="app:topic:config">
 							 			<sys:delRow url="${ctx}/app/topicDomainCfgForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/app/updateAppTopicDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                		<shiro:hasPermission name="app:domain:confirm">
 	                                    <div class="btn-group">

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -28,6 +28,8 @@
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
 			$("#intype").val("${cfg.ipPort.destIpAddress}");
+		}else if("${cfg.avContUrlCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.avContUrlCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -97,6 +99,13 @@
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
 		}); 
+		
+
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+					 if($("#intype").val() != null && $("#intype").val() != ""){
+						$("#exportValue").val($("#intype").val());
+				  } 
+				}
 	}); 
 	
 </script>
@@ -141,6 +150,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -169,7 +180,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
-												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option> --%>
+												<form:option value="avContUrlCfg.cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>
@@ -202,7 +213,7 @@
 							 		<shiro:hasPermission name="avVoip:config">
 							 			<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                        <sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
                                     </shiro:hasPermission>
                                     <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
                                		<shiro:hasPermission name="avVoip:confirm">

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -32,6 +32,12 @@
 			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
+		
  	});
  	var edit=function(url){
  		var cked = $('tbody tr td input.i-checks:checkbox:checked');
@@ -71,6 +77,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -129,7 +137,7 @@
 							 		<shiro:hasPermission name="avFileSample:config">
 							 			<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-<%--                                         <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
+<%--                                         <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
  --%>                                    </shiro:hasPermission>
                                		<shiro:hasPermission name="avFileSample:confirm">
 	                                    <div class="btn-group">