dns关键字组配置审核功能

2、协议菜单中http url 增加公共组配置，同时修改审核，取消审核公共组部分，并且界面回显展示组号。

(cherry picked from commit d1f64348f4)

src/main/java/com/nis/domain/basics/AsnGroupInfo.java

@@ -34,8 +34,14 @@ public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
 	private Integer regionId;
 	private Integer orgGroupId;
 	
+	private Integer onlyGroupId;// ip地址独用组id
 	
-	
+	public Integer getOnlyGroupId() {
+		return onlyGroupId;
+	}
+	public void setOnlyGroupId(Integer onlyGroupId) {
+		this.onlyGroupId = onlyGroupId;
+	}
 	public Integer getOrgGroupId() {
 		return orgGroupId;
 	}

src/main/java/com/nis/domain/basics/UrlCommGroupCfg.java

@@ -0,0 +1,64 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class UrlCommGroupCfg extends BaseStringCfg<UrlCommGroupCfg>{
+	
+	private static final long serialVersionUID = 398247881810945300L;
+	private static final String tableName="http_url_cfg";
+	
+	@ExcelField(title="key_word",sort=3)
+    protected String  cfgKeywords;//url关键字配置
+	
+//    protected Integer  exprType;//表达式类型
+//    protected Integer  matchMethod;//匹配类型
+    protected Integer  isHexbin;//是否大小写敏感
+    protected String  ratelimit;//限速比例,0到1之间
+    @ExcelField(title="group_name",sort=108)
+    protected String  groupName;//公共组名称
+    
+    
+	
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+//	public Integer getExprType() {
+//		return exprType;
+//	}
+//	public void setExprType(Integer exprType) {
+//		this.exprType = exprType;
+//	}
+//	public Integer getMatchMethod() {
+//		return matchMethod;
+//	}
+//	public void setMatchMethod(Integer matchMethod) {
+//		this.matchMethod = matchMethod;
+//	}
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	public String getRatelimit() {
+		return ratelimit;
+	}
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public static String getTablename() {
+		return tableName;
+	}
+    
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+    
+}

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

@@ -287,7 +287,20 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected Integer regionId;//仅用于copy属性使用
 	protected Integer numberRegionGroupId;//仅用于copy属性使用
 	protected Integer numberRegionRegionId;//仅用于copy属性使用
-	
+	private Integer groupType; //url组以及dns组相关功能使用 
+	private Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public Integer getUdFlag() {
+		return udFlag;
+	}
+	public void setUdFlag(Integer udFlag) {
+		this.udFlag = udFlag;
+	}
 	public Integer getNumberRegionGroupId() {
 		return numberRegionGroupId;
 	}

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

@@ -15,6 +15,7 @@ import com.google.gson.annotations.Expose;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
+import com.nis.domain.basics.UrlCommGroupCfg;
 import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
 
@@ -88,8 +89,9 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<AsnKeywordCfg> asnKeywords;
 	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
-
-
+	
+	private UrlCommGroupCfg urlCommGroupCfg;
+	private List<UrlCommGroupCfg> urlCommGroupList;
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -411,4 +413,16 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public void setTotalLogs(Long totalLogs) {
 		this.totalLogs = totalLogs;
 	}
+	public List<UrlCommGroupCfg> getUrlCommGroupList() {
+		return urlCommGroupList;
+	}
+	public void setUrlCommGroupList(List<UrlCommGroupCfg> urlCommGroupList) {
+		this.urlCommGroupList = urlCommGroupList;
+	}
+	public UrlCommGroupCfg getUrlCommGroupCfg() {
+		return urlCommGroupCfg;
+	}
+	public void setUrlCommGroupCfg(UrlCommGroupCfg urlCommGroupCfg) {
+		this.urlCommGroupCfg = urlCommGroupCfg;
+	}
 }

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

@@ -0,0 +1,242 @@
+/**
+ *@Title: BaseEnhancedStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:42:52
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.util.List;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.taglibs.standard.functions.Functions;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @ClassName: BaseEnhancedStringConfig.java 
+ * @Description: 基础增强字符串类配置
+ * @author (wx)
+ * @date 2018年2月5日 下午5:42:52
+ * @version V1.0
+ */
+public class DnsKeywordCfg extends BaseCfg<DnsKeywordCfg>{
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	private static final long serialVersionUID = -1417089397345367232L;
+	private static final String tableName="dns_domain_cfg";
+	/**
+	 * 匹配区域
+	 */
+	@Expose
+	@ExcelField(title="district",sort=301)
+	@SerializedName("district")
+	protected String district ;
+	protected String districtShowName;
+	
+	protected String dnsGroupName;
+	/**
+	 * 关键字
+	 */
+	@Expose
+	@SerializedName("keywords")
+	@ExcelField(title="key_word",sort=302)
+	protected String cfgKeywords;
+	protected String keywordsShowName;
+	/**
+	 * 表达式类型
+	 */
+	@Expose
+	@SerializedName("exprType")
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=303)
+	protected Integer exprType ;
+	/**
+	 * 匹配方式
+	 */
+	@Expose
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=304)
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+	
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=305)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=306)
+	protected Integer isCaseInsenstive;
+	
+	/**
+	 * 是否hex二进制
+	 */
+	@Expose
+	@SerializedName("isHexbin")
+	protected Integer isHexbin ;
+	/**
+	 * district
+	 * @return  district
+	*/
+	
+	public String getDistrict() {
+		return district;
+	}
+	/**
+	 * copy属性使用
+	 */
+	protected Long dnsStrategyId;
+	protected Integer appCode;//仅用于copy属性使用
+	protected Integer behavCode;//仅用于copy属性使用
+	protected Integer specServiceId;//仅用于copy属性使用
+	
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+	public Long getDnsStrategyId() {
+		return dnsStrategyId;
+	}
+	public void setDnsStrategyId(Long dnsStrategyId) {
+		this.dnsStrategyId = dnsStrategyId;
+	}
+	/**
+	 * @param district the district to set
+	 */
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+	public String getCfgKeywords() {
+//		cfgKeywords = StringEscapeUtils.unescapeHtml4(cfgKeywords);
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+	public String getDistrictShowName() {
+		return districtShowName;
+	}
+	public void setDistrictShowName(String districtShowName) {
+		this.districtShowName = districtShowName;
+	}
+	/**
+	 * exprType
+	 * 继承此类的类会覆盖该方法写自己的缺省值
+	 * @return  exprType
+	*/
+	
+	public Integer getExprType() {
+		return this.exprType;
+	}
+	/**
+	 * @param exprType the exprType to set
+	 */
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+	/**
+	 * matchMethod
+	 * 继承此类的类会覆盖该方法写自己的缺省值
+	 * @return  matchMethod
+	*/
+	
+	public Integer getMatchMethod() {
+		return this.matchMethod;
+	}
+	/**
+	 * @param matchMethod the matchMethod to set
+	 */
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	/**
+	 * isHexbin
+	 * @return  isHexbin
+	*/
+	
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+	/**
+	 * @param isHexbin the isHexbin to set
+	 */
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = 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;
+	}
+	/* (non-Javadoc)
+	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
+	 */
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.exprType=0;
+		this.isHexbin = 0 ;
+		this.matchMethod=3;
+	}
+	
+	public static List<DnsKeywordCfg> replaceComplexKeyList(List<DnsKeywordCfg> list){
+		for (int i = 0; i < list.size(); i++) {
+			DnsKeywordCfg  base=(DnsKeywordCfg)list.get(i);
+			base.setIsHex(base.getIsHexbin());
+			// '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+			if(base.getIsHexbin()==2){
+				base.setIsCaseInsenstive(1);
+			}else{
+				base.setIsCaseInsenstive(0);
+			}
+			base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
+	 }
+		return list;
+	}
+	public Integer getIndex() {
+		return index;
+	}
+	public void setIndex(Integer index) {
+		this.index = index;
+	}
+	public static String getTablename() {
+		return tableName;
+	}
+	public void setDnsGroupName(String dnsGroupName) {
+		this.dnsGroupName = dnsGroupName;
+	}
+	public String getDnsGroupName() {
+		return dnsGroupName;
+	}
+}

src/main/java/com/nis/domain/configuration/template/UrlCommGroupTemplate.java

@@ -0,0 +1,37 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入url分组 配置
+ */
+public class UrlCommGroupTemplate extends BasicTemplate{
+	
+	private String cfgDesc;
+	private String cfgKeywords; 
+	private String matchMethod; 
+	
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="key_word",align=2,sort=2)
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=3)
+	public String getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(String matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+}

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

