导出功能 标题优化

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

@@ -83,7 +83,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 是否审核
 	 */
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=100)
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
 	protected Integer isAudit;
 	/**
 	 * 创建人员

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

@@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@SerializedName("ipType")
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=4)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
 	protected Integer ipPattern; 
 	@ExcelField(title="client_ip",sort=5)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=6)
+	@ExcelField(title="server_ip",sort=4)
 	protected String destIpAddress;
 	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=7)
 	protected Integer portPattern;

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

@@ -23,11 +23,11 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 	private String indexTable="ddos_ip_cfg";
-	@ExcelField(title="antiddos_protocol",sort=41)
+	@ExcelField(title="antiddos_protocol",sort=22)
 	private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
-	@ExcelField(title="bps_threadshold",sort=42)
+	@ExcelField(title="bps_threadshold",sort=23)
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
-	@ExcelField(title="pps_threadshold",sort=43)
+	@ExcelField(title="pps_threadshold",sort=24)
 	private Long ppsThreadshold;
 
 	public String getAntiddosProtocol() {

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -1821,7 +1821,23 @@ public class ExportExcel {
 				if(!StringUtil.isEmpty(titleStr)){
 					//去掉不需要展示的header
 					if(!(noExportField.indexOf(","+titleStr+",") > -1)){
-						titleStr=msgProp.getProperty(titleStr)==null?titleStr:msgProp.getProperty(titleStr);
+						//需要替换的header
+						boolean flag=true;
+						if(noExportField.contains("&")){
+							String replaceField=noExportField.substring(noExportField.indexOf("&")+1);
+							String[] replaceStr=replaceField.split("-");
+							for (int i = 0; i < replaceStr.length; i++) {
+								String [] fields=replaceStr[i].split(":");
+								if(fields[0].equals(titleStr)){
+									titleStr=msgProp.getProperty(fields[1]);
+									flag=false;
+									break;
+							 }
+						   }
+						}
+						if(flag){
+						   titleStr=msgProp.getProperty(titleStr)==null?titleStr:msgProp.getProperty(titleStr);
+						}
 						headerList.add(titleStr);
 						commentList.add(commentStr);
 					}

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

@@ -131,7 +131,7 @@ public class DdosCfgController extends BaseController {
 				Page<DdosIpCfg> page = ddosCfgService.findPage(pageInfo, entity);
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), DdosIpCfg.class);
-				String cfgIndexInfoNoExport=",client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+				String cfgIndexInfoNoExport=",client_ip,client_port,server_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 				dataMap.put(entity.getMenuNameCode(), page.getList());
 			/*}*/

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

@@ -184,11 +184,11 @@ public class BgpCfgController extends BaseController{
 					titleList.add(entity.getMenuNameCode());
 					titleList.add("NTC_IP");
 					titleList.add("NTC_BGP_AS");
-					titleList.add("NTC_SUBSCRIBE_ID");
+//					titleList.add("NTC_SUBSCRIBE_ID");
 					classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
 					classMap.put("NTC_IP", IpPortCfg.class);
 					classMap.put("NTC_BGP_AS", BaseStringCfg.class);
-					classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
+//					classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
 					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 					String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 											+ ",config_time,editor,edit_time,auditor,audit_time"
@@ -205,22 +205,22 @@ public class BgpCfgController extends BaseController{
 					noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 					noExportMap.put("NTC_IP", ipPortInfoNoExport);
 					noExportMap.put("NTC_BGP_AS", regionCfgNoExport);
-					noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
+//					noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
 					List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
-					List<BaseStringCfg> subscribeInfoList=new ArrayList<BaseStringCfg>();
+//					List<BaseStringCfg> subscribeInfoList=new ArrayList<BaseStringCfg>();
 					List<BaseStringCfg> asInfoList=new ArrayList<BaseStringCfg>();
 					for (CfgIndexInfo cfg : page.getList()) {
 						CfgIndexInfo cfgIndexInfo=bgpCfgService.exportbgp(cfg);
 						ipList.addAll(cfgIndexInfo.getIpPortList());
-						subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList());
+//						subscribeInfoList.addAll(cfgIndexInfo.getNtcSubscribeIdCfgList());
 						asInfoList.addAll(cfgIndexInfo.getNtcBgpAsCfgList());
 					}
 					asInfoList=BaseStringCfg.replaceBaseKeyList(asInfoList);
-					subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList);
+//					subscribeInfoList=BaseStringCfg.baseHexList(subscribeInfoList);
 					dataMap.put(entity.getMenuNameCode(), page.getList());
 					dataMap.put("NTC_IP", ipList);
 					dataMap.put("NTC_BGP_AS", asInfoList);