@@ -212,7 +212,7 @@ public class ConfigDictUtils {
 	 * @param compileId
 	 * @return
 	 */
-	public static List<Integer> getASNIPNum(Integer groupId ) {
+	public static List<Integer> getASNIPNum(Long groupId ) {
 		List<Integer> ipNum=new ArrayList<>();
 		try {
 			if(!StringUtil.isEmpty(groupId)){

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

@@ -725,6 +725,9 @@ public final class Constants {
 	public static final String TREND_TOTAL_REPORT=Configurations.getStringProperty("trendTotalReport","trendTotalReport");
 	public static final String TRAFFIC_APP_TREND=Configurations.getStringProperty("trafficAppTrend","trafficAppTrend");
 	public static final String APPCONN_RECORD_TOP100=Configurations.getStringProperty("appConnRecordTop100","appConnRecordTop100");
+	public static final String TRAFFIC_APP_PPS_TREND=Configurations.getStringProperty("trafficAppPpsTrend","trafficAppPpsTrend");
+	public static final String TRAFFIC_APP_BPS_TREND=Configurations.getStringProperty("trafficAppBpsTrend","trafficAppBpsTrend");
+	
 	/**
 	 * httpclient 工具超时时间设置
 	 */

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

@@ -46,6 +46,7 @@ import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.AppComplexFeatureCfg;
@@ -155,6 +156,7 @@ import com.nis.web.service.SystemService;
 import com.nis.web.service.UserService;
 import com.nis.web.service.basics.AsnGroupInfoService;
 import com.nis.web.service.basics.AsnIpCfgService;
+import com.nis.web.service.basics.DnsKeywordCfgService;
 import com.nis.web.service.basics.IpReuseIpCfgService;
 import com.nis.web.service.basics.PolicyGroupInfoService;
 import com.nis.web.service.basics.ServiceDictInfoService;
@@ -331,6 +333,8 @@ public class BaseController {
 	protected PxyObjSpoofingIpPoolService pxyObjSpoofingIpPoolService;// 欺骗IP池
 	@Autowired
 	protected AsnGroupInfoService asnGroupInfoService;// asn组
+	@Autowired
+	protected DnsKeywordCfgService dnsKeywordCfgService;//DNS关键字分组配置
 	/**
 	 * 管理基础路径
 	 */
@@ -639,6 +643,8 @@ public class BaseController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(),  cfg.getUdFlag());
+		model.addAttribute("policyGroupInfos", policyGroupInfos);
 	}
 
 	protected void initUpdateFormCondition(Model model, BaseCfg cfg) {
@@ -703,6 +709,8 @@ public class BaseController {
 		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
+		model.addAttribute("policyGroupInfos", policyGroupInfos);
 	}
 
 	public List<AreaBean> getAreaIsps(String areaEffectiveIds, List<AreaBean> areaIspList, List<SysDictInfo> isps,
@@ -1720,7 +1728,14 @@ public class BaseController {
 							//处理config_group_info和asn_group_info
 							asnIpCfgService.processGroup(serviceDict,asnNoMaps,asnOrgList,isSend,isImportAll.get(0).getItemCode());
 							if(!asnIpMaps.isEmpty()){
+								//未下发过的组织下asn ip信息
+								Map<Long,List<AsnIpCfg>> newAsnIpMap=Maps.newConcurrentMap();
+								int newAsnIpIndex=0;
+								//下发过的组织下asn ip信息
+								Map<Long,List<AsnIpCfg>> oldAsnIpMap=Maps.newConcurrentMap();
+								int oldAsnIpIndex=0;
 								int index=0;
+								
 								List<AsnIpCfg> asnIpCfgs=Lists.newArrayList();
 								String asnIds=""; 
 								List<Integer> regionIds=Lists.newArrayList();
@@ -1765,7 +1780,7 @@ public class BaseController {
 											asnIpCfg.setAsnIpGroup(asnNoMaps.get(2).get(Long.parseLong(asnIpCfg.getUserRegion1())).getGroupId());
 											asnIpCfg.setCompileId(asnNoMaps.get(2).get(Long.parseLong(asnIpCfg.getUserRegion1())).getCompileId());
 											if(isSend.equals("1")) {
-												/*//已下发
+												//已下发
 												if(asnNoMaps.get(3).keySet().contains(Long.valueOf(asnIpCfg.getUserRegion1()))){
 													//groupId已经在了
 													if(oldAsnIpMap.keySet().contains(Long.valueOf(asnIpCfg.getAsnIpGroup()))){
@@ -1789,20 +1804,6 @@ public class BaseController {
 														newAsnIpIndex++;
 													}
 												}
-												*//**********************新的asn ip达到最大量后发送一次***********************//*
-												//未下发过的asnGroup
-												if(newAsnIpIndex==Constants.MAAT_JSON_SEND_SIZE){
-													asnIpCfgService.auditAsnIp(newAsnIpMap,asnNoMaps,"maat",newAsnIpIndex);
-													newAsnIpMap.clear();
-													newAsnIpIndex=0;
-												}
-												*//**********************新的asn ip达到最大量后发送一次***********************//*
-												//已下发过的asnGroup
-												if(oldAsnIpIndex==Constants.MAAT_JSON_SEND_SIZE){
-													asnIpCfgService.auditAsnIp(oldAsnIpMap,asnNoMaps,"common",oldAsnIpIndex);
-													oldAsnIpMap.clear();
-													oldAsnIpIndex=0;
-												}*/
 												
 											}else{
 												asnIpCfgs.add(asnIpCfg);
@@ -1816,44 +1817,68 @@ public class BaseController {
 											isNullIndex++;
 										}
 									}
-									//
-									if(!StringUtil.isEmpty(asnIpCfgs) && asnIpCfgs.size()>Constants.MAAT_JSON_SEND_SIZE ){
-										if(!StringUtil.isEmpty(asnIds)){
-											asnIds=asnIds.substring(0,asnIds.length()-1);
-										}
-										asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds);
-										asnIds="";
-										asnIpCfgs.clear();
-									}
-									/*if(isSend.equals("1")) {
+									//处理ASN IP时分组处理，当处理完某一组的asnip量达到maat下发最大值时，保存已处理的asn ip，isSend=1（并下发）
+									if(isSend.equals("1")) {
 										//未下发过的asnGroup
-										if(!newAsnIpMap.isEmpty()){
+										if(!newAsnIpMap.isEmpty() && newAsnIpIndex >= Constants.MAAT_JSON_SEND_SIZE){
+											if(!StringUtil.isEmpty(asnIpCfgs) && !StringUtil.isEmpty(asnIds)){
+												asnIds=asnIds.substring(0,asnIds.length()-1);
+												asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds,isImportAll.get(0).getItemCode());
+												asnIds="";
+												asnIpCfgs.clear();
+											}
+											
 											asnIpCfgService.auditAsnIp(newAsnIpMap,asnNoMaps,"maat",newAsnIpIndex);
 											newAsnIpMap.clear();
 											newAsnIpIndex=0;
 										}
 										//已下发过的asnGroup
-										if(!oldAsnIpMap.isEmpty()){
+										if(!oldAsnIpMap.isEmpty() && oldAsnIpIndex >= Constants.MAAT_JSON_SEND_SIZE){
+											
+											if(!StringUtil.isEmpty(asnIpCfgs) && !StringUtil.isEmpty(asnIds)){
+												asnIds=asnIds.substring(0,asnIds.length()-1);
+												asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds,isImportAll.get(0).getItemCode());
+												asnIds="";
+												asnIpCfgs.clear();
+											}
+											
 											asnIpCfgService.auditAsnIp(oldAsnIpMap,asnNoMaps,"common",oldAsnIpIndex);
 											oldAsnIpMap.clear();
 											oldAsnIpIndex=0;
 										}
+									}else {
+										if(!StringUtil.isEmpty(asnIpCfgs) && asnIpCfgs.size()>Constants.MAAT_JSON_SEND_SIZE ){
+											if(!StringUtil.isEmpty(asnIds)){
+												asnIds=asnIds.substring(0,asnIds.length()-1);
+												asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds,isImportAll.get(0).getItemCode());
+												asnIds="";
+												asnIpCfgs.clear();
+											}
+										}
 									}
-									//仅仅需要保存的数
-									if(!StringUtil.isEmpty(asnIpCfgs)){
-										asnIpCfgService.saveAsnIp(asnIpCfgs);
-										asnIpCfgs.clear();
-									}
-									_ipPortCfgs.clear();
-									logger.error("ASN NO:"+e.getKey()+" :value"+e.getValue().size());*/
 								} 
-								if(!StringUtil.isEmpty(asnIpCfgs) ){
-									if(!StringUtil.isEmpty(asnIds)){
-										asnIds=asnIds.substring(0,asnIds.length()-1);
-									}
-									asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds);
-									asnIpCfgs.clear();
+								
+								//处理ASN IP时最后一批未达到maat提交总量时，也需要保存。
+								if(!StringUtil.isEmpty(asnIpCfgs) && !StringUtil.isEmpty(asnIds)){
+									asnIds=asnIds.substring(0,asnIds.length()-1);
+									asnIpCfgService.saveAsnIp(asnIpCfgs,asnIds,isImportAll.get(0).getItemCode());
 									asnIds="";
+									asnIpCfgs.clear();
+								}
+								if(isSend.equals("1")) {
+									
+									//未下发过的asnGroup
+									if(!newAsnIpMap.isEmpty() ){
+										asnIpCfgService.auditAsnIp(newAsnIpMap,asnNoMaps,"maat",newAsnIpIndex);
+										newAsnIpMap.clear();
+										newAsnIpIndex=0;
+									}
+									//已下发过的asnGroup
+									if(!oldAsnIpMap.isEmpty() ){
+										asnIpCfgService.auditAsnIp(oldAsnIpMap,asnNoMaps,"common",oldAsnIpIndex);
+										oldAsnIpMap.clear();
+										oldAsnIpIndex=0;
+									}
 								}
 							}
 							//是否全量下发所有的asn info信息
@@ -3757,7 +3782,7 @@ public class BaseController {
 		List<NtcPzReport> list=null;
 		try {
 			//调用带有超时时间的方法，设置与页面ajax获取total log 超时时间保持一致 页面设置在pzlog.js
-			String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate),Constants.CLIENT_CONNECT_TIMEOUT,10000);
+			String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate),Constants.CLIENT_CONNECT_TIMEOUT,30000);
 			list=getList(json);
 		} catch (Exception e) {
 			logger.error("获取日志总量失败！",e);

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

@@ -0,0 +1,182 @@
+package com.nis.web.controller.basics;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.DnsKeywordCfg;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.DictUtils;
+import com.nis.util.StringUtil;
+import com.nis.web.controller.BaseController;
+import com.nis.web.security.UserUtils;
+@Controller
+@RequestMapping(value = "${adminPath}/basics/dns/keyword")
+public class DnsKeywordController extends BaseController{
+	@RequestMapping(value = {"/list"})
+	public String list(Model model,HttpServletRequest  request
+			,HttpServletResponse response,@ModelAttribute("cfg")DnsKeywordCfg entity
+			){
+		Page<DnsKeywordCfg> page = dnsKeywordCfgService.findPage(new Page<DnsKeywordCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model, entity);
+		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
+		model.addAttribute("regionList", regionList);
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		return "/basics/dnsKeywordCfgList";
+	}
+	@RequestMapping(value = {"/addForm"})
+	public String addForm(Model model,HttpServletRequest request
+			,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
+			,RedirectAttributes redirectAttributes){
+		cfg.setGroupType(12);
+		initFormCondition(model,cfg);
+		model.addAttribute("_cfg", cfg);
+		return "/basics/dnsKeywordCfgFormAdd";
+	}
+	@RequestMapping(value = {"/updateForm"})
+	public String updateForm(Model model,HttpServletRequest request
+			,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsKeywordCfg cfg
+			,RedirectAttributes redirectAttributes){
+		cfg = dnsKeywordCfgService.get(Long.parseLong(ids));
+		cfg.setGroupType(12);
+		initFormCondition(model, cfg);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
+		model.addAttribute("cfg", cfg);
+		return "/basics/dnsKeywordCfgFormUpdate";
+	}
+	@RequestMapping(value = {"/save"})
+	@RequiresPermissions(value={"dns:keyword:config"})
+	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
+		try{
+			dnsKeywordCfgService.saveDnsKeywordCfg(cfg);
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			if(e instanceof MaatConvertException) {
+				addMessage(redirectAttributes,"error",e.getMessage());
+			}else {
+				addMessage(redirectAttributes,"error","save_failed");
+			}
+		}
+		
+		return "redirect:" + adminPath +"/basics/dns/keyword/list?functionId="+cfg.getFunctionId();
+	}
+	@RequestMapping(value = {"/update"})
+	@RequiresPermissions(value={"dns:keyword:config"})
+	public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsKeywordCfg cfg,RedirectAttributes redirectAttributes){
+		try{
+			
+			dnsKeywordCfgService.update(cfg);
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			addMessage(redirectAttributes,"error","save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/basics/dns/keyword/list?functionId="+cfg.getFunctionId();
+	}
+	@RequestMapping(value = {"/audit"})
+	@RequiresPermissions(value={"dns:keyword:config"})
+	public String audit(Model model,@ModelAttribute("cfg")DnsKeywordCfg cfg
+			,Integer isAudit
+			,Integer isValid
+			,String ids
+			,Integer functionId
+			, HttpServletRequest request
+			,HttpServletResponse response
+			,RedirectAttributes redirectAttributes) {
+		//选中配置审核
+		if(!StringUtil.isEmpty(ids)) {
+			List<DnsKeywordCfg> infoList=dnsKeywordCfgService.getByIds(ids);
+			Map<Long,List<DnsKeywordCfg>> dnsKeywordMap=Maps.newHashMap();
+			for(DnsKeywordCfg entity:infoList) {
+				entity.setIsAudit(isAudit);
+				entity.setIsValid(isValid);
+				entity.setAuditorId(UserUtils.getUser().getId());
+				entity.setAuditTime(new Date());
+				entity.setFunctionId(functionId);
+				if(dnsKeywordMap.containsKey(Long.parseLong(entity.getUserRegion1()))) {
+					dnsKeywordMap.get(Long.parseLong(entity.getUserRegion1())).add(entity);
+				}else {
+					List<DnsKeywordCfg> keywords=Lists.newArrayList();
+					keywords.add(entity);
+					dnsKeywordMap.put(Long.parseLong(entity.getUserRegion1()), keywords);
+				}
+			}
+			//********************每次下发一个组的region，保证事物********************//*
+			for (Long groupId : dnsKeywordMap.keySet()) {
+				try {
+					dnsKeywordCfgService.auditDnsKeywordBatch(dnsKeywordMap.get(groupId),groupId,isAudit,isValid);
+				} catch (Exception e) {
+					logger.error("配置下发失败：",e);
+					if(e instanceof MaatConvertException) {
+						addMessage(redirectAttributes,"error", "request_service_failed");
+					}else {
+						addMessage(redirectAttributes,"error", "audit_failed");
+					}
+					
+				}
+			}
+		}/*else {
+			//条件下所有配置审核
+			Page<AsnIpCfg> searchPage=new Page<AsnIpCfg>(request,response,"a");
+			Page<AsnIpCfg> auditPage=new Page<AsnIpCfg>(request,response,"a");
+			BeanUtils.copyProperties(searchPage, auditPage);
+			try {
+				auditAll(auditPage,isValid , cfg);
+				addMessage(redirectAttributes,"success", "audit_success");
+			} catch (Exception e) {
+				logger.error("配置下发失败：",e);
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes,"error", "request_service_failed");
+				}else {
+					addMessage(redirectAttributes,"error", "audit_failed");
+				}
+				
+			}
+			
+			return list(model, request, response, cfg);
+		}*/
+		return "redirect:" + adminPath +"/basics/dns/keyword/list?functionId="+cfg.getFunctionId();
+	}
+	@RequestMapping(value = {"/delete"})
+	@RequiresPermissions(value={"dns:keyword:config"})
+	public String delete(Integer isValid
+			,String ids,Integer functionId
+			,RedirectAttributes redirectAttributes){
+			try{
+				dnsKeywordCfgService.delete(ids);
+				addMessage(redirectAttributes,"success","delete_success");
+			}catch(Exception e){
+				logger.error("Delete failed",e);
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes,"error",e.getMessage());
+				}else {
+					addMessage(redirectAttributes,"error","delete_failed");
+				}
+			}
+			
+		return "redirect:" + adminPath +"/basics/dns/keyword/list?functionId="+functionId;
+	}
+}

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

@@ -0,0 +1,261 @@
+package com.nis.web.controller.basics;
+
+import java.util.ArrayList;
+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.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+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.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Maps;
+import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.UrlCommGroupCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.HttpUrlCfg;
+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;
+import com.nis.web.service.basics.UrlCommGroupService;
+
+import jersey.repackaged.com.google.common.collect.Lists;
+
+@Controller
+@RequestMapping(value = "${adminPath}/basics/url")
+public class UrlCommGroupController extends BaseController{
+	
+	@Autowired
+	private UrlCommGroupService   urlCommGroupService;
+	
+	@RequestMapping(value = {"/list"})
+	public String list(Model model,HttpServletRequest  request
+			,HttpServletResponse response,@ModelAttribute("cfg")UrlCommGroupCfg entity
+			){
+		Page<UrlCommGroupCfg> page = urlCommGroupService.findPage(new Page<UrlCommGroupCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+
+		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
+		model.addAttribute("regionList", regionList);
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		return "/basics/urlCommGroupList";
+	}
+	
+	@RequestMapping(value = {"/addForm"})
+	public String addForm(Model model,HttpServletRequest request
+			,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
+			,RedirectAttributes redirectAttributes){
+		
+		
+//		UrlCommGroupCfg urlCfg = new UrlCommGroupCfg();
+//		urlCfg.setCfgType("NTC_URL_REGION");
+//		cfg.setUrlCommGroupCfg(urlCfg);
+//		List<UrlCommGroupCfg> urlList = new ArrayList<UrlCommGroupCfg>();
+//		urlList.add(urlCfg);
+//		cfg.setUrlCommGroupList(urlList);
+//		initFormCondition(model, entity);
+		cfg.setGroupType(11);
+		initFormCondition(model,cfg);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
+		
+		model.addAttribute("_cfg", cfg);
+		return "/basics/urlCommGroupFormAdd";
+	}
+	
+	@RequestMapping(value = {"/save"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
+		
+//		System.out.println("URL分组");
+		try{
+			urlCommGroupService.saveUrlCommGroupCfg(cfg);
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			if(e instanceof MaatConvertException) {
+				addMessage(redirectAttributes,"error",e.getMessage());
+			}else {
+				addMessage(redirectAttributes,"error","save_failed");
+			}
+		}
+		
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/updateForm"})
+	public String updateForm(Model model,HttpServletRequest request
+			,HttpServletResponse response,String ids,@ModelAttribute("cfg")UrlCommGroupCfg cfg
+			,RedirectAttributes redirectAttributes){
+		cfg = urlCommGroupService.get(Long.parseLong(ids));
+//		initUpdateFormCondition(model, cfg);
+		cfg.setGroupType(11);
+		initUpdateFormCondition(model,cfg);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
+		model.addAttribute("_cfg", cfg);
+		return "/basics/urlCommGroupFormUpdate";
+	}
+	@RequestMapping(value = {"/update"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")UrlCommGroupCfg cfg,RedirectAttributes redirectAttributes){
+		try{
+			urlCommGroupService.update(cfg);
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			addMessage(redirectAttributes,"error","save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/audit"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String audit(Model model,@ModelAttribute("cfg")UrlCommGroupCfg cfg
+			,Integer isAudit
+			,Integer isValid
+			,String ids
+			,Integer functionId
+			, HttpServletRequest request
+			,HttpServletResponse response
+			,RedirectAttributes redirectAttributes) {
+		//选中配置审核
+		if(!StringUtil.isEmpty(ids)) {
+			List<UrlCommGroupCfg> urlGroupCfgs=urlCommGroupService.getByIds(ids);
+//			Map<Long,List<UrlCommGroupCfg>> urlcfgMap=Maps.newHashMap();
+//			for(UrlCommGroupCfg urlCommCfg:urlGroupCfgs) {
+//				urlCommCfg.setIsAudit(isAudit);
+//				urlCommCfg.setIsValid(isValid);
+//				urlCommCfg.setAuditorId(UserUtils.getUser().getId());
+//				urlCommCfg.setAuditTime(new Date());
+//				urlCommCfg.setFunctionId(functionId);
+//				if(urlcfgMap.containsKey(Long.parseLong(urlCommCfg.getUserRegion3()))) {
+//					urlcfgMap.get(Long.parseLong(urlCommCfg.getUserRegion3())).add(urlCommCfg);
+//				}else {
+//					List<UrlCommGroupCfg> _urlCfgs=Lists.newArrayList();
+//					_urlCfgs.add(urlCommCfg);
+//					urlcfgMap.put(Long.parseLong(urlCommCfg.getUserRegion3()), _urlCfgs);
+//				}
+//			}
+			/********************每次下发一个组的region，保证事物********************/
+//			for (Long groupId : urlcfgMap.keySet()) {
+//				try {
+//					urlCommGroupService.audit(urlcfgMap.get(groupId),groupId,isValid);
+//				} catch (Exception e) {
+//					logger.error("配置下发失败：",e);
+//					if(e instanceof MaatConvertException) {
+//						addMessage(redirectAttributes,"error", "request_service_failed");
+//					}else {
+//						addMessage(redirectAttributes,"error", "audit_failed");
+//					}
+//					
+//				}
+//			}
+			for (UrlCommGroupCfg urlCommGroup : urlGroupCfgs) {
+				try {
+					urlCommGroupService.audit(urlCommGroup,isAudit,isValid);
+				} catch (Exception e) {
+					logger.error("审核失败",e);
+					e.printStackTrace();
+					addMessage(redirectAttributes,"error","audit_failed");
+				}
+			}
+		}
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/delete"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String delete(Integer isValid
+			,String ids,Integer functionId
+			,RedirectAttributes redirectAttributes){
+			try{
+				urlCommGroupService.delete(ids);
+				addMessage(redirectAttributes,"success","delete_success");
+			}catch(Exception e){
+				logger.error("Delete failed",e);
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes,"error",e.getMessage());
+				}else {
+					addMessage(redirectAttributes,"error","delete_failed");
+				}
+			}
+			
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+functionId;
+	}
+	//urlComm配置导出
+	@RequestMapping(value = "/exportUrlComm")
+	public void exportAsnIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+			@ModelAttribute("cfg")UrlCommGroupCfg entity,String ids,RedirectAttributes redirectAttributes){
+		try {
+			//export data info
+			List<String> titleList=new ArrayList<String>();
+			Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
+			Map<String, List> dataMap=new HashMap<String, List>();
+			Map<String, String> noExportMap=new HashMap<String, String>();
+			List<UrlCommGroupCfg> list = new ArrayList<UrlCommGroupCfg>();
+			if (!StringUtil.isEmpty(ids)) {
+				list = urlCommGroupService.findByPage(ids);
+			} else {
+				Page<UrlCommGroupCfg> pageInfo=new Page<UrlCommGroupCfg>(request, response,"r");
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
+				Page<UrlCommGroupCfg> page = urlCommGroupService.findPage(pageInfo, entity);
+				list=page.getList();
+			}
+//				
+				titleList.add(entity.getMenuNameCode());
+				classMap.put(entity.getMenuNameCode(), UrlCommGroupCfg.class);
+				String cfgIndexInfoNoExport=",block_type,do_log,action"
+						+ ",letter,whether_area_block,classification,attribute,label,expression_type,match_method"
+						+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,asn_no,is_hex,is_case_insenstive,";
+				// 时间过滤
+				if (entity.getSearch_create_time_start() == null ) {
+					cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
+				}
+				if (entity.getSearch_edit_time_start() == null) {
+					cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport;
+				}
+				if (entity.getSearch_audit_time_start() == null) {
+					cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport;
+				}
+				if (!StringUtil.isEmpty(entity.gethColumns())) {
+					cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
+				}
+				
+				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
+				dataMap.put(entity.getMenuNameCode(), list);
+				String timeRange = initTimeMap(entity);
+				noExportMap.put("timeRange", timeRange);
+				
+				if ("csv".equals(entity.getExType())) {
+					this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
+							classMap, dataMap, noExportMap);
+				} else {
+					this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
+							classMap, dataMap, noExportMap);
+				}
+		} catch (Exception e) {
+			logger.error("urlGroupConfig 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/IpController.java

@@ -66,6 +66,7 @@ import com.nis.domain.configuration.template.SnatTemplate;
 import com.nis.domain.configuration.template.StringAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.StringAllTemplate;
 import com.nis.domain.configuration.template.TopicWebsiteTemplate;
+import com.nis.domain.configuration.template.UrlCommGroupTemplate;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
@@ -490,6 +491,11 @@ public class IpController extends BaseController{
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, TopicWebsiteTemplate.class, 2);
 				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(111)) {// url分组配置
+				List<UrlCommGroupTemplate> classList=new ArrayList<UrlCommGroupTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, UrlCommGroupTemplate.class, 2);
+				excel.setDataList(pro,classList,null).
+		    	write(request,response, fileName).dispose();
 			}else{
 				List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, StringAllTemplate.class, 2);

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

@@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
@@ -402,8 +403,12 @@ public class WebsiteController extends BaseController {
 	public String dnsForm(Model model, String ids, CfgIndexInfo entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = websiteCfgService.getDnsCfg(Long.parseLong(ids), null);
+			entity.setGroupType(12);
+			entity.setUdFlag(1);
 			initUpdateFormCondition(model, entity);
 		} else {
+			entity.setGroupType(12);
+			entity.setUdFlag(1);
 			initFormCondition(model, entity);
 		}
 		// 获取所有响应策略信息
@@ -452,6 +457,8 @@ public class WebsiteController extends BaseController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(12, 1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 12：dns 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
@@ -201,6 +202,8 @@ public class WhiteListController extends CommonController {
 			if (entity.getHttpUrlList().size() == 0) {
 				entity.getHttpUrlList().add(urlCfg);
 			}
+			entity.setGroupType(11);
+			entity.setUdFlag(1);
 			initUpdateFormCondition(model, entity);
 		} else {
 			HttpUrlCfg urlCfg = new HttpUrlCfg();
@@ -209,6 +212,8 @@ public class WhiteListController extends CommonController {
 			List<HttpUrlCfg> urlList = new ArrayList<HttpUrlCfg>();
 			urlList.add(urlCfg);
 			entity.setHttpUrlList(urlList);
+			entity.setGroupType(11);
+			entity.setUdFlag(1);
 			initFormCondition(model, entity);
 		}
 		model.addAttribute("_cfg", entity);
@@ -244,6 +249,8 @@ public class WhiteListController extends CommonController {
 				}
 			}
 		}
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(11,  1);
+		model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 11：url 1：有效
 		model.addAttribute("_cfg", cfg);
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);

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

@@ -481,11 +481,20 @@ public class TrafficStatisticsInfoController extends BaseController {
 	}
 	@RequestMapping("ajaxAppTrend")
 	@ResponseBody
-	public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,Integer[] searchIspCode,Model model){
+	public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map list = new HashMap();
 		try {
-			String url=Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_TREND;
+			//TRAFFIC_APP_PPS_TREND
+			String trafficApp=Constants.TRAFFIC_APP_TREND;
+			if("Unique Ip".equals(searchQuotaType)){
+				trafficApp=Constants.TRAFFIC_APP_TREND;
+			}else if("Gbps".equals(searchQuotaType)){
+				trafficApp=Constants.TRAFFIC_APP_BPS_TREND;
+			}else if("pps".equals(searchQuotaType)){
+				trafficApp=Constants.TRAFFIC_APP_PPS_TREND;
+			}
+			String url=Constants.DASHBOARD_URL+trafficApp;
 			URIBuilder uriBuilder = new URIBuilder(url);
 			uriBuilder.addParameter("searchStartTime",beginDate);
 			uriBuilder.addParameter("searchEndTime",endDate);

src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java

@@ -37,5 +37,5 @@ public interface AsnGroupInfoDao extends CrudDao<AsnGroupInfo> {
 	void insertWithId(AsnGroupInfo asnGroupInfo);
 	void insertWithoutId(AsnGroupInfo asnGroupInfo);
 	void updateIpNum(@Param("v4Num")long v4Num,@Param("v6Num")long v6Num,@Param("groupId")Integer groupId);
-	List<Object[]> getASNIPNum(@Param("asnNo")Integer asnNo);
+	List<Object[]> getASNIPNum(@Param("asnNo")Long asnNo);
 }

src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml

@@ -21,7 +21,7 @@
   </resultMap>
     <sql id="AsnGroupInfoColumns">
 		r.id,r.group_id,r.compile_id,r.organization,r.country,r.detail,r.is_valid,r.create_time,r.edit_time,
-		r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id
+		r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id,r.only_group_id
 	</sql>
   
    <!-- 查出所有 有效数据-->
@@ -107,7 +107,8 @@
     asn_id,
     is_used,
     region_id,
-    org_group_id
+    org_group_id,
+    only_group_id
     )values (
     	#{groupId,jdbcType=INTEGER}, 
     	#{compileId,jdbcType=INTEGER}, 
@@ -122,7 +123,8 @@
     	#{asnId,jdbcType=INTEGER},
     	#{isUsed,jdbcType=INTEGER},
     	#{regionId,jdbcType=INTEGER},
-    	#{orgGroupId,jdbcType=INTEGER}
+    	#{orgGroupId,jdbcType=INTEGER},
+    	#{onlyGroupId,jdbcType=INTEGER}
     )
   </insert>
 <insert id="insertWithoutId" parameterType="com.nis.domain.basics.AsnGroupInfo" >
@@ -174,7 +176,8 @@
     asn_id,
     is_used,
     region_id,
-    org_group_id
+    org_group_id,
+    only_group_id
     )values (
     	#{id,jdbcType=INTEGER}, 
     	#{groupId,jdbcType=INTEGER}, 
@@ -190,7 +193,8 @@
     	#{asnId,jdbcType=INTEGER},
     	#{isUsed,jdbcType=INTEGER},
     	#{regionId,jdbcType=INTEGER},
-    	#{orgGroupId,jdbcType=INTEGER}
+    	#{orgGroupId,jdbcType=INTEGER},
+    	#{onlyGroupId,jdbcType=INTEGER}
     )
   </insert>
   <update id="update" parameterType="com.nis.domain.basics.AsnGroupInfo" >

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java

@@ -26,4 +26,7 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
 	PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo);
 	
 	List<PolicyGroupInfo> findPolicyByGroupInfoList(@Param("ids")String ids);
+	List<PolicyGroupInfo> findPolicyGroupInfosByTypeForUD(@Param("groupType")Integer groupType,@Param("flag")Integer flag);
+	List<PolicyGroupInfo> getInfoByServiceGroupId(@Param("serviceGroupId")Long serviceGroupId);
+	int updateUdFlag(PolicyGroupInfo policyGroupInfo);
 }

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml

@@ -178,7 +178,30 @@
       	</if>
     </where>
   </update>
-  
+ <update id="updateUdFlag" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
+    update policy_group_info 
+    <set >
+      <trim suffixOverrides=",">
+      <if test="udFlag != null " >
+        ud_flag = #{udFlag,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>
+      </trim>
+    </set>
+    <where>
+    	<if test="groupId != null" >
+        	and group_id =  #{groupId,jdbcType=INTEGER}
+      	</if>
+    	<if test="serviceGroupId != null" >
+        	and service_group_id =  #{serviceGroupId,jdbcType=INTEGER}
+      	</if>
+    </where>
+  </update>
   <select id="getById" resultType="com.nis.domain.basics.PolicyGroupInfo">
   	select <include refid="PolicyGroupInfoColumns"/> 
   	from policy_group_info r
@@ -204,7 +227,11 @@
 	    </if>
     </trim>
   </select>
-  
+  <select id="getInfoByServiceGroupId" resultType="com.nis.domain.basics.PolicyGroupInfo">
+  	select <include refid="PolicyGroupInfoColumns"/>,ud_flag
+  	from policy_group_info r
+  	where r.service_group_id =#{serviceGroupId}
+  </select>
   <select id="getHasAreaPolicyGroups" resultType="com.nis.domain.basics.PolicyGroupInfo">
   	SELECT
 		<include refid="PolicyGroupInfoColumns"/> 
@@ -266,6 +293,14 @@
 		WHERE 
 			r.group_id IN (${ids})
 	</select>
-  
-  
+   
+     <select id="findPolicyGroupInfosByTypeForUD" resultMap="PolicyGroupInfoMap">
+		SELECT
+			<include refid="PolicyGroupInfoColumns"/>
+	    FROM policy_group_info r
+	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
+	    <if test="flag!=null">
+	    and	ud_flag=#{flag}
+	    </if>
+	</select>
 </mapper>

src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java

@@ -0,0 +1,38 @@
+package com.nis.web.dao.basics;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.basics.UrlCommGroupCfg;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface UrlCommGroupDao  extends CrudDao<UrlCommGroupCfg>{
+	
+	// 查询列表
+	public List<UrlCommGroupCfg> findAllPageList(UrlCommGroupCfg entity);
+	
+	public List<UrlCommGroupCfg> findByPage(@Param("ids")String ids);
+	
+	public List<UrlCommGroupCfg> findInfoByCfgId(@Param("cfgId")Long cfgId);
+	//新增
+	public int insertUrlCommGroupCfg(UrlCommGroupCfg entity);
+	
+	public Integer findUrlUdFlag(@Param("groupId")Integer groupId);
+	
+	public int updateUrlUdFlag(@Param("groupId")Integer groupId,@Param("udFlag")Integer udFlag);
+	
+	//修改
+	public int update(UrlCommGroupCfg entity);
+	
+	//删除
+	public int delete(@Param("ids")String ids);
+	
+	public List<UrlCommGroupCfg> getByIds(@Param("ids")String ids);
+	
+	
+	public Integer getGroupIdCount(@Param("groupId")String groupId);
+	
+}

src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.basics.UrlCommGroupDao">
+    <resultMap id="urlCommGroupCfgMap" type="com.nis.domain.basics.UrlCommGroupCfg">
+	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+	    <result column="cfg_keywords" property="cfgKeywords" 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="compile_id" property="compileId" 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="expr_type" property="exprType" jdbcType="INTEGER" />
+	    <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
+	    <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
+	    <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="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
+	    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
+	    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
+	    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
+	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
+	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+	    
+	    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+    </resultMap>
+  	
+  	<select id="findAllPageList" parameterType="com.nis.domain.basics.UrlCommGroupCfg" resultMap="urlCommGroupCfgMap">
+  		SELECT
+			r.cfg_id,r.cfg_desc,r.cfg_keywords,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.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
+			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
+			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+			r.user_region3,r.user_region4,r.user_region5,
+			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name,c.group_name
+		FROM
+			http_url_cfg 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 policy_group_info c ON c.service_group_id=r.user_region3
+  		<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="cfgDesc != null and cfgDesc != ''">
+	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<if test="cfgKeywords != null and cfgKeywords != ''">
+	    		AND r.cfg_keywords like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="cfgRegionCode != null">
+	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="cfgType != null and cfgType != ''">
+	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,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="createTime != null and createTime !=''">
+	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+	    	</if>
+	    	<if test="editorName != null and editorName !=''">
+	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editTime != null and editTime !='' ">
+	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+	    	</if>
+	    	<if test="auditorName != null and auditorName !=''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditTime != null and auditTime !=''">
+	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+	    	</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="areaEffectiveIds != null and areaEffectiveIds !=''">
+	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,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.is_audit,r.create_time desc
+			</otherwise>
+		</choose>
+  	
+  	</select>
+  	
+  	
+  	
+  	<select id="findByPage" resultMap="urlCommGroupCfgMap">
+    	SELECT
+			r.cfg_id,r.cfg_desc,r.cfg_keywords,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.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
+			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
+			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+			r.user_region3,r.user_region4,r.user_region5,
+			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name
+		FROM
+			http_url_cfg 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
+    	where r.CFG_ID in (${ids})
+    </select>
+    
+    <select id="findInfoByCfgId"  resultMap="urlCommGroupCfgMap">
+    	SELECT
+			r.cfg_id,r.cfg_desc,r.cfg_keywords,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.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
+			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
+			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+			r.user_region3,r.user_region4,r.user_region5
+		FROM
+			http_url_cfg r
+    	where r.CFG_ID =#{cfgId}
+    
+    </select>
+    
+    <select id="get" resultMap="urlCommGroupCfgMap">
+    	SELECT
+			r.cfg_id,r.cfg_desc,r.cfg_keywords,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.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
+			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
+			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+			r.user_region3,r.user_region4,r.user_region5
+    	from http_url_cfg r
+    	where r.cfg_id=#{cfgId}
+    </select>
+    
+    <insert id="insertUrlCommGroupCfg" parameterType="com.nis.domain.basics.UrlCommGroupCfg">
+    	insert into http_url_cfg (
+	     CFG_DESC,
+	     cfg_keywords,
+	     action,
+	     is_valid,
+	     is_audit,
+	    creator_id,
+	    create_time,
+	    editor_id,
+	    edit_time,
+	    auditor_id,
+	   	audit_time,
+	   	service_id,
+	   	request_id,
+	   	compile_id,
+	   	IS_AREA_EFFECTIVE,
+	   	CLASSIFY,
+	    ATTRIBUTE,
+	    LABLE,
+	    expr_type,
+	    match_method,    
+	    is_hexbin,
+	    area_effective_ids,
+	    function_id,
+	    cfg_region_code,
+	    cfg_type,
+	    ratelimit,
+	    user_region1,
+	    user_region2,
+	    user_region3,
+	    user_region4,
+	    user_region5
+	    )values (
+	   		#{cfgDesc,jdbcType=VARCHAR},
+	   		#{cfgKeywords,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},
+	    	#{compileId,jdbcType=INTEGER},
+	    	#{isAreaEffective,jdbcType=INTEGER},
+	    	#{classify,jdbcType=VARCHAR},
+	    	#{attribute,jdbcType=VARCHAR},
+	    	#{lable,jdbcType=VARCHAR},
+	    	#{exprType,jdbcType=INTEGER},
+	    	#{matchMethod,jdbcType=INTEGER},
+	    	#{isHexbin,jdbcType=INTEGER},
+	   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+	    	#{functionId,jdbcType=INTEGER},
+	    	#{cfgRegionCode,jdbcType=INTEGER},
+	    	#{cfgType,jdbcType=VARCHAR},
+	    	#{ratelimit,jdbcType=VARCHAR},
+	    	#{userRegion1,jdbcType=VARCHAR},
+	    	#{userRegion2,jdbcType=VARCHAR},
+	    	#{userRegion3,jdbcType=VARCHAR},
+	    	#{userRegion4,jdbcType=VARCHAR},
+	    	#{userRegion5,jdbcType=VARCHAR}
+    	)
+    </insert>
+    
+    <select id="findUrlUdFlag" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+    	SELECT  ud_flag from policy_group_info  
+    	where  service_group_id=#{groupId} 
+    	and group_type=11
+    </select>
+    
+    <update id="updateUrlUdFlag" parameterType="java.lang.Integer"> 
+    	UPDATE policy_group_info  SET ud_flag =#{udFlag}
+    	 WHERE service_group_id=#{groupId}
+    	 and group_type=11
+    </update>
+    
+    <update id="update" parameterType="com.nis.domain.basics.UrlCommGroupCfg" >
+    update http_url_cfg
+    <set >
+      <trim suffixOverrides=",">
+      <if test="cfgDesc != null and cfgDesc != ''" >
+        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="cfgKeywords != null and cfgKeywords != ''" >
+        cfg_keywords =  #{cfgKeywords,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="serviceId != null" >
+        service_id =  #{serviceId,jdbcType=INTEGER},
+      </if>
+      <if test="requestId != null" >
+        request_id = #{requestId,jdbcType=INTEGER},
+      </if>
+      <if test="compileId != null and compileId != ''" >
+        compile_id = #{compileId,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="exprType != null" >
+        expr_type = #{exprType,jdbcType=INTEGER},
+      </if>
+      <if test="matchMethod != null" >
+        match_method = #{matchMethod,jdbcType=INTEGER},
+      </if>
+      <if test="isHexbin != null" >
+        is_hexbin = #{isHexbin,jdbcType=INTEGER},
+      </if>
+      <if test="areaEffectiveIds != null" >
+        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
+      </if>
+      <if test="functionId != null" >
+        function_id =  #{functionId,jdbcType=INTEGER},
+      </if>          
+       <if test="cfgType != null and cfgType != ''" >
+        cfg_type = #{cfgType,jdbcType=VARCHAR},
+      </if>
+       <if test="cfgRegionCode != null " >
+        cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="ratelimit != null and ratelimit != ''" >
+        ratelimit = #{ratelimit,jdbcType=VARCHAR},
+      </if>
+      <if test="userRegion1 != null and userRegion1 != ''" >
+        user_region1 = #{userRegion1,jdbcType=VARCHAR},
+      </if>
+      <if test="userRegion2 != null and userRegion2 != ''" >
+        user_region2 = #{userRegion2,jdbcType=VARCHAR},
+      </if>
+      <if test="userRegion3 != null and userRegion3 != ''" >
+        user_region3 = #{userRegion3,jdbcType=VARCHAR},
+      </if>
+      <if test="userRegion4 != null and userRegion4 != ''" >
+        user_region4 = #{userRegion4,jdbcType=VARCHAR},
+      </if>
+      <if test="userRegion5 != null and userRegion5 != ''" >
+        user_region5 = #{userRegion5,jdbcType=VARCHAR},
+      </if>
+      </trim>
+    </set>
+    <where>
+       	and cfg_id =  #{cfgId,jdbcType=INTEGER}
+    </where>
+  </update>
+    
+   <delete id="delete" parameterType="java.lang.String" >
+    	delete from http_url_cfg where cfg_id in (${ids}) 
+   </delete>
+   
+   <select id="getByIds" resultMap="urlCommGroupCfgMap">
+    	select 
+    		r.cfg_id,r.cfg_desc,r.cfg_keywords,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.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
+			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
+			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+			r.user_region3,r.user_region4,r.user_region5
+    	from http_url_cfg r
+    	where r.cfg_id in (${ids}) and is_valid !=-1
+    </select>
+   
+   <select id="getGroupIdCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+   		SELECT  COUNT(cfg_id) groupCount from http_url_cfg 
+   		WHERE user_region3= #{groupId} 
+   		and is_valid=1
+   </select>
+</mapper>

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

@@ -0,0 +1,28 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.ComplexkeywordCfg;
+import com.nis.domain.configuration.DnsKeywordCfg;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+/**
+ * 	@ClassName:DnsKeyworkCfgDao
+ * 	@Description:TODO(这里用一句话描述这个类的作用)
+ *	@author zdx
+ *	@date 2019年2月15日 下午5:55:26
+ *	@version V1.0
+ */
+@MyBatisDao
+public interface DnsKeywordCfgDao extends CrudDao<DnsKeywordCfg>{
+	public void saveDnsKeywordsCfg(ComplexkeywordCfg entity);
+	public List<DnsKeywordCfg> findPage(DnsKeywordCfg entity);
+	public List<DnsKeywordCfg> getByIds(@Param("ids")String ids);
+	public int hasValidDnsKeyword(@Param("groupId")Long groupId);
+	public void delete(@Param("ids")String ids);
+}

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

@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.DnsKeywordCfgDao">
+
+	<resultMap id="CfgIndexInfoMap" type="com.nis.domain.configuration.CfgIndexInfo">
+		<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+		<result column="cfg_desc" property="cfgDesc" 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="compile_id" property="compileId" 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="dns_strategy_id" property="dnsStrategyId"
+			jdbcType="INTEGER" />
+		<result column="dns_strategy_name" property="dnsStrategyName"
+			jdbcType="VARCHAR" />
+		<result column="do_log" property="doLog" jdbcType="INTEGER" />
+		<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
+		<result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
+		<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
+		<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
+		<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+		<result column="source_compile_id" property="sourceCompileId"
+			jdbcType="INTEGER" />
+		<result column="cancel_request_id" property="cancelRequestId"
+			jdbcType="INTEGER" />
+		<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
+	</resultMap>
+	<resultMap id="stringCfgMap" type="com.nis.domain.configuration.BaseStringCfg">
+		<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+		<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+		<result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
+		<result column="cfg_type" property="cfgType" 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="compile_id" property="compileId" 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="expr_type " property="exprType" jdbcType="INTEGER" />
+		<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
+		<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
+		<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" />
+	</resultMap>
+	<resultMap id="dnsKeywordCfgMap" type="com.nis.domain.configuration.DnsKeywordCfg">
+		<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+		<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+		<result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
+		<result column="district" property="district" jdbcType="VARCHAR" />
+		<result column="cfg_type" property="cfgType" 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="compile_id" property="compileId" 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="expr_type " property="exprType" jdbcType="INTEGER" />
+		<result column="match_method" property="matchMethod" jdbcType="INTEGER" />
+		<result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
+		<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" />
+	</resultMap>
+	<sql id="configIndexColumn">
+		a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
+		a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
+		a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
+		a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
+		a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
+		a.do_blacklist
+	</sql>
+	<sql id="ipCfgColumn">
+		a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+		,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
+		,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
+		,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
+		a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable
+		,a.area_effective_ids,a.function_id,a.cfg_region_code
+	</sql>
+	<sql id="strCfgColumn">
+		a.cfg_id,a.cfg_desc,a.cfg_keywords,a.cfg_type,
+		a.action,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id,a.edit_time,
+		a.auditor_id,
+		a.audit_time,a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+		a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code
+	</sql>
+	<sql id="complexCfgColumn">
+		a.cfg_id,a.cfg_desc,a.cfg_keywords,a.cfg_type,a.district,a.user_region1,
+		a.action,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id,a.edit_time,
+		a.auditor_id,
+		a.audit_time,a.service_id,a.request_id,a.compile_id,a.region_id,a.is_area_effective,a.classify,a.attribute,a.lable,
+		a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code
+	</sql>
+
+	<!-- dns域名查询 -->
+	<select id="findPage" resultMap="dnsKeywordCfgMap"
+		parameterType="com.nis.domain.configuration.DnsKeywordCfg">
+		SELECT
+		<include refid="complexCfgColumn" />
+		,s.name as creator_name,e.name as editor_name,u.name as auditor_name
+		FROM dns_domain_cfg a
+		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
+		where service_id=-2 and function_id=#{functionId}
+		<if test="cfgType != null and cfgType != ''">
+			and a.cfg_type =#{cfgType,jdbcType=VARCHAR}
+		</if>
+	</select>
+	<select id="get" resultMap="dnsKeywordCfgMap">
+		select
+		<include refid="complexCfgColumn"></include>
+		from dns_domain_cfg a
+		where a.cfg_id=#{cfgId}
+	</select>
+	<select id="getByIds" resultMap="dnsKeywordCfgMap">
+		select
+		<include refid="complexCfgColumn"></include>
+		from dns_domain_cfg a
+		where a.cfg_id in (${ids}) and a.is_valid !=-1
+	</select>
+	<!-- 查询审核通过的域配置数量 -->
+	<select id="hasValidDnsKeyword" resultType="java.lang.Integer">
+		select count(1) from
+		dns_domain_cfg where is_valid=1 and is_audit=1 and
+		user_region1=#{groupId}
+	</select>
+	<!-- 查询引用dns组的maat配置数量 -->
+	<select id="hasDnsMaatPz" resultType="java.lang.Integer">
+		select count(1) from
+		dns_domain_cfg where is_valid=1 and is_audit=1 and
+		user_region1=#{groupId}
+	</select>
+	<update id="updateCfgValid" parameterType="com.nis.domain.configuration.BaseCfg">
+		update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
+		editor_id = #{editorId,jdbcType=INTEGER} ,
+		edit_time = #{editTime,jdbcType=TIMESTAMP}
+		<if test="isAudit !=null ">
+			,is_audit = #{isAudit,jdbcType=BIGINT}
+		</if>
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="cfgId !=null ">
+				AND cfg_id = #{cfgId,jdbcType=BIGINT}
+			</if>
+			<if test="compileId !=null ">
+				AND compile_id = #{compileId,jdbcType=INTEGER}
+			</if>
+			and function_id=#{functionId,jdbcType=INTEGER}
+		</trim>
+	</update>
+	<update id="auditCfg" parameterType="com.nis.domain.configuration.BaseCfg">
+		update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER},
+		auditor_id = #{auditorId,jdbcType=INTEGER},
+		audit_time = #{auditTime,jdbcType=TIMESTAMP}
+		<if test="isValid != null">
+			,is_valid = #{isValid,jdbcType=INTEGER}
+		</if>
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="cfgId !=null ">
+				AND cfg_id = #{cfgId,jdbcType=BIGINT}
+			</if>
+			<if test="compileId !=null ">
+				AND compile_id = #{compileId,jdbcType=INTEGER}
+			</if>
+			and function_id=#{functionId,jdbcType=INTEGER}
+		</trim>
+
+	</update>
+	<!-- insert dns_domain_cfg表信息 -->
+	<insert id="saveDnsKeywordsCfg" parameterType="com.nis.domain.configuration.DnsKeywordCfg">
+		insert into dns_domain_cfg (
+		CFG_DESC,
+		ACTION,
+		IS_VALID,
+		IS_AUDIT,
+		CREATOR_ID,
+		CREATE_TIME,
+		EDITOR_ID,
+		EDIT_TIME,
+		AUDITOR_ID,
+		AUDIT_TIME,
+		SERVICE_ID,
+		REQUEST_ID,
+		COMPILE_ID,
+		REGION_ID,
+		IS_AREA_EFFECTIVE,
+		CLASSIFY,
+		ATTRIBUTE,
+		LABLE,
+		AREA_EFFECTIVE_IDS,
+		function_id,
+		district,
+		cfg_keywords,
+		cfg_type,
+		cfg_region_code,
+		expr_type,
+		match_method,
+		is_hexbin,
+		user_region1
+		)values (
+		#{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},
+		#{compileId,jdbcType=INTEGER},
+		#{regionId,jdbcType=INTEGER},
+		#{isAreaEffective,jdbcType=INTEGER},
+		#{classify,jdbcType=VARCHAR},
+		#{attribute,jdbcType=VARCHAR},
+		#{lable,jdbcType=VARCHAR},
+		#{areaEffectiveIds,jdbcType=VARCHAR},
+		#{functionId,jdbcType=INTEGER},
+		#{district,jdbcType=VARCHAR},
+		#{cfgKeywords,jdbcType=VARCHAR},
+		#{cfgType,jdbcType=VARCHAR},
+		#{cfgRegionCode,jdbcType=INTEGER},
+		#{exprType,jdbcType=INTEGER},
+		#{matchMethod,jdbcType=INTEGER},
+		#{isHexbin,jdbcType=INTEGER},
+		#{userRegion1,jdbcType=VARCHAR}
+		)
+	</insert>
+	<!-- 删除dns公共组域名配置 -->
+	<delete id="deleteDnsDomainCfg">
+		delete from dns_domain_cfg where compile_id=#{compileId} and
+		function_id=#{functionId}
+	</delete>
+	<delete id="delete" parameterType="java.lang.String">
+		delete from dns_domain_cfg where cfg_id in (${ids})
+	</delete>
+	<update id="update" parameterType="com.nis.domain.configuration.DnsKeywordCfg">
+		update dns_domain_cfg
+		<set>
+			<trim suffixOverrides=",">
+				<if test="cfgDesc != null and cfgDesc != ''">
+					cfg_desc = #{cfgDesc,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="serviceId != null">
+					service_id = #{serviceId,jdbcType=INTEGER},
+				</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="district != null">
+					district = #{district,jdbcType=VARCHAR},
+				</if>
+				<if test="cfgKeywords != null and cfgKeywords != ''">
+					cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR},
+				</if>
+				<if test="cfgType != null">
+					cfg_type = #{cfgType,jdbcType=INTEGER},
+				</if>
+				<if test="cfgRegionCode != null">
+					cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+				</if>
+				<if test="exprType != null and exprType != ''">
+					expr_type = #{exprType,jdbcType=VARCHAR},
+				</if>
+				<if test="matchMethod != null">
+					match_method = #{matchMethod,jdbcType=INTEGER},
+				</if>
+				<if test="isHexbin != null">
+					is_hexbin = #{isHexbin,jdbcType=INTEGER},
+				</if>
+				<if test="userRegion1 != null and userRegion1 != ''">
+					user_region1 = #{userRegion1,jdbcType=VARCHAR},
+				</if>
+				<if test="compileId != null and compileId != ''">
+					compile_id = #{compileId,jdbcType=INTEGER},
+				</if>
+			</trim>
+		</set>
+		<where>
+			and cfg_id = #{cfgId,jdbcType=INTEGER}
+		</where>
+	</update>
+
+</mapper>

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

@@ -134,7 +134,7 @@
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
     a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
-    a.do_blacklist
+    a.do_blacklist,a.common_group_ids
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -490,7 +490,8 @@
     user_region5,
     do_log,
     source_compile_id,
-    do_blacklist
+    do_blacklist,
+    common_group_ids
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -519,7 +520,8 @@
     	#{userRegion5,jdbcType=VARCHAR},
     	#{doLog,jdbcType=INTEGER},
     	#{sourceCompileId,jdbcType=INTEGER},
-    	#{doBlackList,jdbcType=INTEGER}
+    	#{doBlackList,jdbcType=INTEGER},
+    	#{commonGroupIds,jdbcType=VARCHAR}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -948,6 +950,9 @@
         user_region4 = #{userRegion4,jdbcType=VARCHAR},
         user_region5 = #{userRegion5,jdbcType=VARCHAR},
         dns_strategy_id =  #{dnsStrategyId,jdbcType=INTEGER},
+      <if test="commonGroupIds != null">
+      	common_group_ids = #{commonGroupIds,jdbcType=VARCHAR}
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}

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

@@ -14,6 +14,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -66,6 +69,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.DnsIpCfg;
+import com.nis.domain.configuration.DnsKeywordCfg;
 import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.FileDigestCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
@@ -2954,6 +2958,63 @@ public abstract class BaseService {
 		logger.warn("asnIPRegionSendToMaat finish,cost:"+(end-start));
 	}
 	
+	/**
+	 * 
+	 * @Description: 公共组域配置 下发 修改 删除
+	 * @author(zdx)
+	 * @date 2019年2月19日 上午11:37:37
+	 * @param regionList
+	 * @param action
+	 */
+	public void commonGroupRegionSendToMaat(List<?> regionList,Integer action) {
+		logger.warn("commonGroupRegionSendToMaat start");
+		long start=System.currentTimeMillis();
+		GroupReuseAddBean maatBean = new GroupReuseAddBean();		
+		List<GroupReuseCfg> groupReuseList=new ArrayList<>();
+		GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
+		List<IpCfg> ipRegionList = new ArrayList<>();
+		List<StringCfg> strRegionList = new ArrayList<>();
+		List<NumBoundaryCfg> numRegionList = new ArrayList<>();
+		if (!StringUtil.isEmpty(regionList)&&regionList.get(0) instanceof BaseIpCfg) {
+			ipRegionList = (List<IpCfg>) regionList;
+		}
+		if (!StringUtil.isEmpty(regionList)&&regionList.get(0) instanceof StringCfg) {
+			strRegionList = (List<StringCfg>) regionList;
+		}
+		if (!StringUtil.isEmpty(regionList)&&regionList.get(0) instanceof NumBoundaryCfg) {
+			numRegionList = (List<NumBoundaryCfg>) regionList;
+		}
+		groupReuseCfg.setIpRegionList(ipRegionList);
+		groupReuseCfg.setStrRegionList(strRegionList);
+		groupReuseCfg.setNumRegionList(numRegionList);
+		groupReuseList.add(groupReuseCfg);
+		maatBean.setGroupReuseCfgList(groupReuseList);
+		maatBean.setAuditTime(new Date());
+		maatBean.setCreatorName(UserUtils.getUser().getName());
+		maatBean.setVersion(Constants.MAAT_VERSION);
+		//公共组域删除接口的访问方式为PUT,所以在配置取消时 应该把opAction设置为2；
+		maatBean.setOpAction(Constants.OPACTION_DELETE==Integer.valueOf(action)?Constants.OPACTION_PUT:action);
+		//调用服务接口下发配置数据
+		String json=gsonToJson(maatBean);
+		String optionStr = "添加";
+		if(action.equals(Constants.OPACTION_PUT)){
+			optionStr = "修改";
+		}
+		if(action.equals(Constants.OPACTION_DELETE)){
+			optionStr = "删除";
+		}
+		if(regionList.size()<=100) {
+			logger.info("公共组域配置 "+optionStr+"操作，参数："+json);
+		}else {
+			logger.info("公共组域配置"+optionStr+"操作数据条数："+regionList.size());
+		}
+		//调用服务接口下发配置
+		ToMaatResult result =ConfigServiceUtil.auditCommonGroupRegionSources(json,action);
+		//logger.info("asn ip复用域  "+action+" 配置响应信息："+result.getMsg());
+		logger.info("公共组域配置 "+optionStr+"操作，响应信息：");
+		long end=System.currentTimeMillis();
+		logger.warn("commonGroupRegionSendToMaat finish,cost:"+(end-start));
+	}
 	/**
 	 * ASN关键字配置处理
 	 * @param asnList
@@ -3022,7 +3083,7 @@ public abstract class BaseService {
 				//<!-- 是否自动更新ASN NO -->
 				asnKeywordCfg.setUserRegion4(StringUtil.isEmpty(asnKeywordCfg.getUserRegion4()) ? "1":"0");
 				if("1".equals(asnKeywordCfg.getUserRegion4())){ //是否标记为下发ALL
-					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion4()));
+					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
 				}
 				groupWithRegion.put(asnKeywordCfg.getUserRegion2(), asnKeywordCfg.getUserRegion3());
 				//需要标记为is_used=1的组织
@@ -3107,6 +3168,169 @@ public abstract class BaseService {
 		}
 		
 		
+		/*if(asnList!=null && asnList.size()>0){
+			
+				for (AsnKeywordCfg asnKeywordCfg : asnList) {
+					asnNoStr+=asnKeywordCfg.getCfgKeywords()+",";
+				}
+				
+				AsnKeywordCfg cfg = new AsnKeywordCfg();
+				cfg.setTableName(AsnKeywordCfg.getTablename());
+				cfg.setCompileId(entity.getCompileId());
+				cfg.setIsAudit(entity.getIsAudit());
+				cfg.setIsValid(entity.getIsValid());
+				cfg.setAuditorId(entity.getAuditorId());
+				cfg.setAuditTime(entity.getAuditTime());
+				cfg.setFunctionId(entity.getFunctionId());
+				ipCfgDao.auditCfg(cfg);
+				Map<String,List> map = cfgConvert(strRegionList,asnList,7,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+		}
+		//修改配置选中的ASN NO 和 asn orga是否被策略引用过
+		if(!StringUtil.isEmpty(asnNoStr)){
+			asnNoStr=asnNoStr.substring(0, asnNoStr.length()-1);
+			if(!StringUtil.isEmpty(asnNoStr)){
+				//如果asnGroup由is_use=0，修改为is_use=1;查询asn no下所有未下发的asn ip，并进行下发，走POST接口【暂时不考虑】
+				AsnIpCfgDao asnIpCfgDao=SpringContextHolder.getBean(AsnIpCfgDao.class);
+				AsnIpCfg asnIp=new AsnIpCfg();
+				asnIp.setIsAudit(0);
+				asnIp.setIsValid(0);
+				List<AsnIpCfg> asnIpList=asnIpCfgDao.findAllListByAsnGroup(asnIp, null, asnNoStr);
+				
+				//下发asn IP和修改asn ip的状态必须在一个事物中
+				//重新修改下发时间，下发人员信息
+				AsnIpCfg auditAsnIpCfg=new AsnIpCfg();
+				auditAsnIpCfg.setIsAudit(1);
+				auditAsnIpCfg.setAuditTime(new Date());
+				auditAsnIpCfg.setAuditorId(UserUtils.getUser().getId());
+				auditAsnIpCfg.setIsValid(1);
+				auditAllAsnRegionCfg(auditAsnIpCfg, null, asnNoStr);
+				
+				AsnGroupInfoDao asnGroupInfoDao=SpringContextHolder.getBean(AsnGroupInfoDao.class);
+				asnGroupInfoDao.updateIsUsed(asnNoStr, 1);
+			}
+		}*/
+		
+	}
+	/**
+	 * ASN关键字配置处理 ip地址用
+	 * @param asnList
+	 * @param entity
+	 */
+	public void auditAsnCfgForIpAddr(List<GroupCfg> groupRelationList,List<StringCfg> strRegionList,BaseCfg entity,List<AsnKeywordCfg> asnList){
+		//注意：一条配置是一个分组，keywords=asnNos|userRegion1=groupId|userRegion2=isAuditAll  0 1
+		if(!StringUtil.isEmpty(asnList)){
+			AsnGroupInfoDao asnGroupInfoDao=SpringContextHolder.getBean(AsnGroupInfoDao.class);
+			ConfigGroupInfoDao configGroupInfoDao=SpringContextHolder.getBean(ConfigGroupInfoDao.class);
+			StringCfgDao stringCfgDao=SpringContextHolder.getBean(StringCfgDao.class);
+			//域和分组的关系
+			Map<String,String> groupWithRegion=new HashMap<>();
+			//需要标记为下发全部域的groupId集合
+			List signAuditAllGroupList=new ArrayList<>();
+			//需要标记下发的groupId
+			List isUsedGroupIdList=new ArrayList<>();
+			//所有已被策略引用过的域
+			List<AsnGroupInfo> auditRegionList=new ArrayList<>();
+			//所有未被策略过的域
+			List<AsnGroupInfo> notAuditRegionList=new ArrayList<>();
+			//所有策略所选asn No
+			List<String> asnGroupIdList=new ArrayList<>();
+			//所有未下发过的asnNo
+			List<String> notAuditGroupIdList=new ArrayList<>();
+			//最新的asn域集合
+			List<AsnKeywordCfg> newAsnList=new ArrayList<>();
+			
+			//2、记录标记为下发all的groupId|存储组和asnno的关系|记录需要标记为已下发的group
+			for (AsnKeywordCfg asnKeywordCfg : asnList) {
+				//<!-- 是否自动更新ASN NO -->
+				asnKeywordCfg.setUserRegion4(StringUtil.isEmpty(asnKeywordCfg.getUserRegion4()) ? "1":"0");
+				if("1".equals(asnKeywordCfg.getUserRegion4())){ //是否标记为下发ALL
+					signAuditAllGroupList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
+				}
+				groupWithRegion.put(asnKeywordCfg.getUserRegion2(), asnKeywordCfg.getUserRegion5()); //UserRegion5 ip地址使用组
+				//需要标记为is_used=1的组织
+				if(!isUsedGroupIdList.contains(Integer.parseInt(asnKeywordCfg.getUserRegion3()))){
+					isUsedGroupIdList.add(Integer.parseInt(asnKeywordCfg.getUserRegion3()));
+				}
+				//需要标记为is_used=1的asn no，根据groupId
+				asnGroupIdList.add(asnKeywordCfg.getUserRegion2());
+				
+				AsnKeywordCfg asnCfg=new AsnKeywordCfg();
+				BeanUtils.copyProperties(entity, asnCfg,new String[]{"cfgId","userReigon1","userReigon2","userReigon3","userReigon4","userReigon5"});
+				asnCfg.setTableName(AsnKeywordCfg.getTablename());
+				asnCfg.setCfgId(asnKeywordCfg.getCfgId());
+				asnCfg.setUserRegion1(asnKeywordCfg.getUserRegion1());
+				asnCfg.setUserRegion2(asnKeywordCfg.getUserRegion2());
+				asnCfg.setUserRegion3(asnKeywordCfg.getUserRegion3());
+				asnCfg.setUserRegion4(asnKeywordCfg.getUserRegion4());
+				asnCfg.setUserRegion5(asnKeywordCfg.getUserRegion5());
+				stringCfgDao.updateAsnKeyword(asnCfg);
+			}
+			//3、//根据asnGroupIdList查询所有下发过的ASN NO
+			if(!StringUtil.isEmpty(asnGroupIdList)){
+				auditRegionList=asnGroupInfoDao.findAsnGroupInfoByGroupIds(asnGroupIdList, 1);
+			}
+			//已下发过的asn groupId只需要下发组
+			if(!StringUtil.isEmpty(auditRegionList)){
+				for (AsnGroupInfo asnGroupInfo : auditRegionList) {
+					AsnKeywordCfg cfg = new AsnKeywordCfg();
+					cfg.setCompileId(entity.getCompileId());
+					cfg.setRegionId(asnGroupInfo.getRegionId());
+					cfg.setGroupId(Integer.parseInt(groupWithRegion.get(asnGroupInfo.getGroupId().toString()))); //组号
+					cfg.setUserRegion3("0"); //是否下发域
+					cfg.setIsAudit(entity.getIsAudit());
+					cfg.setIsValid(entity.getIsValid());
+					cfg.setAuditorId(entity.getAuditorId());
+					cfg.setAuditTime(entity.getAuditTime());
+					newAsnList.add(cfg);
+				}
+			}
+			
+			//4、查询所有未下发过的 ASN NO
+			if(!StringUtil.isEmpty(asnGroupIdList)){
+				notAuditRegionList=asnGroupInfoDao.findAsnGroupInfoByGroupIds(asnGroupIdList, 0);
+			}
+			
+			if(!StringUtil.isEmpty(notAuditRegionList)){
+				for (AsnGroupInfo asnGroupInfo : notAuditRegionList) {
+					AsnKeywordCfg cfg = new AsnKeywordCfg();
+					cfg.initDefaultValue();
+					cfg.setTableName(AsnKeywordCfg.getTablename());
+					cfg.setCompileId(entity.getCompileId());
+					cfg.setCfgType(asnList.get(0).getCfgType());
+					cfg.setCfgKeywords(asnGroupInfo.getAsnId().toString());//关键字
+					cfg.setGroupId(Integer.parseInt(groupWithRegion.get(asnGroupInfo.getGroupId().toString()))); //groupId
+					cfg.setRegionId(asnGroupInfo.getRegionId());//regionid
+					cfg.setUserRegion3("1"); //是否下发域
+					cfg.setIsAudit(entity.getIsAudit());
+					cfg.setIsValid(entity.getIsValid());
+					cfg.setAuditorId(entity.getAuditorId());
+					cfg.setAuditTime(entity.getAuditTime());
+					cfg.setFunctionId(entity.getFunctionId());
+					newAsnList.add(cfg);
+					notAuditGroupIdList.add(asnGroupInfo.getGroupId().toString());
+				}
+			}
+			//5、修改所有下发的asn为已下发
+			if(!StringUtil.isEmpty(notAuditGroupIdList)){
+				asnGroupInfoDao.updateIsUsedAndIsValid(notAuditGroupIdList,1,null);
+			}
+			//6、标记组已被策略标记为全部下发
+			if(!StringUtil.isEmpty(signAuditAllGroupList)){
+				configGroupInfoDao.updateIsAuditAll(4, 1,signAuditAllGroupList );
+			}
+			//7、标记组已被策略引用
+			if(!StringUtil.isEmpty(isUsedGroupIdList)){
+				configGroupInfoDao.updateIsUsed(4, 1, isUsedGroupIdList);
+			}
+			//8、maat配置转换
+			if(!StringUtil.isEmpty(newAsnList)){
+				Map<String,List> map = cfgConvert(strRegionList,newAsnList,7,entity,groupRelationList);
+			}
+		}
+		
+		
 		/*if(asnList!=null && asnList.size()>0){
 			
 				for (AsnKeywordCfg asnKeywordCfg : asnList) {
@@ -3344,6 +3568,33 @@ public abstract class BaseService {
 			}
 		}
 	}
-	
+	/**
+	 * 关键字公共组配置处理
+	 * @param entity
+	 */
+	public void auditStrGroupCfg(List<GroupCfg> groupRelationList,BaseCfg entity){
+		// url，跟dns公共组下发时用的组id
+		if(entity!=null&&!StringUtil.isEmpty(entity.getCommonGroupIds())){
+		// maat添加公共组信息
+			String[] orgGroupIds=entity.getCommonGroupIds().split(",");
+			for (int i = 0; i < orgGroupIds.length; i++) {
+				if(!StringUtil.isEmpty(orgGroupIds[i])){
+					List<Integer> listGroupId=new ArrayList<>();
+					GroupCfg group = new GroupCfg();
+					group.setGroupId(Integer.parseInt(orgGroupIds[i]));
+					group.setCompileId(entity.getCompileId());
+					group.setAuditTime(entity.getAuditTime());
+					group.setIsValid(entity.getIsValid()); // '0无效，1有效，-1删除;
+					group.setIsCommonGroup(1); // 标识为公共组 ，已下发过的组是否还需标记为公共组
+					if(!listGroupId.contains(group.getGroupId())){
+						groupRelationList.add(group);
+						listGroupId.add(group.getGroupId());
+					}
+				}
+			}
+		}
+		
+	}
+
 }
 

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

@@ -80,6 +80,7 @@ public class AsnGroupInfoService extends BaseService{
 		entity.setCountry(country);
 		
 		int groupId=0;
+		int onlyGroupId=0;//用于ip地址中下发配置组号
 		//新增
 		if(entity.getGroupId()==null){
 			
@@ -110,10 +111,18 @@ public class AsnGroupInfoService extends BaseService{
 			}else {
 				throw new MaatConvertException("Get asn group id failed");
 			}
+			//新增组号用于ip地址新增业务
+			List<Integer> onlyGroupIds= ConfigServiceUtil.getId(2,1);
+			if(onlyGroupIds.size()>0) {
+				onlyGroupId=onlyGroupIds.get(0).intValue();
+			}else {
+				throw new MaatConvertException("Get asn group id failed");
+			}
 			Date createTime=new Date();
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(createTime);
 			entity.setGroupId(groupId);
+			entity.setOnlyGroupId(onlyGroupId);
 			entity.setOrgGroupId(configGroupInfo.getGroupId());
 			entity.setIsValid(0);
 			//分组已被策略设定为下发全部域，则需要自动下发新增的asno
@@ -193,13 +202,15 @@ public class AsnGroupInfoService extends BaseService{
 		List srcList=new ArrayList<>();
 		AsnKeywordCfg cfg=new AsnKeywordCfg();
 		cfg.initDefaultValue();
-		cfg.setGroupId(group.getGroupId());
+//		cfg.setGroupId(group.getGroupId());
+		cfg.setGroupId(entity.getOnlyGroupId());// 用于ip地址 asn
 		cfg.setCfgKeywords(entity.getAsnId().toString());
 		cfg.setRegionId(entity.getRegionId());
 		cfg.setCfgType(Constants.NTC_ASN_NUMBER);
 		cfg.setAuditTime(new Date());
 		srcList.add(cfg);
-		srcMap.put(group.getGroupId(), srcList);
+//		srcMap.put(group.getGroupId(), srcList);
+		srcMap.put(entity.getOnlyGroupId(), srcList);// 用于ip地址 asn
 		GroupReuseAddBean commonGroupBean=new GroupReuseAddBean();
 		List<GroupReuseCfg> commonGroupList=new ArrayList<>();
 		commonGroupList=convertCommonRegion(srcMap,commonGroupList,1,2,4);

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

@@ -2,8 +2,6 @@ package com.nis.web.service.basics;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -19,12 +17,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.beust.jcommander.internal.Lists;
 import com.google.common.collect.Maps;
-import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
-import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.maat.GroupReuseAddBean;
@@ -38,9 +34,9 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.specific.ConfigGroupInfo;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.basics.AsnGroupInfoDao;
@@ -172,15 +168,25 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			auditAllAsnRegionCfg(entity,auditAsnGroupList,null);
 		}*/
 	}
+	/**
+	 * 
+	 * @param asnIpCfgs
+	 * @param asnIds
+	 * @param isImportAll 增量或者全量
+	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveAsnIp(List<AsnIpCfg> asnIpCfgs,String asnIds){
+	public void saveAsnIp(List<AsnIpCfg> asnIpCfgs,String asnIds,String isImportAll){
 		logger.warn("Start to  only save asn ip size:"+asnIpCfgs.size());
 		long start=System.currentTimeMillis();
 		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
         SqlSession batchSqlSession = null;
         try{
         	if(!StringUtil.isEmpty(asnIpCfgs)){
-        		asnIpCfgDao.deleteByAsnId(asnIds);
+        		//全量时需要删除asn 下的所有ip
+        		if("1".equals(isImportAll)){
+        			asnIpCfgDao.deleteByAsnId(asnIds);
+        		}
+        		
         		batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
         		for (AsnIpCfg cfg : asnIpCfgs) {
         			((AsnIpCfgDao) batchSqlSession.getMapper(AsnIpCfgDao.class)).insert(cfg);
@@ -296,12 +302,12 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 			maatBean.setOpAction(Constants.INSERT_ACTION);
 			//调用服务接口下发配置数据
 			String json=gsonToJson(maatBean);
-			//logger.info("asn ip maat结构配置下发配置参数："+json);
-			logger.info("asn ip maat结构配置下发配置参数：");
+			logger.info("asn ip maat结构配置下发配置参数："+json);
+			//logger.info("asn ip maat结构配置下发配置参数：");
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
-			//logger.info("asn ip maat结构配置下发响应信息："+result.getMsg());
-			logger.info("asn ip maat结构配置下发响应信息：");
+			logger.info("asn ip maat结构配置下发响应信息："+result.getMsg());
+			//logger.info("asn ip maat结构配置下发响应信息：");
         }else{
         	if(!StringUtil.isEmpty(auditList)){
         		asnIPRegionSendToMaat(auditList, 1, Constants.OPACTION_POST);
@@ -394,6 +400,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
             		List<Integer> compileIds=ConfigServiceUtil.getId(1, newAsnGroup.size());
                 	List<Integer> groupIds=ConfigServiceUtil.getId(2, newAsnGroup.size());
                 	List<Integer> regionIds=ConfigServiceUtil.getId(3, newAsnGroup.size());
+            		int onlyGroupId=0;//用于ip地址中下发配置组号
                 	for(Entry<Long, AsnGroupInfo> e:newAsnGroup.entrySet()) {
                 		AsnGroupInfo asnGroupInfo=e.getValue();
                 		asnGroupInfo.setAsnId(e.getKey());
@@ -405,6 +412,14 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
                 		asnGroupInfo.setCompileId(compileIds.get(index));
                 		asnGroupInfo.setRegionId(regionIds.get(index));
                 		asnGroupInfo.setOrgGroupId(asnOrgList.get(1).get(asnGroupInfo.getOrganization()).getGroupId());
+                		//新增组号用于ip地址新增业务
+            			List<Integer> onlyGroupIds= ConfigServiceUtil.getId(2,1);
+            			if(onlyGroupIds.size()>0) {
+            				onlyGroupId=onlyGroupIds.get(0).intValue();
+            			}else {
+            				throw new MaatConvertException("Get asn group id failed");
+            			}
+                		asnGroupInfo.setOnlyGroupId(onlyGroupId);
                 		asnNoMaps.get(0).put(e.getKey(), asnGroupInfo);//设置完各种id后更新map数据
                 		asnNoMaps.get(2).put(e.getKey(), asnGroupInfo);//设置完各种id后更新map数据
                 		((AsnGroupInfoDao) batchSqlSession.getMapper(AsnGroupInfoDao.class)).insertWithId(asnGroupInfo);

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

@@ -0,0 +1,263 @@
+package com.nis.web.service.basics;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+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.basics.AsnIpCfg;
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.ComplexkeywordCfg;
+import com.nis.domain.configuration.DnsKeywordCfg;
+import com.nis.domain.maat.MaatCfg.IpCfg;
+import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
+import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.basics.AsnGroupInfoDao;
+import com.nis.web.dao.basics.AsnIpCfgDao;
+import com.nis.web.dao.basics.PolicyGroupInfoDao;
+import com.nis.web.dao.configuration.DnsKeywordCfgDao;
+import com.nis.web.dao.configuration.StringCfgDao;
+import com.nis.web.dao.specific.ConfigGroupInfoDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.CrudService;
+import com.nis.web.service.SpringContextHolder;
+@Service
+public class DnsKeywordCfgService extends CrudService<CrudDao<DnsKeywordCfg>, DnsKeywordCfg> {
+	@Autowired
+	private AsnIpCfgDao asnIpCfgDao;
+	
+	@Autowired
+	protected DnsKeywordCfgDao dnsKeywordCfgDao;
+//	@Autowired
+//	private SpecificServiceCfgDao specificServiceCfgDao;
+	@Autowired
+	private ConfigGroupInfoDao configGroupInfoDao;
+	@Autowired
+	private AsnGroupInfoDao asnGroupInfoDao;
+	
+	@Autowired
+	private PolicyGroupInfoDao policyGroupInfoDao;
+	/**
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	public Page<DnsKeywordCfg> findPage(Page<DnsKeywordCfg> page, DnsKeywordCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<DnsKeywordCfg> list=dnsKeywordCfgDao.findPage(entity);
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(12,null);
+		Map<String, String> policyGroupMap = new HashMap<String, String>();
+		for (PolicyGroupInfo policyGroupInfo : policyGroupInfos) {
+			if (!StringUtil.isEmpty(policyGroupInfo.getServiceGroupId())) {
+				policyGroupMap.put(policyGroupInfo.getServiceGroupId().toString(), policyGroupInfo.getGroupName()+"");
+			}
+		}
+		for (DnsKeywordCfg cfg : list) {
+			cfg.setDnsGroupName(policyGroupMap.get(cfg.getUserRegion1()));
+		}
+		page.setList(list);
+		return page;
+	}
+	
+	public List<AsnIpCfg> findByPage(String ids) {
+		List<AsnIpCfg> list=asnIpCfgDao.findByPage(ids);
+		return list;
+	}
+	public DnsKeywordCfg get(Long id ) {
+		return dnsKeywordCfgDao.get(id);
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void update(DnsKeywordCfg entity){
+		Date editTime=new Date();
+		entity.setEditTime(editTime);
+		entity.setEditorId(entity.getCurrentUser().getId());
+		List<DnsKeywordCfg> auditList=new ArrayList<DnsKeywordCfg>();
+		/**
+		 * isvalid=0 and asnNo=false 直接修改
+		 * isvalid=0 and asnNo=true 需要下发
+		 * isvalid=1 需要下发asnNo下所有的域配置
+		 */
+		/*if(groupInfo.getIsUsed().equals(1) && entity.getIsValid().equals(Constants.VALID_NO)){
+			entity.setAuditTime(editTime);
+			entity.setAuditorId(entity.getCurrentUser().getId());
+			entity.setIsValid(Constants.VALID_YES);
+			entity.setIsAudit(Constants.AUDIT_YES);
+			auditAsnIpList.add(entity);
+		}
+		if(groupInfo.getIsUsed().equals(1) && entity.getIsValid().equals(Constants.VALID_YES)){
+			entity.setAuditTime(editTime);
+			entity.setAuditorId(entity.getCurrentUser().getId());
+			entity.setIsValid(Constants.VALID_YES);
+			entity.setIsAudit(Constants.AUDIT_YES);
+			auditAsnGroupList.add(groupInfo);
+		}*/
+		if(entity.getIsValid() ==1){
+			entity.setAuditTime(editTime);
+			entity.setAuditorId(entity.getCurrentUser().getId());
+			entity.setEditTime(editTime);
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setIsValid(Constants.VALID_YES);
+			entity.setIsAudit(Constants.AUDIT_YES);
+		}else{
+			entity.setEditTime(editTime);
+			entity.setEditorId(entity.getCurrentUser().getId());
+			entity.setIsValid(Constants.VALID_NO);
+			entity.setIsAudit(Constants.VALID_NO);
+		}
+		dnsKeywordCfgDao.update(entity);
+		//ASN下发状态时可以更改，更改之后直接下发
+		if(entity.getIsValid() ==1){
+			auditList.add(entity);
+//			dnsKeywordRegionSendToMaat(auditList,Constants.VALID_YES,Constants.OPACTION_PUT);
+		}
+		//common group 新增下发 ASN IP配置
+		/*if(!StringUtil.isEmpty(auditAsnIpList)){
+			asnIPRegionSendToMaat(auditAsnIpList,Constants.VALID_YES,Constants.OPACTION_POST);
+		}*/
+		
+		//common group 修改已下发过的配置，全量下发 ASN NO下的所有有效配置
+		/*if(entity.getIsAudit().equals(Constants.VALID_YES)){
+			auditAllAsnRegionCfg(entity,auditAsnGroupList,null);
+		}*/
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveDnsKeywordCfg(CfgIndexInfo entity) {
+//		entity.setCompileId(compileId);
+		entity.setCreateTime(new Date());
+		entity.setCreatorId(entity.getCurrentUser().getId());
+		if (!StringUtil.isEmpty(entity.getDomainList())) {
+			List<Integer> regionIdList  = ConfigServiceUtil.getId(3, entity.getDomainList().size());
+			for (int i = 0; i < entity.getDomainList().size(); i++) {
+				ComplexkeywordCfg cfg = entity.getDomainList().get(i);
+				if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode"});
+					if(StringUtils.isNoneBlank(cfg.getDistrictShowName()) && cfg.getDistrict().equals("others")){
+						cfg.setDistrict(cfg.getDistrictShowName());
+					}
+					cfg.setRegionId(regionIdList.get(i));
+					dnsKeywordCfgDao.saveDnsKeywordsCfg(cfg);
+				}
+			}
+		}
+		//TODO 注意：被策略引用并下发过的ASN NO，配置新增后直接下发【此功能暂时不做自动，asnip拥有审核功能】
+		/*if(!StringUtil.isEmpty(auditAsnIpList)){
+			asnIPRegionSendToMaat(auditAsnIpList,Constants.VALID_YES,Constants.OPACTION_POST);
+		}*/
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void delete(String ids) {
+		List<DnsKeywordCfg> issuedList=new ArrayList<>();
+		List<DnsKeywordCfg> dnsKwdCfgList= dnsKeywordCfgDao.getByIds(ids);
+		for(DnsKeywordCfg entity:dnsKwdCfgList) {
+			if(entity.getIsValid()==Constants.VALID_YES) {//代表下发过了
+				entity.setIsValid(Constants.VALID_DEL);
+				issuedList.add(entity);
+				// groupId=asnIpCfg.getAsnIpGroup();
+				//List result=asnIpCfgDao.findOtherIps(groupId, asnIpCfg.getCfgId().intValue());
+				//if(result==null||result.size()==0) {
+				//	throw new RuntimeException("Cant not delete ip from asn group, there is only one ip left in the group!");
+				//}
+			}
+		}
+		dnsKeywordCfgDao.delete(ids);
+		//已经下发过的,调用分组复用配置删除接口
+//		splitAndSend(issuedList,Constants.VALID_NO);
+		if(issuedList.size() > 0){
+//			dnsKeywordRegionSendToMaat(issuedList,Constants.VALID_NO,Constants.OPACTION_PUT);
+		}
+	}
+
+	/**
+	 * 
+	 * @Description:Dns 关键字公共组配置审核功能 
+	 * @author(zdx)
+	 * @date 2019年2月21日 下午6:44:11
+	 * @param infoList
+	 * @param serviceGroupId
+	 * @param isValid
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditDnsKeywordBatch(List<DnsKeywordCfg> infoList,Long serviceGroupId,Integer isAudit,Integer isValid) {
+		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
+		final SqlSession batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
+		try{
+				if(!StringUtil.isEmpty(infoList)){
+					List regionList = new ArrayList();
+					for(int index = 0; index < infoList.size();index++){
+						DnsKeywordCfg t = infoList.get(index);
+						BaseStringCfg baseStrCfg=new BaseStringCfg();
+						StringCfg strCfg = new StringCfg();
+						BeanUtils.copyProperties(t, baseStrCfg);
+						BeanUtils.copyProperties(t, strCfg);
+						strCfg.setGroupId(Integer.valueOf(t.getUserRegion1()));
+						baseStrCfg.setTableName(DnsKeywordCfg.getTablename());
+						regionList.add(strCfg);
+						((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).audit(baseStrCfg);
+					}
+					batchSqlSession.commit();
+					if (isAudit!=Constants.AUDIT_NO) {//审核未通过 跳过
+						PolicyGroupInfo dnsGroupInfo = null;
+						List<PolicyGroupInfo> dnsGroupInfoList=policyGroupInfoDao.getInfoByServiceGroupId(serviceGroupId);
+						if (!StringUtil.isEmpty(dnsGroupInfoList)) {
+							dnsGroupInfo = dnsGroupInfoList.get(0);
+						}
+						List<IpCfg> ipRegionList = new ArrayList();
+						List<StringCfg> strRegionList = new ArrayList();
+						List<NumBoundaryCfg> numRegionList = new ArrayList();
+						if(isValid==Constants.VALID_YES) {//审核通过
+								if (Integer.valueOf(dnsGroupInfo.getUdFlag())==0) {
+									dnsGroupInfo.setEditorId(UserUtils.getUser().getId());
+									dnsGroupInfo.setEditTime(new Date());
+									dnsGroupInfo.setUdFlag(1);
+									policyGroupInfoDao.updateUdFlag(dnsGroupInfo);
+								}
+								commonGroupRegionSendToMaat(regionList,Constants.OPACTION_POST);
+						}else if(isValid==Constants.VALID_NO) {//取消审核通过
+							
+							//如果一个dns组下没有域了，需要把policy的udFlag设置为0(如果还有dns配置未取消提示需要先取消配置才能取消最后一个域)
+							if(!hasValidDnsKeyword(serviceGroupId)) {
+								//需要先判断是否有生效配置引用该组
+								dnsGroupInfo.setEditorId(UserUtils.getUser().getId());
+								dnsGroupInfo.setEditTime(new Date());
+								dnsGroupInfo.setUdFlag(0);
+								policyGroupInfoDao.updateUdFlag(dnsGroupInfo);
+							}
+							commonGroupRegionSendToMaat(regionList,Constants.OPACTION_DELETE);
+						}
+					}
+				}
+		}finally {
+			if(batchSqlSession != null){
+				batchSqlSession.close();
+			}
+		}
+	}
+	public boolean hasValidDnsKeyword(Long maatGroupId) {
+		return dnsKeywordCfgDao.hasValidDnsKeyword(maatGroupId)>0;
+	}
+	public List<DnsKeywordCfg> getByIds(String ids) {
+		if(ids==null) {
+			throw new RuntimeException("ids is null!");
+		}
+		return dnsKeywordCfgDao.getByIds(ids);
+	}
+}

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

@@ -108,6 +108,15 @@ public class PolicyGroupInfoService extends BaseService{
 //					}
 					
 				}
+			}else if(11==entity.getGroupType()||12==entity.getGroupType()) {
+				int serviceGroupId=0;
+				List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
+				if(groupIds.size()>0) {
+					serviceGroupId=groupIds.get(0).intValue();
+				}else {
+					throw new MaatConvertException("Get asn group id failed");
+				}
+				entity.setServiceGroupId(serviceGroupId);
 			}
 			policyGroupInfoDao.insert(entity);
 		//修改
@@ -173,5 +182,11 @@ public class PolicyGroupInfoService extends BaseService{
 	public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){
 		return policyGroupInfoDao.getGroupInfo(policyGroupInfo);
 	}
-	
+	/**
+	 * url组以及dns组相关功能使用
+	 */
+	public List<PolicyGroupInfo> findPolicyGroupInfosByTypeforUD(Integer type,Integer flag) {
+		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(type,flag);
+		return list;
+	}
 }

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