-					dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList);
+//					dataMap.put("NTC_SUBSCRIBE_ID", subscribeInfoList);
 					
 				/*}*/
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);

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

@@ -593,7 +593,7 @@ public class FileTransferCfgController  extends BaseController{
 						String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,ir_type,creator,creator"
 												+ ",config_time,editor,edit_time,auditor,audit_time"
 												+",letter,whether_area_block,classification,attribute,label"
-												+",userregion2,userregion3,userregion4,userregion5,group_name,";
+												+",userregion2,userregion3,userregion4,userregion5,group_name,&userregion1:p2p_ip_config_type-";
 						String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 								+ ",config_time,editor,edit_time,auditor,audit_time"
 								+",letter,whether_area_block,classification,attribute,label"
@@ -601,7 +601,7 @@ public class FileTransferCfgController  extends BaseController{
 						String hashCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 								+ ",config_time,editor,edit_time,auditor,audit_time"
 								+",letter,whether_area_block,classification,attribute,label"
-								+",userregion2,userregion3,userregion4,userregion5,";
+								+",userregion2,userregion3,userregion4,userregion5,&userregion1:p2p_hash_type-";
 						String keyCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 								+ ",config_time,editor,edit_time,auditor,audit_time"
 								+",letter,whether_area_block,classification,attribute,label"

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

@@ -361,7 +361,7 @@ public class IpController extends BaseController{
 					classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
 					classMap.put("NTC_IP", IpPortCfg.class);
 					classMap.put("asn_policy", ConfigGroupInfo.class);
-					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion3,userregion4,userregion5,";
+					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion3,userregion4,userregion5,&userregion2:ratelimit-";
 					String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 											+ ",config_time,editor,edit_time,auditor,audit_time"
 											+",letter,whether_area_block,classification,attribute,label"

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

@@ -553,22 +553,6 @@ public class WebsiteController extends BaseController{
 							pageInfo.setPageSize(-1);
 						}
 						Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
-						titleList.add(entity.getMenuNameCode());
-						titleList.add("NTC_HTTP_URL");
-						titleList.add("NTC_HTTP_REQ_HDR");
-						titleList.add("NTC_HTTP_RES_HDR");
-						titleList.add("NTC_HTTP_REQ_BODY");
-						titleList.add("NTC_HTTP_RES_BODY");
-						titleList.add("NTC_UNIVERSAL_IP");
-						titleList.add("NTC_SUBSCRIBE_ID");
-						classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
-						classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
-						classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class);
-						classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
-						classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
-						classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
-						classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class);
-						classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
 						String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 						String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 													+ ",config_time,editor,edit_time,auditor,audit_time"
@@ -597,16 +581,7 @@ public class WebsiteController extends BaseController{
 						String ntcSubscribeIdCfgNoExport=",do_log,action,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,";
+													+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
-						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
-						noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
-						noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport);
-						noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
-						noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
-						noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
-						noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport);
-						noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
-						
 						List<BaseStringCfg> httpUrlList = new ArrayList<>();
 						List<ComplexkeywordCfg> httpReqHdrList = new ArrayList<>();
 						List<ComplexkeywordCfg> httpResHdrList = new ArrayList<>();
@@ -630,15 +605,43 @@ public class WebsiteController extends BaseController{
 						httpReqBodyList=BaseStringCfg.replaceBaseKeyList(httpReqBodyList);
 						httpResBodyList=BaseStringCfg.replaceBaseKeyList(httpResBodyList);
 						subscribeIdList=BaseStringCfg.baseHexList(subscribeIdList);
+						titleList.add(entity.getMenuNameCode());
+						classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
+						noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
 						dataMap.put(entity.getMenuNameCode(), page.getList());
-						dataMap.put("NTC_HTTP_URL", httpUrlList);
+						
-						dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
+						if(entity.getFunctionId()!=635){
-						dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
+							titleList.add("NTC_HTTP_URL");
+							titleList.add("NTC_HTTP_REQ_HDR");
+							titleList.add("NTC_HTTP_RES_HDR");
+							classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
+							classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class);
+							classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
+							noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
+							noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport);
+							noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
+							dataMap.put("NTC_HTTP_URL", httpUrlList);
+							dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
+							dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
+						}
+						titleList.add("NTC_HTTP_REQ_BODY");
+						titleList.add("NTC_HTTP_RES_BODY");
+						classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
+						classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
+						noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
+						noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
 						dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList);
 						dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList);