@@ -0,0 +1,153 @@
+package com.nis.web.service.basics;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+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.basics.AsnGroupInfo;
+import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.UrlCommGroupCfg;
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.maat.GroupReuseAddBean;
+import com.nis.domain.maat.GroupReuseCfg;
+import com.nis.domain.maat.MaatCfg;
+import com.nis.domain.maat.ToMaatBean;
+import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.MaatCfg.DigestCfg;
+import com.nis.domain.maat.MaatCfg.GroupCfg;
+import com.nis.domain.maat.MaatCfg.IpCfg;
+import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
+import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.basics.UrlCommGroupDao;
+import com.nis.web.dao.configuration.IpCfgDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.CrudService;
+import com.nis.web.service.SpringContextHolder;
+
+@Service
+public class UrlCommGroupService extends CrudService<CrudDao<UrlCommGroupCfg>, UrlCommGroupCfg>{
+	
+	@Autowired
+	private  UrlCommGroupDao   urlCommGroupDao;
+	
+	
+	public Page<UrlCommGroupCfg> findPage(Page<UrlCommGroupCfg> page, UrlCommGroupCfg entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<UrlCommGroupCfg> list=urlCommGroupDao.findAllPageList(entity);
+		for (int i = 0; i < list.size(); i++) {
+			String key=list.get(i).getCfgKeywords().replace("***and***", " ");
+			list.get(i).setCfgKeywords(key);
+		}
+		page.setList(list);
+		return page;
+	}
+	
+	
+	public List<UrlCommGroupCfg> findByPage(String ids) {
+		List<UrlCommGroupCfg> list=urlCommGroupDao.findByPage(ids);
+		return list;
+	}
+	
+
+	
+	public UrlCommGroupCfg get(Long id ) {
+		return urlCommGroupDao.get(id);
+	}
+	
+	//新增 insertUrlCommGroupCfg
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveUrlCommGroupCfg(CfgIndexInfo entity) {
+		Date createTime=new Date();
+		if(entity.getUrlCommGroupList()!=null) {
+			for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) {
+				BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"});
+				entity.getUrlCommGroupList().get(i).setRequestId(0);
+				entity.getUrlCommGroupList().get(i).setClassify("0");
+				entity.getUrlCommGroupList().get(i).setAttribute("0");
+				entity.getUrlCommGroupList().get(i).setLable("0");
+				entity.getUrlCommGroupList().get(i).setIsHexbin(0);
+				entity.getUrlCommGroupList().get(i).setCreateTime(createTime);
+				entity.getUrlCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId());
+				entity.getUrlCommGroupList().get(i).setIsValid(Constants.VALID_NO);
+				entity.getUrlCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
+				if(entity.getUrlCommGroupList().get(i).getCfgKeywords().contains("***and***")){
+					entity.getUrlCommGroupList().get(i).setExprType(1);
+				}else{
+					entity.getUrlCommGroupList().get(i).setExprType(0);
+				}
+				urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
+			}
+//			//修改公共组的标识
+//			Integer udFlag=urlCommGroupDao.findUrlUdFlag(Integer.parseInt(entity.getUserRegion3()));
+//			if(udFlag == 0){
+//				urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(entity.getUserRegion3()), 1);
+//			}
+		}
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void update(UrlCommGroupCfg entity){
+		Date editTime=new Date();
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		entity.setEditTime(editTime);
+		entity.setEditorId(entity.getCurrentUser().getId());
+		if(entity.getCfgKeywords().contains("***and***")){
+			entity.setExprType(1);
+		}else{
+			entity.setExprType(0);
+		}
+		urlCommGroupDao.update(entity);
+	}
+	
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void delete(String ids) {
+		
+		urlCommGroupDao.delete(ids);
+	}
+	
+	public List<UrlCommGroupCfg> getByIds(String ids) {
+		if(ids==null) {
+			throw new RuntimeException("ids is null!");
+		}
+		return urlCommGroupDao.getByIds(ids);
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void audit(UrlCommGroupCfg urlGroupCfg,Integer isAudit,Integer isValid) {
+		 
+		if(!StringUtil.isEmpty(urlGroupCfg)){
+			urlGroupCfg.setIsValid(isValid);
+			urlGroupCfg.setIsAudit(isAudit);
+			urlGroupCfg.setAuditorId(UserUtils.getUser().getId());
+			urlGroupCfg.setAuditTime(new Date());
+					
+			urlCommGroupDao.update(urlGroupCfg);
+		}
+		//下发配置时改变公共组udFlag标识
+		//查询有效的url配置个数
+		Integer groupCount=urlCommGroupDao.getGroupIdCount(urlGroupCfg.getUserRegion3());
+		if(groupCount>0){//udFlag 设置为1
+			urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 1);
+		}else{//udFlag 设置为0
+			urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 0);
+		}	
+	}
+	
+}

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

@@ -372,6 +372,7 @@ public class AppCfgService extends BaseService {
 				configGroupInfo.setGroupId(specificServiceCfg.getGroupId());
 				configGroupInfo.setGroupName(specificServiceCfg.getSpecServiceName());
 				configGroupInfo.setIsIssued(0);
+				configGroupInfo.setInsertTime(new Date());
 				configGroupInfo.setGroupType(1);
 				configGroupInfo.setCompileId(compileId);
 				configGroupInfoDao.insertConfigGroupInfo(configGroupInfo);

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

@@ -577,7 +577,6 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				
 				//查询子配置并修改审核状态
 				entity = this.getDomainCfg(entity.getCfgId(),entity.getCompileId());
-				
 				if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
 					HttpUrlCfg cfg = new HttpUrlCfg();
 					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -616,6 +615,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				
 				//构造提交综合服务参数格式，一条配置提交一次综合服务
 				if(isAudit==1){
+					auditStrGroupCfg(groupRelationList, entity); // 是否添加公共组
 					maatCfg.initDefaultValue();
 					BeanUtils.copyProperties(entity, maatCfg);
 					maatCfg.setAction(entity.getAction());
@@ -643,6 +643,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 					logger.info("domain配置下发响应信息："+result.getMsg());
 
 				}else if(isAudit==3){
+					addKeepGroupList(maatCfg, entity);// 取消审核保留公共组
 					maatCfg.setCompileId(entity.getCompileId());
 					maatCfg.setServiceId(entity.getServiceId());
 					maatCfg.setIsValid(0);//无效

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

@@ -560,7 +560,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			}
 		}
 		//asn配置下发
-		auditAsnCfg(groupRelationList,strRegionList,entity,entity.getAsnKeywords());
+		auditAsnCfgForIpAddr(groupRelationList,strRegionList,entity,entity.getAsnKeywords());
 		//保存区域IP信息
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){

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

@@ -1195,6 +1195,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		
 		//构造提交综合服务参数格式，一条配置提交一次综合服务
 		if(isAudit==1){
+			auditStrGroupCfg(groupRelationList, entity); // 是否添加公共组
 			maatCfg.initDefaultValue();
 			BeanUtils.copyProperties(entity, maatCfg);
 			maatCfg.setAction(entity.getAction());
@@ -1226,6 +1227,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			logger.info("dns配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
+			addKeepGroupList(maatCfg, entity);// 取消审核保留公共组
 			maatCfg.setCompileId(entity.getCompileId());
 			maatCfg.setServiceId(entity.getServiceId());
 			maatCfg.setIsValid(0);//无效

src/main/resources/messages/message_en.properties

@@ -1481,7 +1481,7 @@ reedit=Please re-edit!
 intercep_domain_required_tip=Domain is required
 packets=packets
 GByte=GByte
-#\u5B9A\u65F6\u5668\u53C2\u6570
+#\u5b9a\u65f6\u5668\u53c2\u6570
 interval=Recure every
 month=Months
 day=Days
@@ -1497,4 +1497,11 @@ validate_error=Unexpected error occurred while validating
 Is_schduler=Scheduler
 v4_num=IPv4 Number
 v6_num=IPv6 Number
-is_schduler=Scheduler
+is_schduler=Scheduler
+dnsGroup=DNS Group
+urlGroup=Http URL Group
+#add common group
+url_group_manage=URL Group Manage
+url_group_configuration=URL Group Config
+dns_keyword_group_manage=DNS Group Manage
+dns_keyword_group_configuration=DNS Group Config

src/main/resources/messages/message_ru.properties

@@ -1323,7 +1323,7 @@ address_pool_id=ID \u043f\u0443\u043b \u0430\u0434\u0440\u0435\u0441\u043e\u0432
 outgoing_unicast_total_size=\u0417\u0430\u043a\u0430\u0447\u0430\u0442\u044c \u0431\u0430\u0439\u0442\u044b
 voip_sample_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043e\u0431\u0440\u0430\u0437\u0446\u043e\u0432 VOIP \u0430\u0443\u0434\u0438\u043e
 available_ip=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 IP
-block_by_app_server_ip=DNS-\u0421\u043F\u0443\u0444\u0438\u043D\u0433
+block_by_app_server_ip=DNS-\u0421\u043f\u0443\u0444\u0438\u043d\u0433
 certificate_file=\u0424\u0430\u0439\u043b \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0430
 address_pool=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0443\u043b\u0430 \u0430\u0434\u0440\u0435\u0441\u043e\u0432
 transfer_bytes=\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0430 \u0431\u0430\u0439\u0442\u043e\u0432
@@ -1370,7 +1370,7 @@ keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u
 conn_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0434\u043a\u044e\u0447\u0435\u043d\u0438\u0439
 bps=\u0413\u0431\u0438\u0442/\u0441
 bps_percent=Bps Percent
-pps=\u041F\u0430\u043A\u0435\u0442/\u0441
+pps=\u041f\u0430\u043a\u0435\u0442/\u0441
 pps_percent=pps Percent
 spoofing_ip_object=\u041f\u0443\u043b IP \u0421\u043f\u0443\u0444\u0438\u043d\u0433
 spoofing_ip_policy=IP \u0421\u043f\u0443\u0444\u0438\u043d\u0433
@@ -1382,13 +1382,13 @@ d_asn=DASN
 asn_conn_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 ASN
 https_url_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 HTTP(s) URL
 url=URL
-sum=\u0421\u0443\u043C\u043C\u0430
+sum=\u0421\u0443\u043c\u043c\u0430
 url_count=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e URL
 ip_range_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0425\u043e\u0441\u0442\u043e\u0432 \u0432 \u0433\u0440\u0430\u043d\u0438\u0446\u0430\u0445 \u0438 \u0437\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0435\u0439
 ip_start=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 IP
 ip_end=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 IP
-ip_start_num=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u041D\u0430\u0447\u0430\u043B\u044C\u043D\u044B\u0445 IP-\u0430\u0434\u0440\u0435\u0441\u043E\u0432
-ip_end_num=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u041A\u043E\u043D\u0435\u0447\u043D\u044B\u0445 IP-\u0430\u0434\u0440\u0435\u0441\u043E\u0432
+ip_start_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0445 IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432
+ip_end_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0445 IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432
 ip_sub=IP-\u043f\u043e\u0434\u0441\u0435\u0442\u044c
 start_ip=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 IP
 end_ip=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 IP
@@ -1403,21 +1403,21 @@ ip_spoofing_group_manage=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\
 min_tcp=\u041c\u0438\u043d.
 max_tcp=\u041c\u0430\u043a\u0441.
 APP_TCP_SESSION_BYTE=\u0421\u0435\u0430\u043d\u0441
-ip_count=\u0415\u0434\u0438\u043D\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0439 IP-\u0430\u0434\u0440\u0435\u0441
+ip_count=\u0415\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441
 counnection_count=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0439
 asn=ASN
 Unique_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043b\u0438\u0435\u043d\u0442\u0430 IP
 ip=IP
 country=\u0421\u0442\u0440\u0430\u043d\u0430
 unique_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043b\u0438\u0435\u043d\u0442\u0430 IP
-import_limit_is=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u0438\u043C\u043F\u043E\u0440\u0442\u0430
-upload_limit_is=\u041E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0444\u0430\u0439\u043B\u0430
-count=\u041F\u043E\u0434\u0441\u0447\u0435\u0442
-do_blacklist=\u0427\u0435\u0440\u043D\u044B\u0439 \u0421\u043F\u0438\u0441\u043E\u043A
-l3_header_error=\u0422\u043E\u043B\u044C\u043A\u043E \u0447\u0435\u0442\u044B\u0440\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u043F\u0440\u0438\u0437\u043D\u0430\u043A\u0438 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u0432\u0432\u0435\u0434\u0435\u043D\u044B \u0432
-IP_HEADER=IP \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0430
-ICMP_HEADER=ICMP \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0430
-offset_expression=\u0421\u043C\u0435\u0449\u0435\u043D\u0438\u0435 \u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u0430
+import_limit_is=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u0430\u0437\u043c\u0435\u0440 \u0438\u043c\u043f\u043e\u0440\u0442\u0430
+upload_limit_is=\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0444\u0430\u0439\u043b\u0430
+count=\u041f\u043e\u0434\u0441\u0447\u0435\u0442
+do_blacklist=\u0427\u0435\u0440\u043d\u044b\u0439 \u0421\u043f\u0438\u0441\u043e\u043a
+l3_header_error=\u0422\u043e\u043b\u044c\u043a\u043e \u0447\u0435\u0442\u044b\u0440\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u0438 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0432\u0432\u0435\u0434\u0435\u043d\u044b \u0432
+IP_HEADER=IP \u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430
+ICMP_HEADER=ICMP \u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430
+offset_expression=\u0421\u043c\u0435\u0449\u0435\u043d\u0438\u0435 \u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430
 cfg_custom=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0421\u0442\u043e\u043b\u0431\u0446\u044b
 event_report=\u041e\u0442\u0447\u0435\u0442 \u043e \u043c\u0435\u0440\u043e\u043f\u0440\u0438\u044f\u0442\u0438\u0438
 ntc_event_monitor_report=\u0441\u043e\u0431\u044b\u0442\u0438\u044f \u041c\u043e\u043d\u0438\u0442\u043e\u0440 \u041e\u0442\u0447\u0435\u0442
@@ -1432,33 +1432,33 @@ letter_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041f\u
 config_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0439
 monitor_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430
 control_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f
-contains_non_hex_char=\u0421\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043D\u0435 \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043D\u044B\u0435 \u0441\u0438\u043C\u0432\u043E\u043B\u044B
-max_length=\u041C\u0430\u043A\u0441. \u0414\u043B\u0438\u043D\u0430
-min_length=\u041C\u0438\u043D. \u0414\u043B\u0438\u043D\u0430
-length_error=\u041E\u0448\u0438\u0431\u043A\u0430 \u0441 \u0414\u043B\u0438\u043D\u043E\u0439
-duplicate=\u0414\u0443\u0431\u043B\u0438\u043A\u0430\u0442
-print=\u041F\u0435\u0447\u0430\u0442\u044C
+contains_non_hex_char=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043d\u0435 \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b
+max_length=\u041c\u0430\u043a\u0441. \u0414\u043b\u0438\u043d\u0430
+min_length=\u041c\u0438\u043d. \u0414\u043b\u0438\u043d\u0430
+length_error=\u041e\u0448\u0438\u0431\u043a\u0430 \u0441 \u0414\u043b\u0438\u043d\u043e\u0439
+duplicate=\u0414\u0443\u0431\u043b\u0438\u043a\u0430\u0442
+print=\u041f\u0435\u0447\u0430\u0442\u044c
 traffic_connect_log=\u0416\u0443\u0440\u043d\u0430\u043b \u0422\u0440\u0430\u0444\u0438\u043a\u0430
-keyword_log_to_url=\u041E\u0442 \u041A\u043B\u044E\u0447\u0435\u0432\u043E\u0433\u043E \u0421\u043B\u043E\u0432\u0430 \u0414\u043E URL
-http_log=HTTP \u0436\u0443\u0440\u043D\u0430\u043B\u044B
-cut_sample_tool=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 \u0434\u043B\u044F \u0432\u044B\u0440\u0435\u0437\u043E\u043A \u043E\u0431\u0440\u0430\u0437\u0446\u0430
+keyword_log_to_url=\u041e\u0442 \u041a\u043b\u044e\u0447\u0435\u0432\u043e\u0433\u043e \u0421\u043b\u043e\u0432\u0430 \u0414\u043e URL
+http_log=HTTP \u0436\u0443\u0440\u043d\u0430\u043b\u044b
+cut_sample_tool=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 \u0434\u043b\u044f \u0432\u044b\u0440\u0435\u0437\u043e\u043a \u043e\u0431\u0440\u0430\u0437\u0446\u0430
 hex_minlength_3=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043d\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0434\u043b\u0438\u043d\u043e\u0439 3
 hex_minlength_4=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043d\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0434\u043b\u0438\u043d\u043e\u0439 4
 hex_minlength_8=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043d\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0434\u043b\u0438\u043d\u043e\u0439 8
 hex_minlength_16=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0435\u0440\u0438\u0447\u043d\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0434\u043b\u0438\u043d\u043e\u0439 16
 need_input=\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0437\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e
 max_input=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e \u0447\u0435\u0442\u044b\u0440\u0435 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430
-no_need_input=\u041D\u0435 \u043D\u0443\u0436\u043D\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u044F\u0442\u044C \u043F\u0440\u0438\u0437\u043D\u0430\u043A\u0438
-close_link=\u0417\u0430\u043A\u0440\u044B\u0442\u043E\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435
-asn_group=ASN \u0433\u0440\u0443\u043F\u043F\u0430
-can_not_edit_issued_ans_group=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443 ASN
-can_not_delete_asn_group_with_audited_ip=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 ASN \u0441 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u043D\u044B\u043C IP-\u0430\u0434\u0440\u0435\u0441\u043E\u043C
-organization=\u041E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u044F
-mismatch=\u041D\u0435\u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435
-can_not_delete_asn_group_with_audited_ip_address=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 ASN \u0441 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u043D\u044B\u043C \u043F\u0430\u043A\u0435\u0442\u043E\u043C IP-\u0430\u0434\u0440\u0435\u0441\u0430
-country_code=\u041A\u043E\u0434 \u0421\u0442\u0440\u0430\u043D\u044B
-asn_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 ASN
-details=\u041F\u043E\u0434\u0440\u043E\u0431\u043D\u043E\u0441\u0442\u0438
+no_need_input=\u041d\u0435 \u043d\u0443\u0436\u043d\u043e \u0437\u0430\u043f\u043e\u043b\u043d\u044f\u0442\u044c \u043f\u0440\u0438\u0437\u043d\u0430\u043a\u0438
+close_link=\u0417\u0430\u043a\u0440\u044b\u0442\u043e\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435
+asn_group=ASN \u0433\u0440\u0443\u043f\u043f\u0430
+can_not_edit_issued_ans_group=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443 ASN
+can_not_delete_asn_group_with_audited_ip=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443 ASN \u0441 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u044b\u043c IP-\u0430\u0434\u0440\u0435\u0441\u043e\u043c
+organization=\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f
+mismatch=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435
+can_not_delete_asn_group_with_audited_ip_address=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443 ASN \u0441 \u0443\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u044b\u043c \u043f\u0430\u043a\u0435\u0442\u043e\u043c IP-\u0430\u0434\u0440\u0435\u0441\u0430
+country_code=\u041a\u043e\u0434 \u0421\u0442\u0440\u0430\u043d\u044b
+asn_name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 ASN
+details=\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438
 NTC_ASN_NUMBER=ASN
 application_layer_protocol=L7 \u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b
 traffic_statistics=\u041f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u0430\u044f \u0421\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c \u0422\u0440\u0430\u0444\u0438\u043a\u0430
@@ -1467,13 +1467,13 @@ protocol_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430
 app_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
 service_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0421\u0435\u0440\u0432\u0438\u0441\u043e\u0432
 website_statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u0412\u0435\u0431-\u0441\u0430\u0439\u0442\u043e\u0432
-not_exist=\u041D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
-real_time=\u0412 \u0440\u0435\u0430\u043B\u044C\u043D\u043E\u043C \u0432\u0440\u0435\u043C\u0435\u043D\u0438
-history=\u0418\u0441\u0442\u043E\u0440\u0438\u044F
-all_columns_hidden=\u0412\u0441\u0435 \u0441\u0442\u043E\u043B\u0431\u0446\u044B \u0441\u043A\u0440\u044B\u0442\u044B!
-no_log=\u041D\u0435
-all_log=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 \u0438 \u0421\u043D\u0438\u043C\u043E\u043A
-framework_log=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435
+not_exist=\u041d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
+real_time=\u0412 \u0440\u0435\u0430\u043b\u044c\u043d\u043e\u043c \u0432\u0440\u0435\u043c\u0435\u043d\u0438
+history=\u0418\u0441\u0442\u043e\u0440\u0438\u044f
+all_columns_hidden=\u0412\u0441\u0435 \u0441\u0442\u043e\u043b\u0431\u0446\u044b \u0441\u043a\u0440\u044b\u0442\u044b!
+no_log=\u041d\u0435
+all_log=\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0438 \u0421\u043d\u0438\u043c\u043e\u043a
+framework_log=\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435
 block_drop=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435(\u041f\u0430\u0434\u0435\u043d\u0438\u0435)
 mail_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0447\u0442\u044b
 ssl_record=SSL \u0417\u0430\u043f\u0438\u0441\u0438
@@ -1482,21 +1482,28 @@ ip_existed=IP \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u044
 user_check=\u0414\u0430\u043d\u043d\u044b\u0439 \u043e\u0431\u044a\u0435\u043a\u0442 \u0437\u0430\u043d\u044f\u0442, \u043d\u0435\u043b\u044c\u0437\u044f \u0443\u0434\u0430\u043b\u0438\u0442\u044c!
 deletedAsnTip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u2116 cfgId \u0441 ASN asnId \u0431\u044b\u043b\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0430;
 reedit=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0437\u0430\u043d\u043e\u0432\u043e!
-intercep_domain_required_tip=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044F \u0434\u043E\u043C\u0435\u043D
-packets=\u041F\u0430\u043A\u0435\u0442\u044B
+intercep_domain_required_tip=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u043e\u043c\u0435\u043d
+packets=\u041f\u0430\u043a\u0435\u0442\u044b
 GByte=GByte
-#\u5B9A\u65F6\u5668\u53C2\u6570
-interval=\u041F\u0440\u043E\u043C\u0435\u0436\u0443\u0442\u043E\u043A
-month=\u041C\u0435\u0441\u044F\u0446\u044B
-day=\u0414\u043D\u0438
-startTime=\u041D\u0430\u0447\u0430\u0442\u044C
-endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C
-single=\u041E\u0434\u043D\u043E\u043A\u0440\u0430\u0442\u043D\u043E
-everyDay=\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E
-everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E
-everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E
+#\u5b9a\u65f6\u5668\u53c2\u6570
+interval=\u041f\u0440\u043e\u043c\u0435\u0436\u0443\u0442\u043e\u043a
+month=\u041c\u0435\u0441\u044f\u0446\u044b
+day=\u0414\u043d\u0438
+startTime=\u041d\u0430\u0447\u0430\u0442\u044c
+endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
+single=\u041e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e
+everyDay=\u0415\u0436\u0435\u0434\u043d\u0435\u0432\u043d\u043e
+everyWeek=\u0415\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e
+everyMonth=\u0415\u0436\u0435\u043c\u0435\u0441\u044f\u0447\u043d\u043e
 validate_error=Unexpected error occurred while validating
 v4_num=IPv4 Number
 v6_num=IPv6 Number
 on=On
-is_schduler=Scheduler
+is_schduler=Scheduler
+dnsGroup=DNS Group
+urlGroup=Http URL Group
+#add common group
+url_group_manage=URL Group Manage
+url_group_configuration=URL Group Config
+dns_keyword_group_manage=DNS Group Manage
+dns_keyword_group_configuration=DNS Group Config

src/main/resources/messages/message_zh_CN.properties

@@ -231,7 +231,7 @@ delete_failed_admin=\u5220\u9664\u5931\u8d25\uff0c\u7ba1\u7406\u5458\u7528\u6237
 audit_success=\u5ba1\u6838\u6210\u529f
 audit_failed=\u5ba1\u6838\u5931\u8d25
 turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
-login_timeout=\u767B\u5F55\u8D85\u65F6,\u8bf7\u91cd\u65b0\u767b\u5f55\u3002
+login_timeout=\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55\u3002
 captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
 enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
 input=\u8bf7\u8f93\u5165
@@ -1481,16 +1481,23 @@ reedit=\u8bf7\u91cd\u65b0\u7f16\u8f91\uff01
 intercep_domain_required_tip=\u57df\u540d\u4fe1\u606f\u5fc5\u987b\u914d\u7f6e
 packets=packets
 GByte=GByte
-#\u5B9A\u65F6\u5668\u53C2\u6570
-interval=\u95F4\u9694
+#\u5b9a\u65f6\u5668\u53c2\u6570
+interval=\u95f4\u9694
 month=\u6708
-day=\u65E5
-startTime=\u5F00\u59CB\u65F6\u95F4
-endTime=\u7ED3\u675F\u65F6\u95F4
-single=\u5355\u6B21
-everyDay=\u6BCF\u5929
-everyWeek=\u6BCF\u5468
-everyMonth=\u6BCF\u6708
-validate_error=\u9A8C\u8BC1\u65F6\u53D1\u751F\u610F\u5916\u9519\u8BEF
+day=\u65e5
+startTime=\u5f00\u59cb\u65f6\u95f4
+endTime=\u7ed3\u675f\u65f6\u95f4
+single=\u5355\u6b21
+everyDay=\u6bcf\u5929
+everyWeek=\u6bcf\u5468
+everyMonth=\u6bcf\u6708
+validate_error=\u9a8c\u8bc1\u65f6\u53d1\u751f\u610f\u5916\u9519\u8bef
 v4_num=IPv4 Number
-v6_num=IPv6 Number
+v6_num=IPv6 Number
+dnsGroup=DNS \u7ec4
+urlGroup=Http URL \u7ec4
+#\u65b0\u589e\u516c\u5171\u5206\u7ec4
+url_group_manage=URL\u5206\u7ec4\u7ba1\u7406
+url_group_configuration=URL\u5206\u7ec4\u914d\u7f6e
+dns_keyword_group_manage=DNS\u5173\u952e\u5b57\u5206\u7ec4\u7ba1\u7406
+dns_keyword_group_configuration=DNS\u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e

src/main/resources/nis.properties

@@ -270,7 +270,7 @@ mmLogoDetectionLog=v1/mmLogoDetectionLogs
 mmFaceRecognizationLog=v1/mmFaceRecognizationLogs
 ########################################
 #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
-dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/
+dashboardUrl=http://192.168.11.64:8080/galaxy-service/service/log/
 trafficIpActive=v1/trafficIpActive
 trafficProtocol=v1/trafficProtocol
 trafficApp=v1/trafficApp
@@ -620,4 +620,6 @@ ntc_asn_number=NTC_ASN_NUMBER
 addRegionToCommonGroup=v1/addRegionToCommonGroup
 updateRegionToCommonGroup=v1/updateCommonGroupRegion
 deleteRegionToCommonGroup=v1/delCommonGroupRegion
-
+#\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
+trafficAppPpsTrend=v1/trafficAppPpsTrend
+trafficAppBpsTrend=v1/trafficAppBpsTrend

src/main/resources/sql/20190215/add_function_region&service.sql

@@ -0,0 +1,5 @@
+--添加dns和url公共组的function_region和function_service字典
+INSERT INTO `function_region_dict` (`dict_id`, `function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('622', '409', 'QNAME', '2', 'NTC_DNS_REGION', 'DNS域名配置', '1', '1', '3', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '0', '0,1,2,3', '', '0,1,2', '0', '', '', '', '', '', '1', '1');
+INSERT INTO `function_region_dict` (`dict_id`, `function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('623', '111', '', '2', 'NTC_URL_REGION', 'URL公共组域配置', '1', '1', '2', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '0,1', '0,1,2,3', '', '0', '1', NULL, NULL, NULL, NULL, NULL, '2', '1');
+INSERT INTO `function_service_dict` (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES ('164', '409', '0', '0', '', '-2', 'NTC_DNS_REGION', NULL, '1', '1', '2019-02-15 16:48:56', NULL, NULL, '1', '1', '1', NULL);
+INSERT INTO `function_service_dict` (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES ('165', '111', '0', '0', '', '-1', 'NTC_URL_REGION', NULL, '1', '1', '2019-02-15 16:49:49', NULL, NULL, '1', '1', '1', NULL);

src/main/resources/sql/20190215/add_sys_menu.sql

@@ -0,0 +1,7 @@
+--URL DNS COMMONGROUPS
+--<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>->common_group->DNS<EFBFBD>ؼ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>URL<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+--ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-><EFBFBD>߼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>->DNS<EFBFBD>ؼ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>á<EFBFBD>URL<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1250', '717', '0,1,86,717,', 'dns_keyword_group_configuration', 'DNS<EFBFBD>ؼ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', '5090', '/basics/dns/keyword/list', '', '', '1', 'dns:keyword:config', '1', '2019-02-14 15:00:20', '1', '2019-02-14 15:00:20', '', '1', NULL, '0', '0', '409');
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1249', '717', '0,1,86,717,', 'url_group_configuration', 'URL<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', '5060', '/basics/url/list', '', '', '1', 'http:url:config', '1', '2019-02-14 14:57:10', '1', '2019-02-14 14:57:10', '', '1', NULL, '0', '0', '111');
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1248', '1236', '0,1,109,1236,', 'url_group_manage', 'URL<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', '500', '/basics/policyGroup/policyGroupList?groupType=11', '', 'fa fa-globe', '1', '', '1', '2019-02-14 14:27:15', '1', '2019-02-14 14:27:15', '', '1', NULL, '0', '0', NULL);
+INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1247', '1236', '0,1,109,1236,', 'dns_keyword_group_manage', 'DNS<EFBFBD>ؼ<EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', '30', '/basics/policyGroup/policyGroupList?groupType=12', '', 'fa fa-map', '1', '', '1', '2019-02-14 14:14:56', '1', '2019-02-14 14:14:56', '', '1', NULL, '0', '0', NULL);

src/main/resources/sql/20190215/alter_asn_group_info.sql

@@ -0,0 +1 @@
+ALTER TABLE asn_group_info ADD  only_group_id int(11) DEFAULT NULL COMMENT '用于ip地址下发业务';

src/main/resources/sql/20190215/alter_policy_group_info.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `policy_group_info`
+ADD COLUMN `ud_flag`  int(2) NOT NULL DEFAULT 0 COMMENT 'udFlag<EFBFBD>ֶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>url<EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD>dns<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ع<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD> -1ɾ<31><C9BE> 1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ѡ״̬ 0<><30><EFBFBD>ò<EFBFBD><C3B2><EFBFBD>ѡ״̬<D7B4><CCAC>Ĭ<EFBFBD><C4AC>0';

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

@@ -119,13 +119,13 @@
 							</div>
 							<div for="action"></div>
 						</div>
-						<!-- 600 asn ip、 3：IP白名单、 405：APP协议IP、 403：APP域名特征、 563 APP Payload、 565 APP HTTP、 564 APP DNS、 566 APP SSL -->
+						<!-- 111:url公共组域配置 、600 asn ip、 3：IP白名单、 405：APP协议IP、 403：APP域名特征、 563 APP Payload、 565 APP HTTP、 564 APP DNS、 566 APP SSL -->
 						<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 3) || (cfg.functionId eq 405) || (cfg.functionId eq 403) || (cfg.functionId eq 563) || (cfg.functionId eq 565) || (cfg.functionId eq 564) || (cfg.functionId eq 566) ||
-										(cfg.functionId eq 560) }">
+										(cfg.functionId eq 560) || (cfg.functionId eq 111)}">
 							<div class="row hidden requestIdSel">
 						</c:if>
 						<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 3) && (cfg.functionId ne 405) && (cfg.functionId ne 403) && (cfg.functionId ne 563) && (cfg.functionId ne 565) && (cfg.functionId ne 564) && (cfg.functionId ne 566) &&
-										(cfg.functionId ne 560) }">
+										(cfg.functionId ne 560) && (cfg.functionId ne 111) }">
 							<div class="row requestIdSel">
 						</c:if>
 					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