+						if(entity.getFunctionId()!=635){
+						titleList.add("NTC_UNIVERSAL_IP");
+						titleList.add("NTC_SUBSCRIBE_ID");
+						classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class);
+						classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
+						noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport);
+						noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
 						dataMap.put("NTC_UNIVERSAL_IP", ipPortList);
 						dataMap.put("NTC_SUBSCRIBE_ID",subscribeIdList);
-						
+						}
 					/*}*/
 					this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 				} catch (Exception e) {

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.callback.ProxyFileStrategyCfg;
 import com.nis.domain.configuration.BaseStringCfg;
@@ -33,6 +35,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
@@ -267,8 +270,45 @@ public class HttpRedirectPolicyController extends BaseController{
 						pageInfo.setPageNo(1);
 						pageInfo.setPageSize(-1);
 					}
+					
 					Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
+					Properties prop = getMsgProp();
+					for (CfgIndexInfo str : page.getList()) {
+						if(entity.getFunctionId()!=210 && entity.getFunctionId()!=211){
+							String type="RESPONSE_CODE";
+							if(entity.getFunctionId()==207){
+								type="RESPONSE_CODE";
+							}else  if(entity.getFunctionId()==208){
+								type="REDIRECT_RESPONSE_CODE";
+							}else if(entity.getFunctionId()==209){
+								type="CONTROL_REPLACE_ZONE";
+							}
+							String dictlabel= DictUtils.getDictLabel(type, str.getUserRegion1());
+							str.setUserRegion1(prop.getProperty(dictlabel));
+							if(entity.getFunctionId()==207 || entity.getFunctionId()==208){
+							if(StringUtil.isEmpty(str.getUserRegion2())){
+								if(!StringUtil.isEmpty(str.getUserRegion3())){
+									ProxyFileStrategyCfg  file= new ProxyFileStrategyCfg();
+									file.setCompileId(Integer.valueOf(str.getUserRegion3()));
+									List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService.getProxyFileStrategyCfgList(file);
+									if(allProxyFileStrategys!=null && allProxyFileStrategys.size()>0){
+										str.setUserRegion2(allProxyFileStrategys.get(0).getCfgDesc());	
+									}
+								}
+							}
+						  }
+						}
+					}
 					String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+					if(entity.getFunctionId()==207){
+						cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-";
+					}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-";
+					}else if(entity.getFunctionId()==211){
+						cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+					 }
 					String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 												+ ",config_time,editor,edit_time,auditor,audit_time"
 												+",letter,whether_area_block,classification,attribute,label"

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

@@ -5,31 +5,29 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 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.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.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+
 import com.nis.domain.Page;