@@ -273,10 +273,10 @@
 							</div>
 						</div>
 				</div>
-				<c:if test="${cfg.functionId eq 600 }">
+				<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 111)}">
 					<div class="modal-footer" style="border-top:0px">
 				</c:if>
-				<c:if test="${cfg.functionId ne 600 }">
+				<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 111)}">
 					<div class="modal-footer">
 				</c:if>
 					<button type="button" class="btn red" onclick="importCfg()">

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

@@ -419,7 +419,7 @@
     <description>根据asnGroupId获取asn 的v4数量和v6数量</description>
     <name>getASNIPNum</name>
     <function-class>com.nis.util.ConfigDictUtils</function-class>
-    <function-signature>java.util.List getASNIPNum(java.lang.Integer)</function-signature>
+    <function-signature>java.util.List getASNIPNum(java.lang.Long)</function-signature>
     <example>${fns:getASNIPNum(str)}</example>
   </function>
 </taglib>

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

@@ -81,7 +81,7 @@ $(function(){
 								        <div class="form-group asnNo">
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="asn_no"/></label>
 								            <div class="col-md-6">
-								                <input id="asnNo" class="form-control required asnNoUnique number" type="text" name="asnId" value="${_cfg.asnId}" autocomplete="off" maxlength="15" ctx="${ctx }">
+								                <input id="asnNo" class="form-control required asnNoUnique number" type="text" name="asnId" value="${_cfg.asnId}" autocomplete="off" maxlength="10" max="4294967295" ctx="${ctx }">
 								            </div>
 								            <div for="asnId"></div>
 							        	</div>

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

@@ -0,0 +1,423 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="dns_keyword_group_configuration"></spring:message></title>
+<script type="text/javascript">
+var defaultStrInfo;
+$(function(){
+	defaultStrInfo=$(".strInfo").clone(true);
+	reSort($(defaultStrInfo),-1);
+	$(".dnsKeywordAdd").click();
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
+});
+//业务窗口打开
+var addContent = function(obj, contentClassName) {
+	var showDiv = $(obj).parent().parent().siblings("."+contentClassName).last();
+	if(showDiv.hasClass("hidden")){
+		$(showDiv).removeClass("hidden").removeClass(
+		"disabled");
+	}else{
+		var additional=defaultStrInfo.clone(true);
+		additional.removeClass("hidden").removeClass(
+		"disabled");
+		showDiv.after(additional);
+	}
+	var index=0;
+	$("."+contentClassName).each(function(){
+		reSort($(this),index);
+		index++;
+	});
+	$(".selectpicker").selectpicker("render");
+	//$(obj).addClass("hidden");
+}
+
+//业务窗口关闭
+var delContent = function(obj,contentClassName) {
+	if($("."+contentClassName).length==1){
+		top.$.jBox.tip("<spring:message code='one_more'/>");
+		return;
+	}
+	$(obj).parents("."+contentClassName).remove();
+	var index=0;
+	$("."+contentClassName).each(function(){
+		reSort($(this),index);
+		index++;
+	});
+}
+var reSort=function(obj,index){
+	$(obj).find("input,select").each(function(){
+		var name=$(this).attr("name");
+		if(name.indexOf("domainList[")>-1){
+			var namePrefix="domainList[";
+			var nameSubfix=name.substring(name.indexOf("]"));
+			var nameNew=namePrefix+index+nameSubfix;
+			if(nameNew!=name){
+				$(this).attr("name",nameNew);
+				$(this).parents(".form-group").find("div[for='"+name+"']").attr("for",nameNew);
+			}
+		}
+	})
+}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<h3 class="page-title">
+		<spring:message code="dns_keyword_group_configuration"></spring:message>
+	</h3>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+                        <spring:message code="add"></spring:message>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/basics/dns/keyword/save" method="post" class="form-horizontal">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                   		<input type="hidden" id="compileId" name="compileId" value="0">
+                   		<input type="hidden" id="requestId" name="requestId" value="0">
+                   		<input type="hidden" id="dnsKeywordGroup" name="dnsKeywordGroup" value="0">
+                   		<c:forEach items="${serviceList}" var="service">
+                   			<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
+                   			<input type="hidden" id="action" name="action" value="${service.action}">
+                   		</c:forEach>
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								     <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dnsGroup"/></label>
+								            <div class="col-md-6">
+								            	 <%-- <select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
+								            	 </select>  --%>
+								            	 <%-- <input class="form-control required digits dnsGroupMustExists" type="text" name="userRegion1" value="${_cfg.userRegion1}" ctx="${ctx}"> --%>
+								            	 <select name="userRegion1" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+								               		<option value=""><spring:message code="select"/></option>
+									               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+									               			<option value="${dnsGroupInfo.serviceGroupId}">${dnsGroupInfo.groupName}</option>
+									               	</c:forEach>
+								               	</select>
+								            </div>
+								            <div for="userRegion1"></div>
+								        </div>
+								    </div>
+								</div>
+							<h4 class="form-section">
+								<spring:message code="dns_keyword_group_configuration" />
+								<small> <span
+									class="glyphicon glyphicon-plus  dnsKeywordAdd"
+									onClick="addContent(this,'strInfo')" title="add"></span></small>
+							</h4>
+                           <div class="row strInfo boxSolid dnsKeyword hidden disabled">
+                           		<div class="row">
+									<div class="pull-right">
+										<span class="glyphicon glyphicon-remove pull-right" title="remove"
+											onClick="delContent(this,'strInfo');" />
+									</div>
+								</div>
+								
+								
+								<c:forEach items="${regionList}" var="region">
+									<input type="hidden" name="domainList[0].configHex" value="${region.configHex }">
+									<c:if test="${!empty region.configDistrict }">
+										<div class="row">
+											<div class="col-md-6">
+												<div class="form-group">
+													<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="district" /></label>
+													<div class="col-md-6">
+														<select name="domainList[0].district"
+															class="selectpicker show-tick form-control required district">
+																<c:forEach items="${fn:split(region.configDistrict,',')}"
+																	var="_district">
+																	<option value="${_district }">${_district}</option>
+																</c:forEach>
+														</select>
+														<input type="hidden" name="domainList[0].districtShowName"  maxlength="64"  placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control invisibleChar" />
+													</div>
+													<div for="domainList[0].districtShowName"></div>
+													<div for="domainList[0].district"></div>
+												</div>
+											</div>
+										</div>
+									</c:if>
+									<div class="row">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="keywords" />
+												</label>
+												
+												<!-- 此配置的关键词可以输入多个关键词 -->
+												<c:if test="${region.configMultiKeywords eq 1}">
+													<div class="col-md-6">
+														<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${tabName}${status.index}"
+															name="domainList[0].cfgKeywords"
+															value="${cfg.cfgKeywords}">
+													</div>
+												</c:if>
+												<!-- 此配置的关键词不允许输入多个关键词 -->
+												<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+													<div class="col-md-6">
+														
+														<input class="form-control required invisibleChar" 
+																type="text"
+															name="domainList[0].cfgKeywords">
+													</div>
+												</c:if>
+												<div for="domainList[0].cfgKeywords"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 exprType">
+											<div class="form-group">
+											
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="expression_type" /></label>
+												<div class="col-md-6">
+													<c:if test="${!empty region.configExprType}">
+														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
+															<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
+																<c:if test="${exprTypeC.itemCode eq exprType}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="domainList[0].exprType" value="${exprType }"
+																			class="required"
+																			<c:if test="${stat.index == 0 }"> checked </c:if>
+																			
+																		> 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+													</c:if>
+													<c:if test="${empty region.configExprType}">
+														<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																<c:if test="${exprTypeC.itemCode eq 0}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="domainList[0].exprType" value="${exprTypeC.itemCode }"
+																			class="required" checked > 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+													</c:if>
+												</div>
+												<div for="domainList[0].exprType"></div>
+												
+											</div>
+										</div>
+									
+										<div class="col-md-6 matchMethod">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="match_method" /></label>
+												<div class="col-md-6">
+													<select name="domainList[0].matchMethod"
+														class="selectpicker select2 form-control required ">
+														<c:if test="${!empty region.configMatchMethod}">
+															<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+																<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																	<c:if test="${matchMethodC.itemCode eq matchMethod}">
+																		<option value="${matchMethodC.itemCode}" 
+																		>
+																		<spring:message code="${matchMethodC.itemValue}"/>
+																		</option>
+																	</c:if>
+																
+																</c:forEach> 
+															</c:forEach>
+														</c:if>
+														<c:if test="${empty region.configMatchMethod}">
+															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																	<c:if test="${matchMethodC.itemCode eq 0}">
+																		<option value="${matchMethodC.itemCode}" 
+																		selected
+																		>
+																		<spring:message code="${matchMethodC.itemValue}"/>
+																		</option>
+																	</c:if>
+																
+																</c:forEach> 
+														</c:if>
+													</select>
+												</div>
+												<div for="domainList[0].matchMethod"></div>
+											</div>
+										</div>
+									</div>
+									
+									<div class="row <c:if test="${fn:length(fn:split(region.configHex,',')) ==1}">hidden</c:if>">
+										<c:if test="${!empty region.configHex}">
+										    <div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+										            <div class="col-md-6">
+										            	<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
+										            	<label class="radio-inline">
+										            		<input type="radio" name="domainList[0].isHex" value="1" class="required"
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="domainList[0].isHex" value="0" class="required"
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="domainList[0].isHex"></div>
+										        </div>
+										    </div>
+										    <div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="domainList[0].isCaseSenstive" value="1" class="required"
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="domainList[0].isCaseSenstive" value="0" class="required"
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="domainList[0].isCaseInsenstive"></div>
+										        </div>
+										    </div>
+									  	</c:if>
+									  	<c:if test="${empty region.configHex}"> 
+											<div class="col-md-6">
+											        <div class="form-group ">
+											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+											            <div class="col-md-6">
+											            	<label class="radio-inline">
+											            		<input type="radio" name="domainList[0].isHex" value="0" class="required" checked
+											            		><spring:message code="not_hex"/>
+											            	</label>
+											            </div>
+											            <div for="domainList[0].isHex"></div>
+											        </div>
+											    </div>
+											    <div class="col-md-6">
+											        <div class="form-group ">
+											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+											            <div class="col-md-6">
+											            	<label class="radio-inline">
+											            		<input type="radio" name="domainList[0].isCaseSenstive" value="0" class="required"
+											            			checked
+											            		><spring:message code="case_insenstive"/>
+											            	</label>
+											            </div>
+											            <div for="domainList[0].isCaseInsenstive"></div>
+											        </div>
+											    </div>
+										</c:if>
+									</div>
+									<div class="row hidden">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="whether_hexbinary" /></label>
+												<div class="col-md-6">
+													<select name="domainList[0].isHexbin"
+														class="selectpicker select2 form-control required">
+														<c:if test="${!empty region.configHex}">
+															<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
+																	<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																		<c:if test="${isHexbinC.itemCode eq isHexbin}">
+																			<option value="${isHexbinC.itemCode}" 
+																			<c:if test="${empty isHexbin && isHexbin eq 0}">
+																			selected
+																			</c:if>
+																			>
+																			<spring:message code="${isHexbinC.itemValue}"/>
+																			</option>
+																		</c:if>
+																	
+																	</c:forEach> 
+															</c:forEach>
+														</c:if>
+														<c:if test="${empty region.configHex}"> 
+														
+															<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																<c:if test="${isHexbinC.itemCode eq 0}">
+																	<option value="${isHexbinC.itemCode}"  selected >
+																	<spring:message code="${isHexbinC.itemValue}"/>
+																	</option>
+																</c:if>
+															</c:forEach> 
+														
+														</c:if>
+													</select>
+												</div>
+												<div for="domainList[0].isHexbin"></div>
+											</div>
+										</div>
+									</div>
+								</c:forEach>
+							</div>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,368 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="dns_keyword_group_configuration"></spring:message></title>
+<script type="text/javascript">
+var defaultStrInfo;
+$(function(){
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
+});
+</script>
+</head>
+<body>
+
+<div class="page-content">
+
+	<h3 class="page-title">
+		<spring:message code="dns_keyword_group_configuration"></spring:message>
+	</h3>
+	
+	
+
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+						<spring:message code="edit"></spring:message>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/basics/dns/keyword/update" method="post" class="form-horizontal">
+                   		<input type="hidden" name="cfgId" value="${cfg.cfgId}">
+                      	<input type="hidden" name="regionId" value="${cfg.regionId}">
+                       	<input type="hidden" name="compileId" value="${cfg.compileId}">
+                       	<input type="hidden" name="functionId" value="${cfg.functionId}">
+                       	<input type="hidden" name="isValid" value="${cfg.isValid}">
+                   		<input type="hidden" name="isAudit" value="${cfg.isAudit}">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${cfg.serviceId}">
+                   		<input type="hidden" id="requestId" name="requestId" value="${cfg.requestId}">
+                   		<input type="hidden" id="dnsKeywordGroup" name="dnsKeywordGroup" value="${cfg.userRegion1}">
+                   		<input type="hidden" id="action" name="action" value="${cfg.action}">
+                   		<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                          <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								     <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dnsGroup"/></label>
+								            <div class="col-md-6">
+								            	 <%-- <select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
+								            	 </select>  --%>
+								            	 <%-- <input class="form-control required digits dnsGroupMustExists" type="text" name="userRegion1" value="${_cfg.userRegion1}" ctx="${ctx}"> --%>
+								            	 <select name="userRegion1" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+								               		<option value=""><spring:message code="select"/></option>
+									               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+									               			<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${cfg.userRegion1 eq dnsGroupInfo.serviceGroupId }">selected</c:if>>${dnsGroupInfo.groupName}</option>
+									               			
+									               	</c:forEach>
+								               	</select>
+								            </div>
+								            <div for="userRegion1"></div>
+								        </div>
+								    </div>
+								</div>
+                           <c:forEach items="${regionList}" var="region">
+									<input type="hidden" name="configHex" value="${region.configHex }">
+									<c:if test="${!empty region.configDistrict }">
+										<div class="row">
+											<div class="col-md-6">
+												<div class="form-group">
+													<label class="control-label col-md-3"><font color="red">*</font>
+														<spring:message code="district" /></label>
+													<div class="col-md-6">
+														<select name="district"
+															class="selectpicker show-tick form-control required district">
+																<c:forEach items="${fn:split(region.configDistrict,',')}"
+																	var="_district">
+																	<option value="${_district }" <c:if test="${cfg.district eq _district}">selected</c:if>>${_district}</option>
+																</c:forEach>
+														</select>
+													</div>
+													<div for="district"></div>
+												</div>
+											</div>
+										</div>
+									</c:if>
+									<div class="row">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="keywords" />
+												</label>
+												
+												<!-- 此配置的关键词可以输入多个关键词 -->
+												<c:if test="${region.configMultiKeywords eq 1}">
+													<div class="col-md-6">
+														<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${tabName}${status.index}"
+															name="cfgKeywords"
+															value="${cfg.cfgKeywords}">
+													</div>
+												</c:if>
+												<!-- 此配置的关键词不允许输入多个关键词 -->
+												<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+													<div class="col-md-6">
+														
+														<input class="form-control required invisibleChar" 
+																type="text"
+															name="cfgKeywords" value="${cfg.cfgKeywords}">
+													</div>
+												</c:if>
+												<div for="cfgKeywords"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row">
+										<div class="col-md-6 exprType">
+											<div class="form-group">
+											
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="expression_type" /></label>
+												<div class="col-md-6">
+													<c:if test="${!empty region.configExprType}">
+														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
+															<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
+																<c:if test="${exprTypeC.itemCode eq exprType}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="exprType" value="${exprType }"
+																			class="required"
+																			<c:if test="${cfg.exprType eq exprType}"> checked </c:if>
+																		> 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+													</c:if>
+													<c:if test="${empty region.configExprType}">
+														<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																<c:if test="${exprTypeC.itemCode eq 0}">
+																	<label class="radio-inline"> 
+																		<input type="radio"
+																			name="exprType" value="${exprTypeC.itemCode }"
+																			class="required" checked > 
+																		<spring:message	code="${exprTypeC.itemValue }" />
+																	</label>
+																</c:if>
+															</c:forEach>
+													</c:if>
+												</div>
+												<div for="exprType"></div>
+												
+											</div>
+										</div>
+									
+										<div class="col-md-6 matchMethod">
+											<div class="form-group ">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="match_method" /></label>
+												<div class="col-md-6">
+													<select name="matchMethod"
+														class="selectpicker select2 form-control required ">
+														<c:if test="${!empty region.configMatchMethod}">
+														<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																<c:if test="${matchMethodC.itemCode eq matchMethod}">
+																	<option value="${matchMethodC.itemCode}" 
+																	<c:if test="${cfg.matchMethod eq matchMethod || (empty cfg.matchMethod && matchMethod eq 0)}">
+																	selected
+																	</c:if>
+																	>
+																	<spring:message code="${matchMethodC.itemValue}"/>
+																	</option>
+																</c:if>
+															
+															</c:forEach> 
+														</c:forEach>
+													</c:if>
+													<c:if test="${empty region.configMatchMethod}">
+														<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																<c:if test="${matchMethodC.itemCode eq 0}">
+																	<option value="${matchMethodC.itemCode}" 
+																	selected
+																	>
+																	<spring:message code="${matchMethodC.itemValue}"/>
+																	</option>
+																</c:if>
+															
+															</c:forEach> 
+													</c:if>
+													</select>
+												</div>
+												<div for="matchMethod"></div>
+											</div>
+										</div>
+									</div>
+									<div class="row <c:if test="${fn:length(fn:split(region.configHex,',')) ==1}">hidden</c:if>">
+										<c:if test="${!empty region.configHex}">
+										    <div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+										            <div class="col-md-6">
+										            	<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="1" class="required" <c:if test="${cfg.isHex eq 1 }">checked</c:if>
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required" <c:if test="${cfg.isHex eq 0 }">checked</c:if>
+										            		><spring:message code="not_hex"/>
+										            	</label>
+										            </div>
+										            <div for="isHex"></div>
+										        </div>
+										    </div>
+										    <div class="col-md-6">
+										        <div class="form-group ">
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+										            <div class="col-md-6">
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="1" class="required" <%-- <c:if test="${cfg.isCaseSenstive eq 1 }">checked</c:if> --%>
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required" <%-- <c:if test="${cfg.isCaseSenstive eq 1 }">checked</c:if> --%>
+										            		><spring:message code="case_insenstive"/>
+										            	</label>
+										            </div>
+										            <div for="isCaseInsenstive"></div>
+										        </div>
+										    </div>
+									  	</c:if>
+									  	<c:if test="${empty region.configHex}"> 
+											<div class="col-md-6">
+											        <div class="form-group ">
+											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
+											            <div class="col-md-6">
+											            	<label class="radio-inline">
+											            		<input type="radio" name="isHex" value="0" class="required" checked
+											            		><spring:message code="not_hex"/>
+											            	</label>
+											            </div>
+											            <div for="isHex"></div>
+											        </div>
+											    </div>
+											    <div class="col-md-6">
+											        <div class="form-group ">
+											            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
+											            <div class="col-md-6">
+											            	<label class="radio-inline">
+											            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+											            			checked
+											            		><spring:message code="case_insenstive"/>
+											            	</label>
+											            </div>
+											            <div for="isCaseInsenstive"></div>
+											        </div>
+											    </div>
+										</c:if>
+									</div>
+									<div class="row hidden">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><font color="red">*</font>
+													<spring:message code="whether_hexbinary" /></label>
+												<div class="col-md-6">
+													<select name="isHexbin"
+														class="selectpicker select2 form-control required">
+														<c:if test="${!empty region.configHex}">
+															<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
+																	<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																		<c:if test="${isHexbinC.itemCode eq isHexbin}">
+																			<option value="${isHexbinC.itemCode}" 
+																			<c:if test="${cfg.isHexbin eq isHexbin || (empty isHexbin && isHexbin eq 0)}">
+																			selected
+																			</c:if>
+																			>
+																			<spring:message code="${isHexbinC.itemValue}"/>
+																			</option>
+																		</c:if>
+																	
+																	</c:forEach> 
+															</c:forEach>
+														</c:if>
+														<c:if test="${empty region.configHex}"> 
+														
+															<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+																<c:if test="${isHexbinC.itemCode eq 0}">
+																	<option value="${isHexbinC.itemCode}"  selected >
+																	<spring:message code="${isHexbinC.itemValue}"/>
+																	</option>
+																</c:if>
+															</c:forEach> 
+														
+														</c:if>
+													</select>
+												</div>
+												<div for="isHexbin"></div>
+											</div>
+										</div>
+									</div>
+								</c:forEach>
+                           <%--  <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> --%>
+                          </div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+
+
+
+
+</body>
+</html>

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

@@ -0,0 +1,306 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="asn_ip_configuration"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+ 		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.cfgKeywords}"){
+			$("#intype").val("${cfg.cfgKeywords}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#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');
+ 		if(cked.val()==1){
+ 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 		if(cked.length==1){
+ 			window.location = url+"&compileId="+cked.attr("id");
+ 		}else{
+ 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 	}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+			<shiro:hasPermission name="dns:keyword:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/basics/dns/keyword/addForm?functionId=${cfg.functionId}'">
+				<i class="fa fa-plus"></i>
+				<spring:message code="add"></spring:message></button>
+				<c:set var="regionImport" value="false"></c:set>
+				<c:forEach items="${regionList}" var="region" >
+					<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
+						<c:set var="regionImport" value="true"></c:set>
+					</c:if>
+				</c:forEach>
+				<c:if test="${regionImport eq 'true'}">
+					<button type="button" class="btn btn-primary import hidden" >
+						<i class="fa fa-plus"></i>
+					<spring:message code="import"></spring:message></button>
+				</c:if>
+			</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+	<spring:message code="dns_keyword_group_configuration"></spring:message>
+		<%-- <small><spring:message code="date_list"/></small> --%>
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/dns/keyword/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}"
+						callback="page();" />
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<div class="pull-left">
+									 <c:set var="state"><spring:message code='group'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="all_states"/></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
+									</form:select> 
+								</div>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
+												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
+												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
+											</form:select>
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+                                  		 	<form:select path="isValid" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<form:option value="1"><spring:message code="yes"/></form:option>
+													<form:option value="0"><spring:message code="no"/></form:option>
+											 </form:select>
+                                  		 </div>
+                                    </div> 
+								</div>
+								<div class="pull-left">
+									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+							 		<shiro:hasPermission name="dns:keyword:config">
+							 			<sys:delRow url="${ctx}/basics/dns/keyword/updateForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/basics/dns/keyword/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                                    
+                                    <div class="btn-group hidden">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right"  style="min-width: 110px;" >
+	                                            <li><sys:delRow url="${ctx}/basics/dns/keyword/exportAsnIp?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/basics/dns/keyword/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
+ 												<li><sys:delRow url="${ctx}/basics/dns/keyword/exportAsnIp?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/basics/dns/keyword/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
+				                            </ul>
+				                 	</div>
+                                    
+							 		<shiro:hasPermission name="dns:keyword:config">
+	                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/basics/dns/keyword/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/dns/keyword/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/dns/keyword/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+				                            </ul>
+				                         </div>
+                                   </shiro:hasPermission>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                 </div>
+							</div>
+							<!-- /搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+								</div>
+								
+							
+							</div> 
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<sys:message content="${message}" type="${messageType }"/>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th column="config_describe" ><spring:message code="config_describe"/></th>
+									<th column="keywords" ><spring:message code="keywords"/></th>
+									<th class="sort-column r.user_region1" column="userregion1" ><spring:message code="dnsGroup"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th column="creator" ><spring:message code="creator"/></th>
+									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th column="editor" ><spring:message code="editor"/></th>
+									<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
+									<tr>
+									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
+									<td>${cfg.cfgDesc }</td>
+									<td>${cfg.cfgKeywords }</td>
+									<td>
+									${cfg.dnsGroupName}
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+											
+										</c:choose>
+									</td>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
+<c:set var="importPath" value="/basics/dns/keyword/list?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
+</body>
+</html>

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

@@ -123,6 +123,12 @@
 		<c:if test="${cfg.groupType==6}">
 		<spring:message code="ip_spoofing_group_manage"/>
 		</c:if>
+		<c:if test="${cfg.groupType==12}">
+		<spring:message code="dns_keyword_group_manage"/>
+		</c:if>
+		<c:if test="${cfg.groupType==11}">
+		<spring:message code="url_group_manage"/>
+		</c:if>
 		<%-- <spring:message code="policy_group_manage"/> --%>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -258,7 +264,9 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="group_name" ><spring:message code="group_name"/></th>
-									<th column="group_type" ><spring:message code="group_type"/></th>
+									<c:if test="${cfg.groupType!=12&&cfg.groupType!=11}">
+										<th column="group_type" ><spring:message code="group_type"/></th>
+									</c:if>
 									<%-- <c:if test="${cfg.groupType==4}">
 										<th column="asn_no" ><spring:message code="asn_no"/></th>
 									</c:if> --%>
@@ -282,20 +290,22 @@
 											${fns:abbr(cfg.groupName,20)}
 										</a>
 									</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.groupType==6 }">
-												<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:when>
-											<c:otherwise>
-												<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:otherwise>
-										</c:choose>
-									</td>
+									<c:if test="${cfg.groupType!=12&&cfg.groupType!=11}">
+										<td>
+											<c:choose>
+												<c:when test="${cfg.groupType==6 }">
+													<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
+														<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
+							               			</c:forEach>
+												</c:when>
+												<c:otherwise>
+													<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
+														<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
+							               			</c:forEach>
+												</c:otherwise>
+											</c:choose>
+										</td>
+									</c:if>
 									<%-- <c:if test="${cfg.groupType==4}">
 									<td>${cfg.asnNo}</td>
 									</c:if> --%>

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

@@ -0,0 +1,451 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="url_group_configuration"></spring:message></title>
+<script type="text/javascript">
+var defaultIpInfo;
+var protectedList = [".com"];
+$(function(){
+	
+	defaultIpInfo=$(".strInfo").clone(true);
+	
+//	reSort($(defaultIpInfo),-1);
+	$(".asnIpAdd").click();
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			if($(element).parents().hasClass("tagsinput")){
+				$(element).parents(".col-md-6").next("div").append(error);
+			}else{
+				$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+			}
+		},
+		submitHandler: function(form){
+			/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
+			$("[name='detail']").val($("[name='userRegion1']  option:selected").attr("detail"));
+			$("[name='asnIpGroup']").val($("[name='userRegion1']  option:selected").attr("asnIpGroup")); */
+			var flag = true;
+			/* $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
+				if($(this).val()==''){
+					$(this).parents(".form-group").find(
+							"div[for='"
+									+ $(this).attr("name")
+									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
+					flag = false;
+				}
+			}); */
+			$(".tagsinput:visible").each(function(){
+				var text='';
+				$(this).find(".tag").each(function(){
+					text+=$(this).children("span").text().trim();
+				});
+				if(text.length < 4  || text.length > 1024){
+					$(this).parents(".col-md-6").next("div").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.keywordLength+"</label>");
+					if(flag){
+						flag=false;
+					}
+				}
+			});
+			if(flag){
+				loading('onloading...');
+				form.submit();
+			}else{
+				return;
+			}
+		},
+		errorContainer: "#messageBox",
+	});
+
+	
+});
+//业务窗口打开
+var addContent = function(obj, contentClassName) {
+	var showDiv = $(obj).parent().parent().siblings("."+contentClassName).last();
+	if(showDiv.hasClass("hidden")){
+		$(showDiv).removeClass("hidden").removeClass(
+		"disabled");
+	}else{
+		var additional=defaultIpInfo.clone();
+		additional.removeClass("hidden").removeClass(
+		"disabled");
+		showDiv.after(additional);
+	}
+	var index=0;
+	$("."+contentClassName).each(function(){
+		reSort($(this),index);
+//		$(".tags").attr("id","tags_"+index);
+		$("input[name='urlCommGroupList["+index+"].cfgKeywords']").attr("id","tags_"+index);
+		index++;
+	});
+	$(".selectpicker").selectpicker("render");
+	
+	 var flag1=0;
+ 	$(".tagsinput").each(function(){
+		$(this).attr("id","tags_"+flag1+"_tagsinput");
+		if(flag1>0 && flag1==($(".tagsinput").length-1)){
+			$("#tags_"+flag1+"_tagsinput").remove();
+			inputToDiv();
+		}
+		flag1++;
+	});   
+}
+
+//业务窗口关闭
+var delContent = function(obj,contentClassName) {
+	if($("."+contentClassName).length==1){
+		top.$.jBox.tip("<spring:message code='one_more'/>");
+		return;
+	}
+	$(obj).parents("."+contentClassName).remove();
+	var index=0;
+	$("."+contentClassName).each(function(){
+		reSort($(this),index);
+		index++;
+	});
+	
+}
+var reSort=function(obj,index){
+	$(obj).find("input,select").each(function(){
+		var name=$(this).attr("name");
+		if(name != undefined){
+			if(name.indexOf("urlCommGroupList[")>-1){
+				var namePrefix="urlCommGroupList[";
+				var nameSubfix=name.substring(name.indexOf("]"));
+				var nameNew=namePrefix+index+nameSubfix;
+//				$(".tags").attr("id","tags_"+index);
+				if(nameNew!=name){
+					$(this).attr("name",nameNew);
+					$(this).parents(".form-group").find("div[for='"+name+"']").attr("for",nameNew);
+				}
+			}
+		}
+		
+	});
+}
+//input框标签化方法
+function inputToDiv(){
+	
+	var tagsInputSettings1="#tags";
+	var options;
+	var flag2=0;
+	$("input[name$='cfgKeywords']").each(function(){
+		var tagsId = $(this).attr("id");
+		var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];	
+		var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理
+		if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){
+			// 表达式类型初始
+			if($("input:radio[name='"+objNamePrefix+"exprType'][checked=checked]").val()==1){
+				options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]");
+				$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
+			}else{
+				options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]");
+			}
+			//表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中
+			if($("select[name='"+objNamePrefix+"district']").val()!="Payload"){//如果是app 的payload特征，可选择表达式
+				$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
+			}
+			
+			if(tagsId !="tags_0" && flag2>0 && flag2==($("input[name$='cfgKeywords']").length-1)){
+				tagsInputSettings1 = tagsInputSettings1+",#"+tagsId;
+			}
+			flag2++;
+		}
+		
+	});
+	$(tagsInputSettings1).tagsInput({
+   	   width:$(tagsInputSettings1).find(".form-control").width(),
+   	   defaultText:'please input keywords',
+   	   'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词
+   	   maxCount:4,
+   	   onAddTag:function(tag,size){
+	   		var reg = new RegExp(/\t|\r|\n/);
+			/* if (tag.match(reg)) {
+				$(this).parent(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
+			}else{
+				$(this).parent(".col-md-6").next("div").html("");
+			} */
+			//var keywordValue = "";
+   		   	var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
+				/*$("span[class='tag']").each(function(){
+					keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
+				});
+				$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
+   		   exprTypeChecked(objNamePrefix,size,options);
+   		    if($(this).hasClass("urlCheck")){
+   			   protectedListWarn($("#"+$(this).attr("id")+"_tagsinput"),$(this).val(),protectedList);
+   		   }  
+   	   },
+   	   onRemoveTag:function(tag,size){
+   		  // $(this).parent(".col-md-6").next("div").html("");
+   		   //var keywordValue = "";
+   		   var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
+	   		/*$("span[class='tag']").each(function(){
+				keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
+			});
+			$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
+   		    exprTypeChecked(objNamePrefix,size,options);
+   		     if($(this).hasClass("urlCheck")){
+ 			   protectedListWarn($("#"+$(this).attr("id")+"_tagsinput"),$(this).val(),protectedList);
+ 		   }  
+   	   }
+   });
+   $(".tagsinput").popover({
+		animation:true,
+		container:'body',
+		placement:'right',
+		html:true,
+		trigger:"hover",
+		title:"",
+		content:function(){
+			var content = $("#tagsinputTip").text();
+		    return content;
+		}
+	});
+
+}
+
+</script>
+</head>
+<body>
+<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
+<div class="page-content">
+
+	<h3 class="page-title">
+		<spring:message code="url_group_configuration"></spring:message>
+	</h3>
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+                        <spring:message code="add"></spring:message>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/basics/url/save" method="post" class="form-horizontal">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                   		<input type="hidden" id="compileId" name="compileId" value="0">
+                   		<input type="hidden" id="requestId" name="requestId" value="0">
+                   		<input type="hidden" id="asnIpGroup" name="asnIpGroup" value="0">
+                   		<c:forEach items="${serviceList}" var="service">
+                   			<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
+                   			<input type="hidden" id="action" name="action" value="${service.action}">
+                   		</c:forEach>
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode" 
+                   				 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+                   				value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                        <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								    
+								     <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
+									            <div class="col-md-6">
+									            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
+									            	 <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+										               		<option value=""><spring:message code="select"/></option>
+										               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
+										               			<option value="${urlGroupInfo.serviceGroupId}">${urlGroupInfo.groupName}</option>
+										               	</c:forEach>
+										               </select>
+									            </div>
+									            <div for="userRegion3"></div>
+								        </div>
+								    </div>
+								</div>
+								
+							<!-- desc and action -->
+							<h4 class="form-section">
+								<spring:message code="http_url_title" />
+								<small> <span
+									class="glyphicon glyphicon-plus  asnIpAdd"
+									onClick="addContent(this,'strInfo')" title="add"></span></small>
+							</h4>
+                           <div class="row strInfo boxSolid asnIp hidden disabled">
+                           		<!-- <input type="hidden" name="asnIpCfgs[0].protocolId" value="0"> -->
+                           		<div class="row">
+									<div class="pull-right">
+										<span class="glyphicon glyphicon-remove pull-right" title="remove"
+											onClick="delContent(this,'strInfo');" />
+									</div>
+								</div>
+								
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+													<%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
+													<%-- <input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }"> --%>
+													
+														<div class="row">
+														    <div class="col-md-6">
+																<div class="form-group">
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																			<spring:message code="keywords" />
+																	</label>
+																			<!-- 此配置的关键词可以输入多个关键词 -->
+																			<c:if test="${region.configMultiKeywords eq 1}">
+																				<div class="col-md-6">
+																					<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${status.index}"
+																						name="urlCommGroupList[-1].cfgKeywords"
+																						>
+																				</div>
+																			</c:if>
+																			<!-- 此配置的关键词不允许输入多个关键词 -->
+																			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+																				<div class="col-md-6">
+																					<input class="form-control required invisibleChar
+																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
+																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>
+																						" 
+																							type="text"
+																						name="urlCommGroupList[-1].cfgKeywords"
+																						>
+																				</div>
+																			</c:if>
+																			<div for="urlCommGroupList[-1].cfgKeywords"></div>
+																		</div>
+																</div>
+														</div>
+														<div class="row">
+															<div class="col-md-6 exprType">
+																<div class="form-group">
+																
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																		<spring:message code="expression_type" /></label>
+																	<div class="col-md-6">
+																		<c:if test="${!empty region.configExprType}">
+																			<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
+																				<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
+																					<c:if test="${exprTypeC.itemCode eq exprType}">
+																						<label class="radio-inline"> 
+																							<input type="radio"
+																								name="urlCommGroupList[-1].exprType" value="${exprType }"
+																								class="required"
+																								<c:if test="${stat.index == 0 }"> checked </c:if>
+																								
+																							> 
+																							<spring:message	code="${exprTypeC.itemValue }" />
+																						</label>
+																					</c:if>
+																				</c:forEach>
+																			</c:forEach>
+																		</c:if>
+																		<c:if test="${empty region.configExprType}">
+																			<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																					<c:if test="${exprTypeC.itemCode eq 0}">
+																						<label class="radio-inline"> 
+																							<input type="radio"
+																								name="urlCommGroupList[-1].exprType" value="${exprTypeC.itemCode }"
+																								class="required" checked > 
+																							<spring:message	code="${exprTypeC.itemValue }" />
+																						</label>
+																					</c:if>
+																				</c:forEach>
+																		</c:if>
+																	</div>
+																	<div for="urlCommGroupList[-1].exprType"></div>
+																	
+																</div>
+															</div>
+														
+															<div class="col-md-6 matchMethod">
+																<div class="form-group ">
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																		<spring:message code="match_method" /></label>
+																	<div class="col-md-6">
+																		<select name="urlCommGroupList[-1].matchMethod"
+																			class="selectpicker select2 form-control required ">
+																			<c:if test="${!empty region.configMatchMethod}">
+																				<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+																					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																						<c:if test="${matchMethodC.itemCode eq matchMethod}">
+																							<option value="${matchMethodC.itemCode}" 
+																							>
+																							<spring:message code="${matchMethodC.itemValue}"/>
+																							</option>
+																						</c:if>
+																					
+																					</c:forEach> 
+																				</c:forEach>
+																			</c:if>
+																			<c:if test="${empty region.configMatchMethod}">
+																				<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																						<c:if test="${matchMethodC.itemCode eq 0}">
+																							<option value="${matchMethodC.itemCode}" 
+																							selected
+																							>
+																							<spring:message code="${matchMethodC.itemValue}"/>
+																							</option>
+																						</c:if>
+																					
+																					</c:forEach> 
+																			</c:if>
+																		</select>
+																	</div>
+																	<div for="urlCommGroupList[-1].matchMethod"></div>
+																</div>
+															</div>
+														</div>
+														
+														
+												</c:forEach>	
+									</div>
+								
+							</div>
+								
+								<%-- <div class="row">
+									<button type="button" class="btn btn-red-hollow center-block"
+										onClick="more(this);" data-click-times="0">
+										<spring:message code="show_more" />
+									</button>
+								</div> --%>
+							
+                         
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,299 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="url_group_configuration"></spring:message></title>
+<script type="text/javascript">
+$(function(){
+	
+	$("#cfgFrom").validate({
+		errorPlacement: function(error,element){
+			if($(element).parents().hasClass("tagsinput")){
+				$(element).parents(".col-md-6").next("div").append(error);
+			}else{
+				$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+			}
+		},
+		submitHandler: function(form){
+			/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
+			$("[name='detail']").val($("[name='userRegion1']  option:selected").attr("detail"));
+			$("[name='asnIpGroup']").val($("[name='userRegion1']  option:selected").attr("asnIpGroup")); */
+			var flag = true;
+			/* $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
+				if($(this).val()==''){
+					$(this).parents(".form-group").find(
+							"div[for='"
+									+ $(this).attr("name")
+									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
+					flag = false;
+				}
+			}); */
+			$(".tagsinput:visible").each(function(){
+				var text='';
+				$(this).find(".tag").each(function(){
+					text+=$(this).children("span").text().trim();
+				});
+				if(text.length < 4  || text.length > 1024){
+					$(this).parents(".col-md-6").next("div").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.keywordLength+"</label>");
+					if(flag){
+						flag=false;
+					}
+				}
+			});
+			if(flag){
+				loading('onloading...');
+				form.submit();
+			}else{
+				return;
+			}
+			
+		},
+		errorContainer: "#messageBox",
+	});
+
+});
+</script>
+</head>
+<body>
+<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
+<div class="page-content">
+
+	<h3 class="page-title">
+		<spring:message code="url_group_configuration"></spring:message>
+	</h3>
+	
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+                  <div class="portlet-title">
+                     <div class="caption">
+                         <i class="fa fa-gift"></i>
+						<spring:message code="edit"></spring:message>
+					</div>
+                  </div>
+                  <div class="portlet-body form">
+                      <!-- BEGIN FORM-->
+                      <form id="cfgFrom" action="${ctx}/basics/url/update" method="post" class="form-horizontal">
+                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+                      	<input type="hidden" name="regionId" value="${_cfg.regionId}">
+                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
+                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
+                       	<input type="hidden" name="isValid" value="${_cfg.isValid}">
+                   		<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
+                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
+                   		<input type="hidden" id="requestId" name="requestId" value="${_cfg.requestId}">
+                   		<%-- <input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
+                   		<input type="hidden" id="asnIpGroup" name="asnIpGroup" value="${_cfg.asnIpGroup}"> --%>
+                       	<!-- 配置域类型 -->
+                   		<c:forEach items="${regionList}" var="region">
+                   			<c:if test="${_cfg.functionId eq region.functionId}">
+                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
+                   				<input type="hidden" name="cfgRegionCode"
+                   				 isMaat="${region.isMaat}"
+						   		 serviceType="${region.configServiceType}"
+						   		 ipPortShow="${region.configIpPortShow}"
+						   		 ipType="${region.configIpType}"
+						   		 ipPattern="${region.configIpPattern}"
+						   		 portPattern="${region.configPortPattern}"
+						   		 direction="${region.configDirection}"
+						   		 protocol="${region.configProtocol}"
+						   		 regionType="${region.regionType}"
+                   				 value="${region.configRegionCode}">
+                   			</c:if>
+                   		</c:forEach>
+                           <div class="form-body">
+                          <!-- desc and action -->
+                              <div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
+								            <div class="col-md-6">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								            </div>
+								        </div>
+								    </div>
+								    
+								     <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
+									            <div class="col-md-6">
+									            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
+									            	 <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+										               		<option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
+										               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
+										               			<option value="${urlGroupInfo.serviceGroupId}"
+										               				<c:if test="${_cfg.userRegion3 eq urlGroupInfo.serviceGroupId }">
+																	selected
+																	</c:if>
+										               			>${urlGroupInfo.groupName}</option>
+										               	</c:forEach>
+										               </select>
+									            </div>
+									            <div for="userRegion3"></div>
+								        </div>
+								    </div>
+								</div>
+								
+							<!-- desc and action -->
+							<h4 class="form-section">
+								<spring:message code="http_url_title" />
+								<!-- <small> <span
+									class="glyphicon glyphicon-plus  asnIpAdd"
+									onClick="addContent(this,'strInfo')" title="add"></span></small> -->
+							</h4>
+                           <!-- <div class="row strInfo boxSolid asnIp hidden disabled"> -->
+                           		<!-- <input type="hidden" name="asnIpCfgs[0].protocolId" value="0"> -->
+                           		<!-- <div class="row">
+									<div class="pull-right">
+										<span class="glyphicon glyphicon-remove pull-right" title="remove"
+											onClick="delContent(this,'strInfo');" />
+									</div>
+								</div> -->
+							<div class=" boxSolid ">
+								<div class="row" style="height: 15px;"></div>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+													<%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
+													<%-- <input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }"> --%>
+													
+														<div class="row">
+														    <div class="col-md-6">
+																<div class="form-group">
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																			<spring:message code="keywords" />
+																	</label>
+																			<!-- 此配置的关键词可以输入多个关键词 -->
+																			<c:if test="${region.configMultiKeywords eq 1}">
+																				<div class="col-md-6">
+																					<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${tabName}${status.index}"
+																						name="cfgKeywords"
+																						value="${_cfg.cfgKeywords}">
+																				</div>
+																			</c:if>
+																			<!-- 此配置的关键词不允许输入多个关键词 -->
+																			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
+																				<div class="col-md-6">
+																					<input class="form-control required invisibleChar
+																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
+																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>
+																						" 
+																							type="text"
+																						name="cfgKeywords"
+																						value="${_cfg.cfgKeywords}">
+																				</div>
+																			</c:if>
+																			<div for="cfgKeywords"></div>
+																		</div>
+																</div>
+														</div>
+														<div class="row">
+															<div class="col-md-6 exprType">
+																<div class="form-group">
+																
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																		<spring:message code="expression_type" /></label>
+																	<div class="col-md-6">
+																		<c:if test="${!empty region.configExprType}">
+																			<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
+																				<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
+																					<c:if test="${exprTypeC.itemCode eq exprType}">
+																						<label class="radio-inline"> 
+																							<input type="radio"
+																								name="exprType" value="${exprType }"
+																								class="required"
+																								<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
+																								<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
+																									checked
+																								</c:if>
+																							> 
+																							<spring:message	code="${exprTypeC.itemValue }" />
+																						</label>
+																					</c:if>
+																				</c:forEach>
+																			</c:forEach>
+																		</c:if>
+																		<c:if test="${empty region.configExprType}">
+																			<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+																					<c:if test="${exprTypeC.itemCode eq 0}">
+																						<label class="radio-inline"> 
+																							<input type="radio"
+																								name="exprType" value="${exprTypeC.itemCode }"
+																								class="required" checked > 
+																							<spring:message	code="${exprTypeC.itemValue }" />
+																						</label>
+																					</c:if>
+																				</c:forEach>
+																		</c:if>
+																	</div>
+																	<div for="exprType"></div>
+																	
+																</div>
+															</div>
+														
+															<div class="col-md-6 matchMethod">
+																<div class="form-group ">
+																	<label class="control-label col-md-3"><font color="red">*</font>
+																		<spring:message code="match_method" /></label>
+																	<div class="col-md-6">
+																		<select name="matchMethod"
+																			class="selectpicker select2 form-control required ">
+																			<c:if test="${!empty region.configMatchMethod}">
+																				<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
+																					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																						<c:if test="${matchMethodC.itemCode eq matchMethod}">
+																							<option value="${matchMethodC.itemCode}" 
+																							>
+																							<spring:message code="${matchMethodC.itemValue}"/>
+																							</option>
+																						</c:if>
+																					
+																					</c:forEach> 
+																				</c:forEach>
+																			</c:if>
+																			<c:if test="${empty region.configMatchMethod}">
+																				<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+																						<c:if test="${matchMethodC.itemCode eq 0}">
+																							<option value="${matchMethodC.itemCode}" 
+																							selected
+																							>
+																							<spring:message code="${matchMethodC.itemValue}"/>
+																							</option>
+																						</c:if>
+																					
+																					</c:forEach> 
+																			</c:if>
+																		</select>
+																	</div>
+																	<div for="matchMethod"></div>
+																</div>
+															</div>
+														</div>
+														
+														
+												</c:forEach>	
+									</div>
+								
+							</div>
+                          <div class="form-actions">
+                              <div class="row">
+                                  <div class="col-md-6">
+                                      <div class="row">
+                                          <div class="col-md-offset-3 col-md-8">
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
+                                          </div>
+                                      </div>
+                                  </div>
+                                  <div class="col-md-6"> </div>
+                              </div>
+                          </div>
+                      </form>
+                      <!-- END FORM-->
+                  </div>
+              </div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,313 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="url_group_configuration"></spring:message></title>
+<script>
+ 	$(document).ready(function() {
+ 		//搜索框提示语初始化
+ 		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
+		}else if("${cfg.cfgKeywords}"){
+			$("#intype").val("${cfg.cfgKeywords}");
+		}else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#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');
+ 		if(cked.val()==1){
+ 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 		if(cked.length==1){
+ 			window.location = url+"&compileId="+cked.attr("id");
+ 		}else{
+ 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+ 			return;
+ 		}
+ 	}
+</script>
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+			<shiro:hasPermission name="asn:ip:config">
+				<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/basics/url/addForm?functionId=${cfg.functionId}'">
+				<i class="fa fa-plus"></i>
+				<spring:message code="add"></spring:message></button>
+				
+					<button type="button" class="btn btn-primary import" >
+						<i class="fa fa-plus"></i>
+					<spring:message code="import"></spring:message></button>
+				
+			</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<spring:message code="url_group_configuration"></spring:message> 
+		
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/url/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}"
+						callback="page();" />
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+								<%-- <div class="pull-left">
+                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+                       				 	<form:option value=""><spring:message code='asn_ip_group'/></form:option>
+                       				 	<c:forEach items="${policyGroups}" var="policyGroup">
+                       				 	<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
+                       				 	</c:forEach>
+                       				 </form:select>
+	                       		</div> --%>
+								<div class="pull-left">
+									 <c:set var="state"><spring:message code='group'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="all_states"/></form:option>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
+									</form:select> 
+								</div>
+								
+								<div class="pull-left">
+								
+									<div class="input-group">
+                                         <div class="input-group-btn">
+                                         
+                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
+												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="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>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  		 <div class="input-group-btn">
+                                  		 	<form:select path="isValid" class="selectpicker select2 input-small" >
+													<form:option value=""><spring:message code="select"/></form:option>
+													<form:option value="1"><spring:message code="yes"/></form:option>
+													<form:option value="0"><spring:message code="no"/></form:option>
+											 </form:select>
+                                  		 </div>
+                                    </div> 
+								</div>
+								<div class="pull-left">
+									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+							 		<shiro:hasPermission name="asn:ip:config">
+							 			<sys:delRow url="${ctx}/basics/url/updateForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/basics/url/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                                    
+                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right"  style="min-width: 110px;" >
+	                                            <li><sys:delRow url="${ctx}/basics/url/exportUrlComm?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/basics/url/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
+ 												<li><sys:delRow url="${ctx}/basics/url/exportUrlComm?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/basics/url/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
+				                            </ul>
+				                 	</div>
+                                    
+                                    
+							 		<shiro:hasPermission name="asn:ip:confirm">
+	                                    <div class="btn-group">
+	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+	                                            <i class="fa fa-angle-down"></i>
+	                                        </button>
+	                                        <ul class="dropdown-menu pull-right">
+	                                            <li><sys:delRow url="${ctx}/basics/url/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+				                            </ul>
+				                         </div>
+                                   </shiro:hasPermission>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
+                                 </div>
+							</div>
+							<!-- /搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="config_time"/>：</label>
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="edit_time"/>：</label>
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="audit_time"/>：</label>
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+									
+									<div class="col-md-2">
+										<div class="form-group">
+											<label>&nbsp;</label>
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										
+										</div>
+									</div>
+								</div>
+								
+							
+							</div> 
+							
+							<!-- /筛选搜索内容栏    结束-->
+						</form:form>
+					</div>
+					<sys:message content="${message}" type="${messageType }"/>
+					<div class="table-responsive">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th class="sort-column r.compile_id" style="display: none;"  column="cfg_id" ><spring:message code="cfg_id"/></th>
+									
+									<th column="config_describe" ><spring:message code="config_describe"/></th>
+									<th class="sort-column cfg_keywords">URL<spring:message code="key_word"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th column="sort-column group_name" ><spring:message code="group_name"/></th>
+									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
+									<th column="creator" ><spring:message code="creator"/></th>
+									<th column="config_time"  class="sort-column create_time"><spring:message code="config_time"/></th>
+									<th column="editor" ><spring:message code="editor"/></th>
+									<th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
+									<th column="auditor"><spring:message code="auditor"/></th>
+									<th class="sort-column audit_time"><spring:message code="audit_time"/></th>
+									
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
+									<tr>
+									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
+									<td>${cfg.cfgDesc }</td>
+									<td>${cfg.cfgKeywords }</td>
+									<td>
+										<c:choose>
+											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td>${cfg.groupName }</td>
+									<td>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>${cfg.creatorName }</td>
+									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.editorName }</td>
+									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${cfg.auditorName }</td>
+									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
+<c:set var="importPath" value="/basics/url/list?functionId=${cfg.functionId}"/>
+<!-- 模板导入，start -->
+<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
+</body>
+</html>