-import com.nis.domain.SysUser;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.InterceptPktBin;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
@@ -198,6 +196,7 @@ public class InterceptController extends CommonController{
 				Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
 				Map<String, List> dataMap=new HashMap<String, List>();
 				Map<String, String> noExportMap=new HashMap<String, String>();
+				Map<String, String> replaceExportMap=new HashMap<String, String>();
 				
 				
 				/*//导出选中记录
@@ -218,9 +217,34 @@ public class InterceptController extends CommonController{
 						pageInfo.setPageSize(-1);
 					}
 					Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(pageInfo, entity);
+					
+					//获取证书信息
+					List<PxyObjKeyring> certificateList=new ArrayList<PxyObjKeyring>();
+					if(entity.getFunctionId().equals(200)){
+						certificateList=pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "ip");
+					}
+					if(entity.getFunctionId().equals(201)){
+						certificateList=pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "domain");
+					}
+					for (CfgIndexInfo str : page.getList()) {
+						if(!StringUtil.isEmpty(str.getUserRegion5())){
+							Properties prop = getMsgProp();
+							 String cs= DictUtils.getDictLabel("INTERCEPT_DOMAIN_INTENSITY", str.getUserRegion5());
+							 str.setUserRegion5(prop.getProperty(cs));
+						}
+						if(certificateList!=null){
+						if(entity.getFunctionId()==200|| entity.getFunctionId()==201){
+						     for (PxyObjKeyring pxyObjKeyring : certificateList) {
+								 if(str.getUserRegion2().equals(pxyObjKeyring.getCompileId())){
+									 str.setUserRegion2(pxyObjKeyring.getCfgDesc());
+								 }
+						       } 
+							}	
+						}
+					}
 					titleList.add(entity.getMenuNameCode());
 					classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
-					String cfgIndexInfoNoExport=",policy_name,group_name,userregion4,userregion5,";
+					String cfgIndexInfoNoExport="";
 					String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
 											+ ",config_time,editor,edit_time,auditor,audit_time"
 											+",letter,whether_area_block,classification,attribute,label"
@@ -233,7 +257,7 @@ public class InterceptController extends CommonController{
 							+ ",config_time,editor,edit_time,auditor,audit_time"
 							+",letter,whether_area_block,classification,attribute,label"
 							+",userregion1,userregion2,userregion3,userregion4,userregion5,";
-					noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
+					
 					List<IpPortCfg> ipList=new ArrayList<IpPortCfg>();
 					List<BaseStringCfg> httpUrlList=new ArrayList<BaseStringCfg>();
 					List<BaseStringCfg> pktBinList=new ArrayList<BaseStringCfg>();
@@ -247,6 +271,7 @@ public class InterceptController extends CommonController{
 					httpUrlList=BaseStringCfg.baseHexList(httpUrlList);
 					dataMap.put(entity.getMenuNameCode(), page.getList());
 					if(entity.getFunctionId()==212){  //IP Payload
+						cfgIndexInfoNoExport=",do_log,log_total,policy_name,group_name,userregion4,userregion5,&userregion1:replace_zone-userregion2:replaced_content-userregion3:replace_content-";
 						titleList.add("PXY_INTERCEPT_IP");
 						titleList.add("PXY_INTERCEPT_PKT_BIN");
 						classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
@@ -256,16 +281,20 @@ public class InterceptController extends CommonController{
 						dataMap.put("PXY_INTERCEPT_IP", ipList);
 						dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList);
 					}else if(entity.getFunctionId()==200){//IP拦截
+						cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,userregion5,&userregion2:ratelimit-userregion1:certificate-";
 						titleList.add("PXY_INTERCEPT_IP");
 						classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
 						noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);
 						dataMap.put("PXY_INTERCEPT_IP", ipList);
 					}else if(entity.getFunctionId()==201){//域名拦截
+						cfgIndexInfoNoExport=",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:certificate-userregion5:intercept_intensity-";
 						titleList.add("NTC_HTTP_URL");
 						classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
 						noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
 						dataMap.put("NTC_HTTP_URL", httpUrlList);
 					}
+					noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
+					
 				/*}*/
 				this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
 			} catch (Exception e) {

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

@@ -75,13 +75,13 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 	
 	public CfgIndexInfo exportbgp(CfgIndexInfo entity){
 		List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);
-		NtcSubscribeIdCfg  subscribeId = new NtcSubscribeIdCfg();
+//		NtcSubscribeIdCfg  subscribeId = new NtcSubscribeIdCfg();
-		subscribeId.setCompileId(entity.getCompileId());
+//		subscribeId.setCompileId(entity.getCompileId());
-		subscribeId.setIsValid(entity.getIsValid());
+//		subscribeId.setIsValid(entity.getIsValid());
-		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);
+//		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList = stringCfgDao.findSubscribeIdCfgList(subscribeId);
 		List<NtcBgpAsCfg> ntcBgpAsCfgList = bgpCfgDao.getNtcBgpAsList(entity);
 		entity.setIpPortList(ipPortList);
-		entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList);
+//		entity.setNtcSubscribeIdCfgList(ntcSubscribeIdCfgList);
 		entity.setNtcBgpAsCfgList(ntcBgpAsCfgList);
 		return entity;
 	}

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -523,4 +524,5 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			logger.info("http配置取消配置响应信息："+result.getMsg());
 		}
 	}
+	
 }

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

@@ -192,7 +192,7 @@ public class IpMultiplexPoolCfgService extends BaseService{
 	
 	public List<IpMultiplexPoolCfg> getIsp(List<IpMultiplexPoolCfg> ispList){
 		for (IpMultiplexPoolCfg snat : ispList) {
-			if(StringUtil.isEmpty(snat.getAreaEffectiveIds())){
+			if(!StringUtil.isEmpty(snat.getAreaEffectiveIds())){
 			if(snat.getAreaEffectiveIds().contains(":")){
 				int index=snat.getAreaEffectiveIds().indexOf(":");
 				String ispCode =snat.getAreaEffectiveIds().substring(index+1);

src/main/resources/sql/20181026/update_region_dict.sql

@@ -0,0 +1,2 @@
+#IP<49><50>ַȥ<D6B7><C8A5>ip range<67><65><EFBFBD><EFBFBD>
+update function_region_dict set config_ip_pattern='1,3' where  dict_id='35';