src/main/webapp/WEB-INF/views/cfg/asnForm.jsp

@@ -26,6 +26,8 @@
 <input type="hidden" name="${cfgName}.userRegion2" value="">
 <!-- asn no组织的groupId 【界面每次校验的时候填写】-->
 <input type="hidden" name="${cfgName}.userRegion3" value="">
+<!--ip地址 asn no组号的groupId -->
+<input type="hidden" name="${cfgName}.userRegion5" value="">
 <!-- 是否自动更新ASN NO -->
 <input type="hidden" name="${cfgName}.userRegion4" value="${cfg.userRegion4}">
 <%-- <div class="hidden" id="selectAll"><spring:message code="select_All_Text"/></div>

src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp

@@ -0,0 +1,66 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title></title>
+</head>
+<div class="row">
+	<div class="pull-right">
+		<span class="glyphicon glyphicon-remove pull-right" title="remove"
+			onClick="delContent('dnsGroup0','dnsGroupAdd');" />
+	</div>
+</div>
+<br>
+<%-- <input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
+<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
+<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
+<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
+<input type="hidden" name="${cfgName}.exprType" value="0">
+<input type="hidden" name="${cfgName}.machMethod" value="3">
+<input type="hidden" name="${cfgName}.isHexbin" value="0">
+<input type="hidden" name="${cfgName}.cfgId" value="${cfg.cfgId}">
+<!-- asn no regionId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion1" value="">
+<!-- asn no的组号groupId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion2" value="">
+<!-- asn no组织的groupId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion3" value="">
+<!-- 是否自动更新ASN NO -->
+<input type="hidden" name="${cfgName}.userRegion4" value="${cfg.userRegion4}"> --%>
+<%-- <div class="hidden" id="selectAll"><spring:message code="select_All_Text"/></div>
+<div class="hidden" id="deselectAll"><spring:message code="deselect_All_Text"/></div>
+<input type="hidden" name="${cfgName}.organizationGroupId" value="${cfg.userRegion1}">
+<input type="hidden" name="${cfgName}.asnNo" value="${cfg.cfgKeywords}" used="false"> --%>
+
+<div class="row">
+	<%-- <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
+	            <div class="col-md-6">
+	            	<select name="${cfgName}.userRegion1" class="selectpicker show-tick form-control required organization" data-live-search="true" data-live-search-placeholder="search">
+	            		<option value=""><spring:message code="select"/></option>
+	                </select>
+	            </div>
+	            <div for="${cfgName}.userRegion1"></div>
+        </div>
+    </div> --%>
+    <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dnsGroup"/></label>
+	            <div class="col-md-6">
+	            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
+	            	 <select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+		               		<option value=""><spring:message code="select"/></option>
+		               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}">selected</c:if>>${dnsGroupInfo.groupName}</option>
+		               	</c:forEach>
+		               </select>
+	            </div>
+	            <div for="${cfgName}.cfgKeywords"></div>
+        </div>
+    </div>
+</div>
+<br>
+</html>
+<script src="${pageContext.request.contextPath}/static/global/scripts/asnRegion.js" type="text/javascript"></script>

src/main/webapp/WEB-INF/views/cfg/logCfgTrendList.jsp

@@ -148,7 +148,8 @@ function showActionTransChart(xData,series){
 		xAxis: {
 			type:'datetime',
 			dateTimeLabelFormats: {
-				second: '%H:%M:%S',
+				millisecond: '%H:%M:%S',
+			    second: '%H:%M:%S',
 				minute: '%H:%M',
 				hour: '%H:%M',
 				day: '%m-%d',
@@ -405,6 +406,61 @@ function showActionTransChart(xData,series){
 	        return prev + curr;
 	    });
 	}
+
+	
+	//配置趋势图需特殊提示，所以从公共js文件中拿出无数据提示方法到本文件中
+	var  log_data=$.validator.messages.log_no_data;
+	(function(d) {
+	    "object" === typeof module && module.exports ? module.exports = d: d(Highcharts)
+	})(function(d) { (function(c) {
+	        var d = c.seriesTypes,
+	        e = c.Chart.prototype,
+	        f = c.getOptions(),
+	        g = c.extend,
+	        h = c.each;
+	        g(f.lang, {
+	        	noData: log_data
+	        });
+	        f.noData = {
+	            position: {
+	                x: 0,
+	                y: 0,
+	                align: "center",
+	                verticalAlign: "middle"
+	            }
+	        };
+	        f.noData.style = {
+	            fontWeight: "bold",
+	            fontSize: "12px",
+	            color: "#666666"
+	        };
+	        h("bubble gauge heatmap pie sankey treemap waterfall".split(" "),
+	        function(b) {
+	            d[b] && (d[b].prototype.hasData = function() {
+	                return !! this.points.length
+	            })
+	        });
+	        c.Series.prototype.hasData = function() {
+	            return this.visible && void 0 !== this.dataMax && void 0 !== this.dataMin
+	        };
+	        e.showNoData = function(b) {
+	            var a = this.options;
+	            b = b || a && a.lang.noData;
+	            a = a && a.noData; ! this.noDataLabel && this.renderer && (this.noDataLabel = this.renderer.label(b, 0, 0, null, null, null, a.useHTML, null, "no-data"), this.noDataLabel.attr(a.attr).css(a.style), this.noDataLabel.add(), this.noDataLabel.align(g(this.noDataLabel.getBBox(), a.position), !1, "plotBox"))
+	        };
+	        e.hideNoData = function() {
+	            this.noDataLabel && (this.noDataLabel = this.noDataLabel.destroy())
+	        };
+	        e.hasData = function() {
+	            for (var b = this.series || [], a = b.length; a--;) if (b[a].hasData() && !b[a].options.isInternal) return ! 0;
+	            return this.loadingShown
+	        };
+	        c.addEvent(c.Chart, "render",
+	        function() {
+	            this.hasData() ? this.hideNoData() : this.showNoData()
+	        })
+	    })(d)
+	});
 </script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp

@@ -0,0 +1,66 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title></title>
+</head>
+<div class="row">
+	<div class="pull-right">
+		<span class="glyphicon glyphicon-remove pull-right" title="remove"
+			onClick="delContent('urlGroup0','urlGroupAdd');" />
+	</div>
+</div>
+<br>
+<%-- <input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
+<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
+<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
+<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
+<input type="hidden" name="${cfgName}.exprType" value="0">
+<input type="hidden" name="${cfgName}.machMethod" value="3">
+<input type="hidden" name="${cfgName}.isHexbin" value="0">
+<input type="hidden" name="${cfgName}.cfgId" value="${cfg.cfgId}">
+<!-- asn no regionId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion1" value="">
+<!-- asn no的组号groupId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion2" value="">
+<!-- asn no组织的groupId 【界面每次校验的时候填写】-->
+<input type="hidden" name="${cfgName}.userRegion3" value="">
+<!-- 是否自动更新ASN NO -->
+<input type="hidden" name="${cfgName}.userRegion4" value="${cfg.userRegion4}"> --%>
+<%-- <div class="hidden" id="selectAll"><spring:message code="select_All_Text"/></div>
+<div class="hidden" id="deselectAll"><spring:message code="deselect_All_Text"/></div>
+<input type="hidden" name="${cfgName}.organizationGroupId" value="${cfg.userRegion1}">
+<input type="hidden" name="${cfgName}.asnNo" value="${cfg.cfgKeywords}" used="false"> --%>
+
+<div class="row">
+	<%-- <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
+	            <div class="col-md-6">
+	            	<select name="${cfgName}.userRegion1" class="selectpicker show-tick form-control required organization" data-live-search="true" data-live-search-placeholder="search">
+	            		<option value=""><spring:message code="select"/></option>
+	                </select>
+	            </div>
+	            <div for="${cfgName}.userRegion1"></div>
+        </div>
+    </div> --%>
+    <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
+	            <div class="col-md-6">
+	            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
+	            	 <select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+		               		<option value=""><spring:message code="select"/></option>
+		               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
+		               			<option value="${urlGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.serviceGroupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
+		               	</c:forEach>
+		               </select>
+	            </div>
+	            <div for="${cfgName}.cfgKeywords"></div>
+        </div>
+    </div>
+</div>
+<br>
+</html>
+<script src="${pageContext.request.contextPath}/static/global/scripts/asnRegion.js" type="text/javascript"></script>

src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp

@@ -13,6 +13,10 @@
 	$(document)
 			.ready(
 					function() {
+						// 修改dns公共组时回显用
+						if($("select[name$='commonGroupIds']").val()){
+							addContent($(".dnsGroupAdd"),'dnsGroup');
+						}
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
@@ -114,6 +118,15 @@
 			$(this).removeAttr("disabled");
 		}); */
 		$(obj).addClass("hidden");
+		
+		if(contentClassName=='NTC_DNS_REGIONTab'){
+			$(".dnsGroup0").addClass("hidden").addClass("disabled");
+			$(".dnsGroupAdd").removeClass("hidden");
+		}else if(contentClassName=='dnsGroup'){
+			$(".NTC_DNS_REGIONTab0").addClass("hidden").addClass("disabled");
+			$(".NTC_DNS_REGIONTabAdd").removeClass("hidden");
+		}
+		
 	}
 
 	//业务窗口关闭
@@ -258,6 +271,445 @@
 										</div>
 									</div>
 								</div>
+								
+								<!-- dns组 tabName写死为 urlGroup -->
+								<h4 class="form-section">
+											<spring:message code="dnsGroup" />
+											<small> <span class="glyphicon glyphicon-plus dnsGroupAdd"
+											onClick="addContent(this,'dnsGroup')" title="add"></span></small>
+								</h4>
+								<div class="row boxSolid dnsGroup0" >
+									<%@include file="/WEB-INF/views/cfg/dnsGroupForm.jsp"%>
+								</div>
+
+								<c:set var="ipCfgIndex" value="0"></c:set>
+								<c:set var="complexCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIdIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${region.regionType eq 1 }">
+										<!--ip info-->
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus  ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
+												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
+												<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+													<div class="row boxSolid ${tabName}${status.index}">
+														<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+													</div>	
+													<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
+												</c:if>
+												</c:forEach>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+												</div>
+												<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									<!--/ip info-->
+									</c:if>
+									<c:if test="${region.regionType eq 3 }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="domainList[${complexCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.domainList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.domainList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+									<c:if test="${region.regionType eq 2 }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+								<br>
+								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
+								<br>
+						   <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%>
+								<div class="form-actions">
+									<div class="row">
+										<div class="col-md-6">
+											<div class="row">
+												<div class="col-md-offset-3 col-md-8">
+													<button id="save" type="submit" class="btn green">
+														<spring:message code="submit" />
+													</button>
+													<button id="cancel" type="button" class="btn default">
+														<spring:message code="cancel" />
+													</button>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-6"></div>
+									</div>
+								</div>
+
+
+							</div>
+						</form>
+						<!-- END FORM-->
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html><%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
+<style type="text/css">
+.boxSolid {
+	border: 1px solid #eeeeee
+}
+</style>
+<script type="text/javascript">
+	$(document)
+			.ready(
+					function() {
+						$(".action").on("change", function() {
+							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+						 	switchAction(action);
+						});
+						$("#serviceId").val($(".action:checked").attr("serviceId"));
+						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$("#cfgFrom").validate(
+								{
+									errorPlacement : function(error, element) {
+										$(element).parents(".form-group").find(
+												"div[for='"
+														+ element.attr("name")
+														+ "']").append(error);
+									},
+									submitHandler : function(form) {
+										
+										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
+										var boxSolidLenth=$(".boxSolid").length;
+										if($(".boxSolid").hasClass("subscribeId")){
+											boxSolidLenth=boxSolidLenth-1;
+										}
+										//代表所有业务都隐藏了，提示必须增加一种业务数据
+										if(boxSolidLenth  ==($(".boxSolid.hidden").length-subscribeId)){
+											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+											return;
+										}
+										//代表所有区域都隐藏了，提示必须增加个区域信息
+										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
+											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
+											if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click();
+											top.$.jBox.tip("<spring:message code='one_more_area'/>", "<spring:message code='info'/>");
+											return;
+										}
+										$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
+											if($(this).val()==''){
+												$(this).parents(".form-group").find(
+														"div[for='"
+																+ $(this).attr("name")
+																+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
+												flag = false;
+											}
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												keywords=keywords.replace("***and***","")	
+											if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(this).parents(".boxSolid").find(
+																"div[for='"
+																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																		+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+														flag = false;
+													}
+												}					
+											}
+										});
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
+										}
+										if(flag){
+											//将disable属性的元素删除
+											$(".disabled").each(function(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
+											form.submit();
+										}else{
+											return;
+										}
+										
+									},
+									errorContainer : "#messageBox",
+								});
+						//业务内容增加
+						/* $("span[title='add']").on("click", function() {
+							$(".ipPort0").removeClass("hidden");
+						}); */
+
+					});
+
+	//业务窗口打开
+	var addContent = function(obj, contentClassName) {
+		var showDiv = $(obj).parent().parent().next();
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
+			$(this).removeAttr("disabled");
+		}); */
+		$(obj).addClass("hidden");
+		
+		if(contentClassName=='NTC_DNS_REGIONTab'){
+			$(".dnsGroup0").addClass("hidden").addClass("disabled");
+			$(".dnsGroupAdd").removeClass("hidden");
+		}else if(contentClassName=='dnsGroup'){
+			$(".NTC_DNS_REGIONTab0").addClass("hidden").addClass("disabled");
+			$(".NTC_DNS_REGIONTabAdd").removeClass("hidden");
+		}
+		
+	}
+
+	//业务窗口关闭
+	var delContent = function(contentClassName, addBtnClassName) {
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		/* $("."+contentClassName).find("input,select").each(function(){
+			$(this).attr("disabled","true");
+		}); */
+		$("." + addBtnClassName).removeClass("hidden");
+	}
+</script>
+</head>
+<body>
+	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
+	<div class="page-content">
+	 	<h3 class="page-title">
+			<spring:message code="${_cfg.menuNameCode }"></spring:message>
+		</h3>
+		<div class="row">
+			<div class="col-md-12">
+				<div class="portlet box blue">
+					<div class="portlet-title">
+						<div class="caption">
+							<i class="fa fa-gift"></i>
+							<c:if test="${empty _cfg.cfgId}">
+								<spring:message code="add"></spring:message>
+							</c:if>
+							<c:if test="${not empty _cfg.cfgId}">
+								<spring:message code="edit"></spring:message>
+							</c:if>
+						</div>
+					</div>
+					<div class="portlet-body form">
+						<!-- BEGIN FORM-->
+						<form id="cfgFrom" action="${ctx}/ntc/website/saveDnsCfg"
+							method="post" class="form-horizontal">
+							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+							<input type="hidden" name="compileId" value="${_cfg.compileId}">
+							<input type="hidden" name="functionId" value="${_cfg.functionId}">
+							<input type="hidden" name="doBlackList" value="0">
+							<input type="hidden" id="serviceId" name="serviceId"
+								value="${_cfg.serviceId}">
+
+							<div class="form-body">
+
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message
+													code="config_describe" /></label>
+											<div class="col-md-6">
+												<input class="form-control" type="text" name="cfgDesc"
+													value="${_cfg.cfgDesc}">
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message
+													code="action" /></label>
+											<div class="col-md-6">
+												<c:forEach items="${serviceList}" var="service"
+													varStatus="satus">
+													<label class="radio-inline"> <c:if
+															test="${_cfg.functionId eq service.functionId}">
+															<input type="radio" name="action"
+																serviceId="${service.serviceId }"
+																protocolId="${service.protocolId }"
+																configDoLog="${service.configDoLog }"
+																value="${service.action }" class="required action"
+																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
+																</c:forEach>
+														</c:if>
+													</label>
+												</c:forEach>
+											</div>
+											<div for="action"></div>
+										</div>
+									</div>
+								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+									<%-- <div class="col-md-6 doBalckList">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
+											<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}">
+																<label class="radio-inline">
+															<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div> --%>
+								<div class="row">
+									<div class="col-md-6 policy">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message
+													code="policy_name" /></label>
+											<div class="col-md-6">
+												<select name="dnsStrategyId" class="selectpicker show-tick form-control noStrategyCheck" ctx="${ctx }">
+												<option value="0" ><spring:message code="no_strategy"/></option>
+					               					<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
+														<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
+							              			</c:forEach>
+								                </select>
+											</div>
+											<div for="dnsStrategyId"></div>
+										</div>
+									</div>
+								</div>
+								
+								<!-- 假代码 tabName写死为 urlGroup -->
+								<h4 class="form-section">
+											<spring:message code="dnsGroup" />
+											<small> <span class="glyphicon glyphicon-plus dnsGroupAdd"
+											onClick="addContent(this,'dnsGroup')" title="add"></span></small>
+								</h4>
+								<div class="row boxSolid dnsGroup0 hidden" >
+									<%@include file="/WEB-INF/views/cfg/dnsGroupForm.jsp"%>
+								</div>
+
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:set var="subscribeIdIndex" value="0"></c:set>

src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp

@@ -25,6 +25,13 @@
 			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:if>
+<c:if test="${not empty _cfg.commonGroupIds }">
+	<div id="NTC_DNS_REGIONTitle${index}" onclick="switchSubCfgTabInfo('NTC_DNS_REGION',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='dnsGroup' />
+			<i id="NTC_DNS_REGION${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:if>
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
@@ -350,4 +357,21 @@
 			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
 	</div>
 </c:if>
+<!-- 显示 公共组信息 -->
+<c:if test="${not empty _cfg.commonGroupIds }">
+	<div id="NTC_DNS_REGIONInfo${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+<%-- 					<label><spring:message code='asn_no'/>:</label> --%>
+					<label> 
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
+					</label> 
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
 </html>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp

@@ -13,6 +13,11 @@
 	$(document)
 			.ready(
 					function() {
+						// 修改url公共组时回显用
+						if($("select[name$='commonGroupIds']").val()){
+							addContent($(".urlGroupAdd"),'urlGroup');
+						}
+						 
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
@@ -102,20 +107,28 @@
 					});
 
 	//业务窗口打开
-	/* var addContent = function(obj, contentClassName) {
+	var addContent = function(obj, contentClassName) {
 		var showDiv = $(obj).parent().parent().next();
 		$(showDiv).removeClass("hidden").removeClass("disabled");
 		 $("."+contentClassName+"0").find("input,select").each(function(){
 			$(this).removeAttr("disabled");
 		}); 
 		$(obj).addClass("hidden");
-	} */
+		
+		if(contentClassName=='httpUrlTab'){
+			$(".urlGroup0").addClass("hidden").addClass("disabled");
+			$(".urlGroupAdd").removeClass("hidden");
+		}else if(contentClassName=='urlGroup'){
+			$(".httpUrlTab0").addClass("hidden").addClass("disabled");
+			$(".httpUrlTabAdd").removeClass("hidden");
+		}
+	}
 
 	//业务窗口关闭
-/* 	var delContent = function(contentClassName, addBtnClassName) {
+ 	var delContent = function(contentClassName, addBtnClassName) {
 		$("." + contentClassName).addClass("hidden").addClass("disabled");
 		$("." + addBtnClassName).removeClass("hidden");
-	} */
+	} 
 </script>
 </head>
 <body>
@@ -232,8 +245,22 @@
 											</div>
 										</div>
                    					 </div>
+                   					 
+                   					 
+                   					 	<!-- url组 tabName写死为 urlGroup -->
+								<h4 class="form-section">
+											<spring:message code="urlGroup" />
+											<small> <span class="glyphicon glyphicon-plus urlGroupAdd"
+											onClick="addContent(this,'urlGroup')" title="add"></span></small>
+								</h4>
+								<div class="row boxSolid urlGroup0" >
+									<%@include file="/WEB-INF/views/cfg/urlGroupForm.jsp"%>
+								</div>
+								
 								<h4 class="form-section">
 											<spring:message code="http_url_title" />
+											<small> <span class="glyphicon glyphicon-plus httpUrlTabAdd"
+											onClick="addContent(this,'httpUrlTab')" title="add"></span></small>
 								</h4>
 								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:set var="subscribeIdIndex" value="0"></c:set>
@@ -264,18 +291,16 @@
 														</c:if>  --%>
 								
 												<c:if test="${region.configRegionValue eq _cfg.httpUrl.cfgType }">
-																<div class="httpurlCfg">
 																	<c:set var="tabName" value="httpUrlTab"></c:set>
 																	<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
 																	<c:forEach items="${_cfg.httpUrlList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
-																		<input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }">
-																		<div class="row boxSolid ${tabName}${status.index}" >
+																		<div class="row boxSolid ${tabName}${status.index} hidden" >
 																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
+																		<input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }">
 																	</c:forEach>
-																</div>
 															</c:if>
 								
 									<%-- <c:if test="${region.regionType eq 2 and region.configServiceType ne 'subscribe_id'}">
@@ -327,6 +352,9 @@
 										</c:choose>
 									</c:if> --%>
 								</c:forEach>
+								
+							
+								
 								<br>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>

src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp

@@ -25,6 +25,13 @@
 			<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:if>
+<c:if test="${not empty _cfg.commonGroupIds }">
+	<div id="NTC_URL_REGIONTitle${index}" onclick="switchSubCfgTabInfo('NTC_URL_REGION',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='urlGroup' />
+			<i id="NTC_URL_REGION${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:if>
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
@@ -345,4 +352,21 @@
 			<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
 	</div>
 </c:if>
+<!-- 显示 公共组信息 -->
+<c:if test="${not empty _cfg.commonGroupIds }">
+	<div id="NTC_URL_REGIONInfo${index}" class="content" name="subCfg${index}">
+		<div class="row">
+			<div class="col-md-4">
+				<div class="form-group">
+<%-- 					<label><spring:message code='asn_no'/>:</label> --%>
+					<label>
+						<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
+		               			 <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if> 
+		               	</c:forEach> 
+					</label>
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>
 </html>

src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp

@@ -14,7 +14,6 @@
 </head>
 
 <body>
-
 	<div class="page-content">
 		<div class="theme-panel hidden-xs hidden-sm">
 			<button type="button" class="btn btn-default"
@@ -154,12 +153,28 @@
 				<!-- 搜索内容与操作按钮栏 -->
 			</form:form>
 		</div>
+		
+		<br>
+	<div class="row">
+		<div class="col-md-12 " id="appSelect">
+				<select id="unitType" class="selectpicker select2 input-small">
+					<option value="Unique Ip">Unique Ip</option>
+					<option value="Gbps">Gbps</option>
+					<option value="pps">pps</option>
+				</select>
+		</div>
+	</div>
+		
+		
 		<div class="row chart-realTime">
 			<div id="chart-realTime" style="width: 97%; height: 430px; margin-top: 20px"></div>
 			<input id="total" type="hidden" /> 
 			<input id="sipData" type="hidden" /> 
 			<input id="dipData" type="hidden" /> 
 			<input id="timeData" type="hidden" /> 
+			<input id="c2sData" type="hidden" /> 
+			<input id="s2cData" type="hidden" /> 
+			<input id="totalData" type="hidden" /> 
 			<input id="appType" name="appType" type="hidden" value="${appType}" /> 
 			<input id="beginDateh" type="hidden" value="${beginDate}" /> 
 			<input id="endDateh" type="hidden" value="${endDate}" />
@@ -230,10 +245,11 @@
 			var entranceId2=$("#entranceId2").val();
 			var isp1=$("#isp1").val();
 			var isp2=$("#isp2").val();
+			var unitType=$("#unitType").val();
 			var searchQuota=$(".searchQuota[class~='active']").val();
-			showRealTimeTransChart(appType,entranceId1,isp1);// 实时折线
-			appTransAjax(starth,endh,appType,entranceId2,isp2);
-			appTop100List(starth,endh,appType,entranceId2,searchQuota,isp2);
+			showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线
+			appTransAjax(starth,endh,appType,entranceId2,isp2,unitType);
+			appTop100List(starth,endh,appType,entranceId2,searchQuota,isp2,unitType);
 			//筛选功能初始化
 			$("#resetBtn1").on("click",function() {
 				$("#searchForm1 select.selectpicker").each(function() {
@@ -242,6 +258,12 @@
 // 						$(this).find("option:first").attr("selected",true);
 					});
 						$("#searchForm1")[0].reset();
+						$("#appSelect select.selectpicker").each(function() {
+							$(this).selectpicker('val',"Unique Ip");
+							$(this).find("option").attr("selected",false);
+							$(this).find("option:first").attr("selected",true);
+						});
+						
 			});
 			//筛选功能初始化
 			$("#resetBtn2").on("click",function() {
@@ -251,10 +273,14 @@
 // 						$(this).find("option:first").attr("selected",true);
 					});
 // 						$(".Wdate").attr("value", '');
+				$("#appSelect select.selectpicker").each(function() {
+					$(this).selectpicker('val',"Unique Ip");
+					$(this).find("option").attr("selected",false);
+				});
+
 						var deftime=(new Date().getTime())-(1000 * 60 * 60);
 			        	var defbegin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(deftime)); // 默认一小时
 						var defend=dateFtt("yyyy-MM-dd hh:mm:ss",new Date());
-						
 						$("#searchForm2")[0].reset();
 						$("#beginDate").val(defbegin);
 						$("#endDate").val(defend);
@@ -265,32 +291,82 @@
 			})
 			$(".chart-history").addClass("hidden");
 			$(".chart-realTime").removeClass("hidden");
+			
 			$(".changeData").on("click",function(){
+				loading();
 				$(".changeData").removeClass("active");
 				$(this).addClass("active");
+				$("#appSelect select.selectpicker").each(function() {
+					$(this).selectpicker('val',"Unique Ip");
+					$(this).find("option").attr("selected",false);
+				});
+				
+				var starth = $("#beginDateh").val();
+				var endh = $("#endDateh").val();
+				$("#beginDate").val(starth);
+				$("#endDate").val(endh);
+				var appType=$("#appType").val();
+				var entranceId1=$("#entranceId1").val();
+				var entranceId2=$("#entranceId2").val();
+				var isp1=$("#isp1").val();
+				var isp2=$("#isp2").val();
+				var unitType=$("#unitType").val();
+				var searchQuota=$(".searchQuota[class~='active']").val();
 				if($(this).val()==1){
+					showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线
 					$(".chart-realTime").removeClass("hidden");
 					$(".chart-history").addClass("hidden");
 				}else{
+					appTransAjax(starth,endh,appType,entranceId2,isp2,unitType);
 					$(".chart-realTime").addClass("hidden");
 					$(".chart-history").removeClass("hidden");
 				}
+				/* if($(this).val()==1){
+					$(".chart-realTime").removeClass("hidden");
+					$(".chart-history").addClass("hidden");
+					
+				}else{
+					$(".chart-realTime").addClass("hidden");
+					$(".chart-history").removeClass("hidden");
+					
+				} */
 			})
 			$('.pageView').hide();
+			
+			$("#unitType").on("change",function(){
+				loading();
+				var starth = $("#beginDateh").val();
+				var endh = $("#endDateh").val();
+				$("#beginDate").val(starth);
+				$("#endDate").val(endh);
+				var appType=$("#appType").val();
+				var entranceId1=$("#entranceId1").val();
+				var entranceId2=$("#entranceId2").val();
+				var isp1=$("#isp1").val();
+				var isp2=$("#isp2").val();
+				var unitType=$("#unitType").val();
+				var searchQuota=$(".searchQuota[class~='active']").val();
+				showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 实时折线
+				appTransAjax(starth,endh,appType,entranceId2,isp2,unitType);
+			});
+			
 		});
+		
 		// 改变排序字段
 		function changeOrderby(searchQuota) {
 			loading();
-			appTop100List($("#beginDate").val(),$("#endDate").val(),$("#appType").val(),$("#entranceId2").val(),searchQuota,$("#isp2").val());
+			appTop100List($("#beginDate").val(),$("#endDate").val(),$("#appType").val(),$("#entranceId2").val(),searchQuota,$("#isp2").val(),unitType=$("#unitType").val());
 		}
 		function searchList1() {
 				loading();
+				var unitType=$("#unitType").val();
 				var appType=$("#appType").val();
 				var entranceId1=$("#entranceId1").val();
 				var isp1=$("#isp1").val();
-				showRealTimeTransChart(appType,entranceId1,isp1);// 折线
+				showRealTimeTransChart(appType,entranceId1,isp1,unitType);// 折线
 		}
 		function searchList2() {
+			var unitType=$("#unitType").val();
 			var start = $("#beginDate").val();
 			var end = $("#endDate").val();
 			$("#beginDateh").val(start);
@@ -302,7 +378,7 @@
 				var entranceId2=$("#entranceId2").val();
 				var isp2=$("#isp2").val();
 				var searchQuota=$(".searchQuota[class~='active']").val();
-				appTransAjax(start,end,appType,entranceId2,isp2);// 折线
+				appTransAjax(start,end,appType,entranceId2,isp2,unitType);// 折线
 				appTop100List(start,end,appType,entranceId2,searchQuota,isp2);// 列表
 			}
 		}
@@ -318,7 +394,7 @@
 					"appType" : appType,
 					"entranceId" : entranceId,
 					"searchQuota":searchQuota,
-					"searchIspCode":isp
+					"searchIspCode":isp,
 				},
 				async : true,
 				timeout : 50000,
@@ -403,7 +479,7 @@
 		}
 		
 		// app曲线图
-		function appTransAjax(beginDate, endDate,appType,entranceId,isp) {
+		function appTransAjax(beginDate, endDate,appType,entranceId,isp,unitType) {
 			loading();
 			$.ajax({	url : "${ctx}/dashboard/traffic/ajaxAppTrend",
 						type : "get",
@@ -414,18 +490,29 @@
 							"endDate" : endDate,
 							"appType" : appType,
 							"entranceId" : entranceId,
-							"searchIspCode":isp
+							"searchIspCode":isp,
+							"searchQuotaType":unitType
 						},
 						traditional:true,
 						success : function(rs) {
 							var series=new Array();
 							var sipResult=new Array();
 							var dipResult=new Array();
+							
+							var c2sResult=new Array();
+							var s2cResult=new Array();
+							var totalResult=new Array();
+							
 							var sipData=new Array();
 							var dipData=new Array();
 							var timeData=new Array();
+							
+							var c2sData=new Array();
+							var s2cData=new Array();
+							var totalData=new Array();
 							var total=[];
 							if(rs!=null&&Object.keys(rs).length>0){
+								if(unitType=='Unique Ip'){
 								sipResult=rs.sipResult;
 								dipResult=rs.dipResult
 								total.push(rs.sipSum,rs.dipSum);
@@ -437,15 +524,41 @@
 								$(dipResult).each(function(i,d){
 									dipData.push(d[1])
 									})
-
-									}else{
-										total.push(0,0);
-									}
-							showActionHistoryChart(sipResult,dipResult);
+								}else{
+									c2sResult=rs.c2sResult
+									s2cResult=rs.s2cResult
+									totalResult=rs.totalResult
+									
+									// 图表导出用列
+									$(c2sResult).each(function(i,d){
+										c2sData.push(d[1])
+										timeData.push(d[0])
+										})
+									$(s2cResult).each(function(i,d){
+										s2cData.push(d[1])
+										})
+									$(totalResult).each(function(i,d){
+										totalData.push(d[1])
+										})
+									total.push('--','--','--');
+								}
+							}else{
+								if(unitType=='Unique Ip'){
+									total.push(0,0);
+								}else{
+									total.push('--','--','--');
+								}
+							}
+							showActionHistoryChart(sipResult,dipResult,c2sResult,s2cResult,totalResult);
 							$("#total").val(JSON.stringify(total));
 							$("#sipData").val(JSON.stringify(sipData));
 							$("#dipData").val(JSON.stringify(dipData));
 							$("#timeData").val(JSON.stringify(timeData));
+							
+							$("#c2sData").val(JSON.stringify(c2sData));
+							$("#s2cData").val(JSON.stringify(s2cData));
+							$("#totalData").val(JSON.stringify(totalData));
+							
 							closeTip();
 						},
 						error : function(data, textStatus, errorThrown) {
@@ -571,7 +684,8 @@
 		        $(".pageNum").text(Math.ceil(totalData/10));
 			}
 		}
-		function realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp){
+		
+		function realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp,unitType){
 			var result={};
 			$.ajax({
 				url : "${ctx}/dashboard/traffic/ajaxAppTrend",
@@ -582,7 +696,8 @@
 					"endDate" : endDate,
 					"appType" : appType,
 					"entranceId" : entranceId,
-					"searchIspCode":isp
+					"searchIspCode":isp,
+					"searchQuotaType":unitType
 				},
 				async : false,
 				traditional:true,
@@ -601,16 +716,207 @@
 		}
 		var timer=null;
 		// 局点信息
-		function showRealTimeTransChart(appType,entranceId,isp) {
+		function showRealTimeTransChart(appType,entranceId,isp,unitType) {
 			var time1=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5);
 			var time2=(new Date().getTime())-(1000 * 60 * 5);//推迟五分钟
 			var beginDate=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time1)); //获取十个点
 			var endDate=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time2)); // 少算一分钟
 			var sipResult=new Array();
 			var dipResult=new Array();
-			var intData = realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp); //初始化数据 为10个点
-			sipResult=intData.sipResult;
-			dipResult=intData.dipResult;
+			
+			var c2sResult=new Array();
+			var s2cResult=new Array();
+			var totalResult=new Array();
+			var unitType=$("#unitType").val();
+			var intData = realTimeTrendAjax(beginDate, endDate,appType,entranceId,isp,unitType); //初始化数据 为10个点
+			var zxchart=null;
+			if(unitType=='Unique Ip'){
+				sipResult=intData.sipResult;
+				dipResult=intData.dipResult;
+				
+				zxchart=[{
+					name: '<spring:message code="client_ip"/>',
+					lineColor:'#a9d4cf',
+					lineWidth:1,
+					marker: {
+			            enabled: false
+			        },
+					data: (function () {
+						var data = [];
+						if(sipResult!=null&&sipResult.length>0){
+						var count=10;
+							if(sipResult.length<10){
+								count=sipResult.length;
+							}
+							for (var i = 0; i < count; i++) {
+								var d =sipResult[i];
+        						var x = d[0], // 时间
+        							y = d[1];
+								data.push({
+									x: x,
+									y: y
+								});
+							}
+						} else{
+							var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
+							for (var i = 0; i <10; i++) {
+							data.push({
+								x: time + i * 1000*60,
+								y: 0
+							});
+							}
+						} 
+						return data;
+					}())
+				},
+				{
+					name: '<spring:message code="server_ip"/>',
+					lineColor:'#eecf8d',
+					lineWidth:1,
+					marker: {
+			            enabled: false
+			        },
+					data: (function () {
+						var data = [];
+						if(dipResult!=null&&dipResult.length>0){
+							var count=10;
+							if(dipResult.length<10){
+								count=dipResult.length;
+								}
+			                for (var i = 0; i < count; i++) {
+							var d =dipResult[i];
+    						var x = d[0], // 当前时间
+    							y = d[1];
+								data.push({
+									x: x,
+									y: y
+								});
+							}
+						}else{
+							var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
+							for (var i = 0; i <10; i++) {
+							data.push({
+								x: time + i * 1000*60,
+								y: 0
+							});
+							}
+						}
+						return data;
+					}())
+				}]
+				
+			}else{
+				c2sResult=intData.c2sResult;
+				s2cResult=intData.s2cResult;
+				totalResult=intData.totalResult;
+				
+				zxchart=[{
+					name: 'c2s',
+					lineColor:'#a9d4cf',
+					lineWidth:1,
+					marker: {
+			            enabled: false
+			        },
+					data: (function () {
+						var data = [];
+						if(c2sResult!=null&&c2sResult.length>0){
+						var count=10;
+							if(c2sResult.length<10){
+								count=c2sResult.length;
+							}
+							for (var i = 0; i < count; i++) {
+								var d =c2sResult[i];
+        						var x = d[0], // 时间
+        							y = d[1];
+								data.push({
+									x: x,
+									y: y
+								});
+							}
+						} else{
+							var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
+							for (var i = 0; i <10; i++) {
+							data.push({
+								x: time + i * 1000*60,
+								y: 0
+							});
+							}
+						} 
+						return data;
+					}())
+				},
+				{
+					name: 's2c',
+					lineColor:'#eecf8d',
+					lineWidth:1,
+					marker: {
+			            enabled: false
+			        },
+					data: (function () {
+						var data = [];
+						if(s2cResult!=null&&s2cResult.length>0){
+							var count=10;
+							if(s2cResult.length<10){
+								count=s2cResult.length;
+								}
+			                for (var i = 0; i < count; i++) {
+							var d =s2cResult[i];
+    						var x = d[0], // 当前时间
+    							y = d[1];
+								data.push({
+									x: x,
+									y: y
+								});
+							}
+						}else{
+							var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
+							for (var i = 0; i <10; i++) {
+							data.push({
+								x: time + i * 1000*60,
+								y: 0
+							});
+							}
+						}
+						return data;
+					}())
+				},
+				{
+					name: 'total',
+					lineColor:'#ebb093',
+					lineWidth:1,
+					marker: {
+			            enabled: false
+			        },
+					data: (function () {
+						var data = [];
+						if(totalResult!=null&&totalResult.length>0){
+							var count=10;
+							if(totalResult.length<10){
+								count=totalResult.length;
+								}
+			                for (var i = 0; i < count; i++) {
+							var d =totalResult[i];
+    						var x = d[0], // 当前时间
+    							y = d[1];
+								data.push({
+									x: x,
+									y: y
+								});
+							}
+						}else{
+							var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
+							for (var i = 0; i <10; i++) {
+							data.push({
+								x: time + i * 1000*60,
+								y: 0
+							});
+							}
+						}
+						return data;
+					}())
+				}]
+			}
+			
 			var nowDate=new Date();
 			Highcharts.setOptions({ global: { useUTC: false } });
 			var num=0;
@@ -650,9 +956,18 @@
 										}
 									}
 								},
-								colors:['#a9d4cf','#eecf8d'],
+								colors:['#a9d4cf','#eecf8d','#ebb093'],
 								title : {
-									text : null
+									text : (function () {
+										var timebe=(new Date().getTime())-(1000 * 60 * 6);
+										var start=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5);
+							        	var begin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start)); //获取1个点少算一分钟
+										var end=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(timebe)); 
+							        	var tlt='<spring:message code="${appName}"></spring:message> '+begin+'--'+end+''
+										return tlt;
+									}())
+										
+										
 								},
 								xAxis: {
 									type:'datetime',
@@ -707,85 +1022,24 @@
 										}
 									}
 								},
-									series: [{
-										name: '<spring:message code="client_ip"/>',
-										lineColor:'#a9d4cf',
-										lineWidth:1,
-										marker: {
-								            enabled: false
-								        },
-										data: (function () {
-											var data = [];
-											if(sipResult!=null&&sipResult.length>0){
-											var count=10;
-												if(sipResult.length<10){
-													count=sipResult.length;
-												}
-												for (var i = 0; i < count; i++) {
-													var d =sipResult[i];
-					        						var x = d[0], // 时间
-					        							y = d[1];
-													data.push({
-														x: x,
-														y: y
-													});
-												}
-											} else{
-												var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
-												for (var i = 0; i <10; i++) {
-												data.push({
-													x: time + i * 1000*60,
-													y: 0
-												});
-												}
-											} 
-											return data;
-										}())
-									},
-									{
-										name: '<spring:message code="server_ip"/>',
-										lineColor:'#a9d4cf',
-										lineWidth:1,
-										marker: {
-								            enabled: false
-								        },
-										data: (function () {
-											var data = [];
-											if(dipResult!=null&&dipResult.length>0){
-												var count=10;
-												if(dipResult.length<10){
-													count=dipResult.length;
-													}
-								                for (var i = 0; i < count; i++) {
-												var d =dipResult[i];
-				        						var x = d[0], // 当前时间
-				        							y = d[1];
-													data.push({
-														x: x,
-														y: y
-													});
-												}
-											}else{
-												var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
-												for (var i = 0; i <10; i++) {
-												data.push({
-													x: time + i * 1000*60,
-													y: 0
-												});
-												}
-											}
-											return data;
-										}())
-									}]
+									series: zxchart
 					});
 				
 				 	var series = chart.series[0];
 			        var series1 = chart.series[1];
+			        if(unitType!='Unique Ip'){
+			       		var series2 = chart.series[2];
+			        }
 			        window.clearInterval(timer);
 // 			       if(sipResult!=null&&sipResult.length>0){
+					var  nu=0;
+					var unitType=$("#unitType").val();
 			        timer=setInterval(function() {
 			        	var time3=(new Date().getTime())-(1000 * 60 * 5);
 			        	var time4=(new Date().getTime())-(1000 * 60 * 4);
+			        	var c2sResult=new Array();
+						var s2cResult=new Array();
+						var totalResult=new Array();
 			        	var begin=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time3)); //获取1个点少算一分钟
 						var end=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(time4)); 
 			        	$.ajax({
@@ -798,26 +1052,53 @@
 								"endDate" : end,
 								"appType" : appType,
 								"entranceId" : entranceId,
-								"searchIspCode":isp
+								"searchIspCode":isp,
+								"searchQuotaType":unitType
 							},
 							async : true,
 							traditional:true,
 							success : function(rs) {
 								var realTimeData=rs;
 					        	if(realTimeData!=null&&Object.keys(realTimeData).length>0){
-								var sipReal=realTimeData.sipResult;
-								var dipReal=realTimeData.dipResult;
-						            var d =sipReal[0];
+					        		if(unitType=='Unique Ip'){
+										var sipReal=realTimeData.sipResult;
+										var dipReal=realTimeData.dipResult;
+										
+										var d =sipReal[0];
 							            series.addPoint([d[0], d[1]], true, true);
-						            var t =dipReal[0];
+						           		var t =dipReal[0];
 							            series1.addPoint([t[0], t[1]], true, true);
+					        		}else{
+						        		var	c2sRes=realTimeData.c2sResult;
+										var	s2cRes=realTimeData.s2cResult;
+										var	totalRes=realTimeData.totalResult;
+										
+										var d =c2sRes[0];
+							            series.addPoint([d[0], d[1]], true, true);
+						           		var t =s2cRes[0];
+							            series1.addPoint([t[0], t[1]], true, true);
+							            var s =totalRes[0];
+							            series2.addPoint([s[0], s[1]], true, true);
+					        		}
+							            
 						        }else{
 							        var x=(new Date()).getTime()-(1000 * 60 * 5);
 									var y=0;
-									series.addPoint([x, y], true, true);
-									series1.addPoint([x, y], true, true);
+									if(unitType=='Unique Ip'){
+										series.addPoint([x, y], true, true);
+										series1.addPoint([x, y], true, true);
+									}else{
+										series.addPoint([x, y], true, true);
+										series1.addPoint([x, y], true, true);
+										series2.addPoint([x, y], true, true);
+									}
+									
 							     }
-								
+					        	var  start=(new Date().getTime())-(1000 * 60 * 10+1000 * 60 * 5);
+					        	var startTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(start));
+					        	var ends=(new Date().getTime())-(1000 * 60 * 5);
+					        	var endTime=dateFtt("yyyy-MM-dd hh:mm:ss",new Date(ends));
+					        	chart.title.update({ text: '<spring:message code="${appName}"></spring:message> '+startTime+'--'+endTime+''});
 								closeTip();
 							},
 							error : function(data, textStatus, errorThrown) {
@@ -833,10 +1114,61 @@
 // 				    }
 		}
 		// 历史信息
-		function showActionHistoryChart(sipResult,dipResult) {
+		function showActionHistoryChart(sipResult,dipResult,c2sResult,s2cResult,totalResult) {
 			var nowDate=new Date();
 			Highcharts.setOptions({ global: { useUTC: false } }); 
 			var num=0;
+			var lsChart=null;
+			var unitType=$("#unitType").val();
+			if(unitType=='Unique Ip'){
+				lsChart= [{
+				name: '<spring:message code="client_ip"/>',
+				data: sipResult,
+				lineColor:'#a9d4cf',
+				lineWidth:1,
+				marker: {
+		            enabled: false
+		        }
+			},
+			{
+				name: '<spring:message code="server_ip"/>',
+				data: dipResult,
+				lineColor:'#eecf8d',
+				lineWidth:1,
+				marker: {
+		            enabled: false
+		        }
+			}]
+		}else{
+			lsChart= [{
+				name: 'c2s',
+				data: c2sResult,
+				lineColor:'#a9d4cf',
+				lineWidth:1,
+				marker: {
+		            enabled: false
+		        }
+			},
+			{
+				name: 's2c',
+				data: s2cResult,
+				lineColor:'#eecf8d',
+				lineWidth:1,
+				marker: {
+		            enabled: false
+		        }
+			},
+			{
+				name: 'total',
+				data: totalResult,
+				lineColor:'#ebb093',
+				lineWidth:1,
+				marker: {
+		            enabled: false
+		        }
+			}]
+		}
+			
 			var chart = Highcharts.chart('chart-history',
 							{
 			       chart: {
@@ -867,9 +1199,9 @@
 										}
 									}
 								},
-								colors:['#a9d4cf','#eecf8d'],
+								colors:['#a9d4cf','#eecf8d','#ebb093'],
 								title : {
-									text : null
+									text : '<spring:message code="${appName}"></spring:message>  '+$("#beginDateh").val()+'--'+$("#endDateh").val()+''
 								},
 								xAxis: {
 									type:'datetime',
@@ -924,24 +1256,7 @@
 										}
 									}
 								},
-									series: [{
-										name: '<spring:message code="client_ip"/>',
-										data: sipResult,
-										lineColor:'#a9d4cf',
-										lineWidth:1,
-										marker: {
-								            enabled: false
-								        }
-									},
-									{
-										name: '<spring:message code="server_ip"/>',
-										data: dipResult,
-										lineColor:'#eecf8d',
-										lineWidth:1,
-										marker: {
-								            enabled: false
-								        }
-									}]
+									series:lsChart
 					});
 		}
 		(function(H) {
@@ -954,6 +1269,7 @@
 				rows.shift(); // 删除一个重复行
 				var total=[];
 				var map={};
+				var unitType=$("#unitType").val();
 				 if(heard[0].indexOf("History") != -1){
 					rows = [];
 					/* 调用后台接口导出 */
@@ -961,13 +1277,27 @@
 					var timeData = JSON.parse($("#timeData").val());
 					var sipData = JSON.parse($("#sipData").val());
 					var dipData = JSON.parse($("#dipData").val());
-					for(var i=0;i<sipData.length;i++){
-						var colData=[];
-						var time=new Date(timeData[i]); // 
-						var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
-						colData.push(ftime,sipData[i],dipData[i])
-						rows.push(colData)
-					}
+					
+					var c2sData = JSON.parse($("#c2sData").val());
+					var s2cData = JSON.parse($("#s2cData").val());
+					var totalData = JSON.parse($("#totalData").val());
+					if(unitType=='Unique Ip'){
+						for(var i=0;i<sipData.length;i++){
+							var colData=[];
+							var time=new Date(timeData[i]); // 
+							var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+							colData.push(ftime,sipData[i],dipData[i]);
+							rows.push(colData)
+							}
+						}else{
+							for(var i=0;i<c2sData.length;i++){
+								var colData=[];
+								var time=new Date(timeData[i]); // 
+								var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+								colData.push(ftime,c2sData[i],c2sData[i],totalData[i])	
+								rows.push(colData)
+							}
+						}
 				 }else{
 					var siptotal=0;
 					var diptotal=0;
@@ -983,7 +1313,12 @@
 								diptotal=diptotal+Number(d[2]);	
 						}
 					})
-					total.push(siptotal,diptotal);
+					 if(unitType=='Unique Ip'){
+						 total.push(siptotal,diptotal);
+					 }else{
+						 total.push('--','--','--');
+					 }
+					
 				}
 				 total.unshift('<spring:message code="report_total"/>');
 				 rows.push(total)
@@ -1005,6 +1340,7 @@
 				var total=[];
 				var start = "";
 				var end = "";
+				var unitType=$("#unitType").val();
 				if(heard[0].indexOf("History") != -1){
 					start = $("#beginDateh").val();
 					end = $("#endDateh").val();
@@ -1012,27 +1348,68 @@
 					var timeData = JSON.parse($("#timeData").val());
 					var sipData = JSON.parse($("#sipData").val());
 					var dipData = JSON.parse($("#dipData").val());
-					for(var i=0;i<sipData.length;i++){
-						var colData=[];
-						var time=new Date(timeData[i]); // 
-						var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
-						colData.push(ftime,sipData[i],dipData[i])
-						data.push({
-				                      num1:ftime,
-				                      num2:sipData[i],
-				                      num3:dipData[i],
+					
+					var c2sData = JSON.parse($("#c2sData").val());
+					var s2cData = JSON.parse($("#s2cData").val());
+					var totalData = JSON.parse($("#totalData").val());
+					if(unitType=='Unique Ip'){
+							for(var i=0;i<sipData.length;i++){
+								var colData=[];
+								var time=new Date(timeData[i]); // 
+								var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+								colData.push(ftime,sipData[i],dipData[i])
+								data.push({
+						                      num1:ftime,
+						                      num2:sipData[i],
+						                      num3:dipData[i],
+									})
+								}
+							data.unshift({
+								  num1:'RealTime',
+			                      num2:'<spring:message code="client_ip"/>',
+			                      num3:'<spring:message code="server_ip"/>',
 							})
-					}
+							
+						}else{
+							for(var i=0;i<c2sData.length;i++){
+								var colData=[];
+								var time=new Date(timeData[i]); // 
+								var ftime=dateFtt("yyyy-MM-dd hh:mm:ss",time);
+								colData.push(ftime,c2sData[i],s2cData[i],totalData[i])
+								data.push({
+					                      num1:ftime,
+					                      num2:c2sData[i],
+					                      num3:s2cData[i],
+					                      num4:totalData[i],
+								})
+							}
+							data.unshift({
+								  num1:'RealTime',
+			                      num2:'c2s',
+			                      num3:'s2c',
+			                      num4:'total',
+							})
+						}
+					
 					}else{
 						var siptotal=0;
 						var diptotal=0;
 						$(rows).each(function (i,d){
 							if(d!=null){
+								if(unitType=='Unique Ip'){
 								data.push({
 					                      num1:d[0],
 					                      num2:d[1],
 					                      num3:d[2],
 								});
+								}else{
+									data.push({
+					                      num1:d[0],
+					                      num2:d[1],
+					                      num3:d[2],
+					                      num4:d[3],
+								});
+								}
 								if(i>0){
 									if(i==1){
 										start=d[0];
@@ -1045,17 +1422,26 @@
 									}
 							}
 						})
-						total.push(siptotal,diptotal);
+						if(unitType=='Unique Ip'){
+							 total.push(siptotal,diptotal);
+						 }else{
+							 total.push('--','--','--');
+						 }
 					}
 					data.push({
 						num1:"<spring:message code='report_total'/>",
 		                num2:total
 					})
 				
-				
+				var titleKey=null;
+					if(unitType=='Unique Ip'){
+						titleKey=["num1","num2","num3"];
+					}else{
+						titleKey=["num1","num2","num3","num4"];
+					}
 				exportCsv({
 	                  title:["<spring:message code='${appName}'/>",start+"--"+end],
-	                  titleForKey:["num1","num2","num3"],
+	                	  titleForKey:titleKey,
 	                  data:data
 	              });
 			};

src/main/webapp/WEB-INF/views/dashboard/trafficPortActiveList.jsp

@@ -182,7 +182,7 @@ function showPortActiveChart(xData,series){
 	},
 	    yAxis: {
 	        title: {
-	            text: 'bytes'
+	            text: 'Link Numbers'
 	        }
 	    },
 	    tooltip: {

src/main/webapp/WEB-INF/views/home.jsp

@@ -176,7 +176,7 @@ function searchForm() {
 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
 			$("#menu"+search_txt+" >a").trigger('click');
 		}else {
-			alert('未找到该菜单！');
+			alert('The menu was not found!');
 		} 
 }
 
@@ -219,9 +219,9 @@ function refreshCache(cacheName){
 		async:false,
 		success:function(data,textStatus){
 			if(data=="success"){
-				alert("缓存清理成功");
+				alert("Cache Cleaning Successful!");
 			}else{
-				alert("缓存清理失败");
+				alert("Cache Cleanup Failure!");
 			}
 		}
 	})
@@ -517,7 +517,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->
 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
 		<div class="page-footer-inner">
-			CEIEC All Rights Reserved，CEIEC &copy;
+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->
 		</div>
 		<div class="scroll-to-top">
 			<i class="icon-arrow-up"></i>

src/main/webapp/WEB-INF/views/home.jsp.bak

@@ -62,9 +62,9 @@
 		
 	  //  console(window.frames['mainFrame'].location);
 	    // if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){
-	    	//关闭菜单 
+	    	//关闭菜单
 	     	//$('.page-sidebar .sidebar-toggler').click();
-	    	//f11全屏  
+	    	//f11全屏
 	    	//fullScreen();
 	 	//}
 	     
@@ -176,7 +176,7 @@ function searchForm() {
 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
 			$("#menu"+search_txt+" >a").trigger('click');
 		}else {
-			alert('未找到该菜单！');
+			alert('The menu was not found!');
 		} 
 }
 
@@ -219,9 +219,9 @@ function refreshCache(cacheName){
 		async:false,
 		success:function(data,textStatus){
 			if(data=="success"){
-				alert("缓存清理成功");
+				alert("Cache Cleaning Successful!");
 			}else{
-				alert("缓存清理失败");
+				alert("Cache Cleanup Failure!");
 			}
 		}
 	})
@@ -384,7 +384,7 @@ background:#3d3d3d;
                          	</span>
                          </a>
                      </li>
-                     <!-- 系统语言 -->
+                      <!-- 系统语言 -->
 				     <li class="dropdown  dropdown-user" id="language">
 				     	
 				     	 
@@ -516,7 +516,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->
 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
 		<div class="page-footer-inner">
-			CEIEC All Rights Reserved，CEIEC &copy;
+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->
 		</div>
 		<div class="scroll-to-top">
 			<i class="icon-arrow-up"></i>
@@ -559,7 +559,7 @@ background:#3d3d3d;
 		    }
 		}
 	//window.onload = function() {
-	//	fullScreen();//直接执行onclick中的函数就行
+	//	fullScreen();//直接执行onclick中的函数就行
 	//}
 	</script>
 </body>

src/main/webapp/WEB-INF/views/home.jsp.new

@@ -186,8 +186,9 @@ function searchForm() {
 		if(search_txt.indexOf('_')!=-1){
 			search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
 			$("#menu"+search_txt+" >a").trigger('click');
-		}else {
-			alert('未找到该菜单！');
+		}else {		
+			alert('The menu was not found!');
+			//alert('未找到该菜单！');
 		} 
 }
 
@@ -230,9 +231,9 @@ function refreshCache(cacheName){
 		async:false,
 		success:function(data,textStatus){
 			if(data=="success"){
-				alert("缓存清理成功");
+				alert("Cache Cleaning Successful!");
 			}else{
-				alert("缓存清理失败");
+				alert("Cache Cleanup Failure!");
 			}
 		}
 	})
@@ -547,7 +548,7 @@ background:#3d3d3d;
 	<!-- BEGIN FOOTER -->
 	<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
 		<div class="page-footer-inner">
-			CEIEC All Rights Reserved，CEIEC &copy;
+			<!--CEIEC All Rights Reserved，CEIEC &copy;-->
 		</div>
 		<div class="scroll-to-top">
 			<i class="icon-arrow-up"></i>

src/main/webapp/WEB-INF/views/login.jsp

@@ -166,7 +166,7 @@
 				</div><!-- /.row -->
 		</div><!-- /.main-container -->
 		<div class="foot">
-			<span>CEIEC All Rights Reserved, CEIEC © </span>
+			<span><!--CEIEC All Rights Reserved，CEIEC &copy;--> </span>
 		</div>
 		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/js.cookie.min.js" type="text/javascript"></script>

src/main/webapp/WEB-INF/views/login.jsp.bak

@@ -91,7 +91,7 @@
         
         		
          <div class="page-footer-custom"> 
-         		CEIEC All Rights Reserved，CEIEC &copy;
+         		<!--CEIEC All Rights Reserved，CEIEC &copy;-->
            		<%-- Copyright &copy; 2015-${fns:getStringProperty('copyrightYear','2015')} <a href="${pageContext.request.contextPath}">${fns:getStringProperty('productName','NIS')}</a> - Powered By <a href="${pageContext.request.contextPath}" target="_blank">NIS</a> ${fns:getStringProperty('version','1.0.0')} --%>
          </div>
          

src/main/webapp/WEB-INF/views/login.jsp_new

@@ -183,7 +183,7 @@
 				</div><!-- /.row -->
 		</div><!-- /.main-container -->
 		<div class="foot">
-			<span>CEIEC All Rights Reserved, CEIEC © </span>
+			<span><!--CEIEC All Rights Reserved，CEIEC &copy;--></span>
 		</div>
 	 <!--[if lt IE 9]>
 <script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
@@ -561,7 +561,7 @@
 
 		<script type="text/javascript">
 		var fullflag = false;
-	// 全屏代码
+	// 鍏ㄥ睆浠ｇ爜
 	function fullScreen() {
 		if(fullflag){
 			exitFullScreen();

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -965,6 +965,7 @@ jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 			if(textStatus=="success"){
 				if(data == null || data.id==null || data.id == 'undefined'){
 					result=true;
+					
 				}else{
 					/*if($(element).attr("name") 
 							&& $(element).attr("name") != ''){
@@ -977,6 +978,7 @@ jQuery.validator.addMethod("asnNoUnique",function(value, element) {
 					}*/
 					result=false;
 				}
+				console.log(result)
 			}
 
 		}
@@ -1007,6 +1009,7 @@ jQuery.validator.addMethod("asnMustExists",function(value, element) {
 							$("input[name='"+name[0]+".userRegion1']").val(data.regionId);
 							$("input[name='"+name[0]+".userRegion2']").val(data.groupId);
 							$("input[name='"+name[0]+".userRegion3']").val(data.commonGroupIds);
+							$("input[name='"+name[0]+".userRegion5']").val(data.onlyGroupId);
 							var commonGroupIds=$("input[name='commonGroupIds']").val();
 							if(commonGroupIds !=null 
 									&& commonGroupIds != ''

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -89,6 +89,7 @@
 		arbitrary:"Arbitrarily",
 		log_trend:"Log Trend",
 		info:"Prompt",
-		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!"
+		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
+		log_no_data:"This hour no data"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -89,6 +89,7 @@
 		arbitrary:"Любой",
 		log_trend:"Журнал Тенденция",
 		info:"Инфо",
-		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!"
+		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
+		log_no_data:"Нет данных за этот час"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -89,6 +89,7 @@
 		arbitrary:"任意",
 		log_trend:"日志趋势",
 		info:"提示",
-		protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！"
+		protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！",
+	    log_no_data:"本小时无数据"
 	});
 }(jQuery));

src/main/webapp/static/global/scripts/common.js

@@ -156,7 +156,7 @@ $(function(){
 		$(this).attr("data-clipboard-text",$(this).attr("data-original-title"));
 		var clipboard = new ClipboardJS('td >.tooltips');
 		clipboard.on('success', function(e) {
-			top.$.jBox.tip("Copyied!",'copy',{opacity:0.5,persistent:false});
+			top.$.jBox.tip("Copied!",'copy',{opacity:0.5,persistent:false});
 	        console.log(e);
 	        e.clearSelection();
 	    });
@@ -170,7 +170,7 @@ $(function(){
 		$(this).attr("data-clipboard-text",$(this).attr("titleHidden"));
 		var clipboard = new ClipboardJS('td[titleHidden]');
 		clipboard.on('success', function(e) {
-			top.$.jBox.tip("Copyied!",'copy',{opacity:0.5,persistent:false});
+			top.$.jBox.tip("Copied!",'copy',{opacity:0.5,persistent:false});
 //	        console.log(e);
 	        e.clearSelection();
 	    });

src/main/webapp/static/global/scripts/pzLog.js

@@ -161,7 +161,7 @@ var GetLogTotal=function(_data){
 	var failed=$.validator.messages.failed;
 	var request=$.ajax({
 		type:'post',
-		timeout:10000,//超时时间设置，查询接口时间过长超时
+		timeout:30000,//超时时间设置，查询接口时间过长超时
 		url:pathName+'/report/ajaxGetLogTotal',
 		data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
 		dataType:'json',